diff options
| author | Emma (Rory&) <root@rory.gay> | 2023-11-16 13:28:46 +0000 |
|---|---|---|
| committer | Emma (Rory&) <root@rory.gay> | 2023-11-16 13:28:46 +0000 |
| commit | 5c76f0e88678830b8c214cbc158014476d113a9c (patch) | |
| tree | 0484e82ba2713b1282535661b1c79f7193d37f03 | |
| parent | Add WSL key (diff) | |
| download | Rory-Open-Architecture-5c76f0e88678830b8c214cbc158014476d113a9c.tar.xz | |
Fix WSL ssh setup, change key
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | host/Rory-wsl/configuration.nix | 1 | ||||
| -rwxr-xr-x | modules/users/Rory.client.nix | 7 | ||||
| -rwxr-xr-x | modules/users/Rory.nix | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/flake.lock b/flake.lock index c626db7..5301a94 100644 --- a/flake.lock +++ b/flake.lock @@ -266,11 +266,11 @@ }, "nixpkgs-rory": { "locked": { - "lastModified": 1699723557, - "narHash": "sha256-Rif0s4cWSnioycTL4g+FRtxXoQHHaik5fd7cwM8eh54=", + "lastModified": 1700130648, + "narHash": "sha256-B0XNVhEOXlFpgCOc4CYPBAm6rRZXj1aJNtOwJTNGZJk=", "owner": "TheArcaneBrony", "repo": "nixpkgs", - "rev": "a0eb08339b8baaf268a689d4a7d15083ae03df08", + "rev": "fb484c3a2cd5b925d19f8fd36a8324a557308e58", "type": "github" }, "original": { diff --git a/host/Rory-wsl/configuration.nix b/host/Rory-wsl/configuration.nix index 86a9562..8c82c9e 100644 --- a/host/Rory-wsl/configuration.nix +++ b/host/Rory-wsl/configuration.nix @@ -50,6 +50,7 @@ vscode temurin-bin + obsidian (callPackage ../../modules/packages/nheko-git.nix { inherit nhekoSrc; inherit mtxclientSrc; }) ]; diff --git a/modules/users/Rory.client.nix b/modules/users/Rory.client.nix index 43a9f57..36edbc1 100755 --- a/modules/users/Rory.client.nix +++ b/modules/users/Rory.client.nix @@ -1,6 +1,13 @@ { config, lib, pkgs, home-manager, ... }: { + programs = { + ssh = { + startAgent = true; + setXAuthLocation = true; + enableAskPassword = true; + }; + }; home-manager.users.Rory = { services.gnome-keyring.enable = lib.mkForce false; diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix index f394224..c8f4d45 100755 --- a/modules/users/Rory.nix +++ b/modules/users/Rory.nix @@ -15,7 +15,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN/kNkY/E5b6rvCQLMaSbpLQ/xoyywIwVVu9uo2j/B6p Rory@RoryNix" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICNhsYWo5pEilXQGcn2SOuvzIdy67QpdtC7vnmlJB9WX Administrator@nt-6mnnvobcjimo" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILSJYOygKJIvwhPj+SmTtzOD3eBzwf+kiLeegWQmKGmW TheArcaneBrony@w81vm" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKTe/pHIGDD3+hm3zKliKr0b1rtYio+FitUNJRpfVQql Rory@Rory-wsl" # work laptop + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJPRTuz83dVThuDVXhDz3w3uYBGJ+JPzdZFT6wvhQXQ3 Rory@Rory-wsl" # work laptop ]; useDefaultShell = true; shell = pkgs.zsh; |