gpg-agent: use gpgconf to set SSH socket path

Inspired by #163.
2018-01-14 15:55:51 +01:00 · 2018-01-14 15:55:51 +01:00 · 576217d33a
parent b8b595c6b2
commit 576217d33a
1 changed files with 4 additions and 1 deletions
--- a/modules/services/gpg-agent.nix
+++ b/modules/services/gpg-agent.nix
@ -89,7 +89,10 @@ in

      home.sessionVariables =
        optionalAttrs cfg.enableSshSupport {
-          SSH_AUTH_SOCK = "\${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh";
+          SSH_AUTH_SOCK =
+            if config.home.sessionVariableSetter == "pam"
+            then "\${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
+            else "$(${pkgs.gnupg}/bin/gpgconf --list-dirs agent-ssh-socket)";
        };

      programs.bash.initExtra = gpgInitStr;