From e7e6285bc3e6c67f6e52a23a0855b97a4186d738 Mon Sep 17 00:00:00 2001 From: Felix Tenley Date: Wed, 30 Mar 2022 00:04:35 +0200 Subject: [PATCH] fix: fix SSH_AUTH_SOCK value Otherwise SSH keys from GPG aren't picked up. --- home/felschr-rpi4.nix | 7 +++---- home/felschr-work.nix | 7 +++---- home/felschr.nix | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/home/felschr-rpi4.nix b/home/felschr-rpi4.nix index d06339e..be2bb3f 100644 --- a/home/felschr-rpi4.nix +++ b/home/felschr-rpi4.nix @@ -19,10 +19,9 @@ defaultCacheTtlSsh = 600; pinentryFlavor = "curses"; }; - # https://github.com/nix-community/home-manager/issues/667#issuecomment-902236379 - # https://github.com/nix-community/home-manager/pull/2253 - home.sessionVariables.SSH_AUTH_SOCK = - "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh"; + programs.zsh.initExtra = '' + export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh + ''; programs.git.defaultProfile = "private"; diff --git a/home/felschr-work.nix b/home/felschr-work.nix index 670e08c..03bdfba 100644 --- a/home/felschr-work.nix +++ b/home/felschr-work.nix @@ -24,10 +24,9 @@ with pkgs; { defaultCacheTtlSsh = 600; pinentryFlavor = "gnome3"; }; - # https://github.com/nix-community/home-manager/issues/667#issuecomment-902236379 - # https://github.com/nix-community/home-manager/pull/2253 - home.sessionVariables.SSH_AUTH_SOCK = - "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh"; + programs.zsh.initExtra = '' + export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh + ''; programs.ssh.enable = true; diff --git a/home/felschr.nix b/home/felschr.nix index 3603914..d543d70 100644 --- a/home/felschr.nix +++ b/home/felschr.nix @@ -30,10 +30,9 @@ defaultCacheTtlSsh = 600; pinentryFlavor = "gnome3"; }; - # https://github.com/nix-community/home-manager/issues/667#issuecomment-902236379 - # https://github.com/nix-community/home-manager/pull/2253 - home.sessionVariables.SSH_AUTH_SOCK = - "$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh"; + programs.zsh.initExtra = '' + export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh + ''; programs.ssh.enable = true;