summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2019-10-18 12:53:04 +0200
committerAlan Pearce2019-10-21 13:57:57 +0200
commitb1f3fc59230b32a44951efcba0bb08ca82311044 (patch)
tree7c77b13f14b732b36ba49bbbbc0094ab0d5ed983
parentfb425ca063349e224b3561c20408a90dd8f842e4 (diff)
downloadnixfiles-b1f3fc59230b32a44951efcba0bb08ca82311044.tar.lz
nixfiles-b1f3fc59230b32a44951efcba0bb08ca82311044.tar.zst
nixfiles-b1f3fc59230b32a44951efcba0bb08ca82311044.zip
user-interface: use keyring-based ssh agent
-rw-r--r--system/settings/user-interface.nix7
1 files changed, 6 insertions, 1 deletions
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