From b1f3fc59230b32a44951efcba0bb08ca82311044 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 18 Oct 2019 12:53:04 +0200
Subject: user-interface: use keyring-based ssh agent

---
 system/settings/user-interface.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'system/settings/user-interface.nix')

diff --git a/system/settings/user-interface.nix b/system/settings/user-interface.nix
index 33a057a2..dd97ee40 100644
--- a/system/settings/user-interface.nix
+++ b/system/settings/user-interface.nix
@@ -70,7 +70,8 @@
     };
   };
 
-  programs.ssh.startAgent = true;
+  # use gnome-keyring
+  programs.ssh.startAgent = false;
 
   programs.dconf.enable = true;
   programs.seahorse.enable = true;
@@ -78,6 +79,10 @@
     gnome-keyring.enable = true;
     at-spi2-core.enable = true;
   };
+  services.xserver.displayManager.sessionCommands = ''
+    eval $(/run/wrappers/bin/gnome-keyring-daemon --start --components=secrets,ssh,pkcs11)
+    export SSH_AUTH_SOCK
+  '';
 
   imports = [
     ./services/xserver.nix
-- 
cgit 1.4.1