summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2018-12-21 11:17:03 +0100
committerAlan Pearce2018-12-21 11:17:03 +0100
commit1e9c3de62e6cbdcdd344c51ce60ceafa80e3e830 (patch)
treee4bb3be5f1e85ce37b0fc167b7beceb598a480d0
parentbbcbe8f7da8372c207cbeac9c498677edc982ece (diff)
parent2a6df359f7a040b5c641e5df7be9c32caf68be2d (diff)
downloaddotfiles-1e9c3de62e6cbdcdd344c51ce60ceafa80e3e830.tar.lz
dotfiles-1e9c3de62e6cbdcdd344c51ce60ceafa80e3e830.tar.zst
dotfiles-1e9c3de62e6cbdcdd344c51ce60ceafa80e3e830.zip
Merge branch 'master' of https://git.alanpearce.eu/dotfiles
-rw-r--r--zsh/.config/zsh/.zshrc16
1 files changed, 0 insertions, 16 deletions
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 55bc487..8252b16 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -118,22 +118,6 @@ 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 [[ $os != "darwin" && -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" && -n $commands[ssh-agent] ]]
-then
-  eval $(ssh-agent)
-fi
-
 # Plugins
 
 zplugin ice blockf wait'0' lucid