about summary refs log tree commit diff
path: root/fish
diff options
context:
space:
mode:
Diffstat (limited to 'fish')
-rwxr-xr-xfish/.config/fish/config.fish7
1 files changed, 6 insertions, 1 deletions
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 1f60d32..5414169 100755
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -22,7 +22,12 @@ for path in $user_paths
 end
 
 set -x SSH_AGENT_PID ""
-set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
+if test -S $HOME/.gnupg/S.gpg-agent
+  set -x SSH_AUTH_SOCK $HOME/.gnupg/S.gpg-agent
+  set -x GPG_SOCK $HOME/.gnupg/S.gpg-agent
+else
+  set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
+end
 
 set -x BBJ_USER $USER