summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/desktop.nix4
-rw-r--r--home/home.nix2
2 files changed, 5 insertions, 1 deletions
diff --git a/common/desktop.nix b/common/desktop.nix
index 857a93e..c2ef871 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -17,6 +17,10 @@
};
programs.fish.enable = true;
+ programs.ssh.startAgent = true;
+ programs.ssh.enableAskPassword = true;
+ systemd.user.services.ssh-agent.environment.DISPLAY = lib.mkForce ":0";
+ systemd.user.services.ssh-agent.environment.SSH_ASKPASS = lib.mkForce "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
users.mutableUsers = false;
users.defaultUserShell = pkgs.fish;
diff --git a/home/home.nix b/home/home.nix
index 237279c..0a5072f 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -259,7 +259,7 @@
enable = true;
matchBlocks = let
keydir = config.home.homeDirectory + "/.ssh";
- hetznerlogin = match: {user = "root"; identityFile = keydir + "/hetzner"; forwardAgent = true;} // match;
+ hetznerlogin = match: {user = "root"; identityFile = keydir + "/hetzner.pub"; forwardAgent = true;} // match;
vpslogin = hostname: hetznerlogin {inherit hostname;};
lmulogin = hostname: {identityFile = keydir + "/key_lmu"; user = "lmu-user"; } // { inherit hostname;};
in {