From 4d470bdddb533b7213baaec9de51d3b311b29208 Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sat, 1 Jul 2023 00:33:38 +0200
Subject: desktop: ssh agent & askpass

this is cursed and i really need something that doesn't depend on X for
this …
---
 common/desktop.nix | 4 ++++
 home/home.nix      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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 {
-- 
cgit v1.2.3