From 63597f1375e7a70e9aa7405c99c61a602bda72dd Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 26 Aug 2017 17:03:46 +0200 Subject: zsh: Set SSH_AUTH_SOCK to GnuPG SSH agent socket --- zsh/.config/zsh/.zshenv | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv index f82d0a26..4f7b20f7 100644 --- a/zsh/.config/zsh/.zshenv +++ b/zsh/.config/zsh/.zshenv @@ -10,9 +10,10 @@ then . $ZDOTDIR/zshenv.private fi - if [[ -z $SSH_AUTH_SOCK ]] + unset SSH_AGENT_PID + if [[ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]] then - export SSH_AUTH_SOCK=${XDG_RUNTIME_DIR:-/run/user/$UID}/ssh-agent + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" fi if [[ -e $HOME/.nix-profile/etc/profile.d/nix.sh ]] -- cgit 1.4.1