summary refs log tree commit diff stats
path: root/zsh/.config
diff options
context:
space:
mode:
Diffstat (limited to 'zsh/.config')
-rw-r--r--zsh/.config/zsh/.zshrc18
1 files changed, 17 insertions, 1 deletions
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 818cdf5f..b7a20b9c 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -106,7 +106,18 @@ bindkey '\e ' hist-complete
 zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|=*' 'l:|=* r:|=*'
 zstyle ':completion:*' completer _expand _complete _match
 
-if [[ -z $SSH_AUTH_SOCK && $commands[ssh-agent] ]]
+if [[ -n $commands[gpg-connect-agent] ]]
+then
+  # When using SSH support, use the current TTY for passphrase prompts
+  gpg-connect-agent updatestartuptty /bye > /dev/null
+
+  # Point the SSH_AUTH_SOCK to the one handled by gpg-agent
+  if [ -S $(gpgconf --list-dirs agent-ssh-socket) ]; then
+    export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+  else
+    echo "$(gpgconf --list-dirs agent-ssh-socket) doesn't exist. Is gpg-agent running ?"
+  fi
+elif [[ -z $SSH_AUTH_SOCK && $commands[ssh-agent] ]]
 then
   eval $(ssh-agent)
 fi
@@ -167,6 +178,11 @@ then
   alias gh=hub
 fi
 
+if [[ -n $commands[gpg2] && -z $commands[gpg] ]]
+then
+  alias gpg=gpg2
+fi
+
 if [[ -n $commands[lunchy] ]]
 then
   LUNCHY_DIR=$(dirname $(gem which lunchy))/../extras