X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=states%2Fzsh%2Ffiles%2Fzshrc;h=2e44d7f41f23db42c01790b3cc72b844d11bee22;hb=64b98818337eaa0b31902a12875330298e8e49a9;hp=57c58ec874b7ef601b65ccb439096c6aa588a872;hpb=8028d34696a67c53a9dd3f4bc2441d36c5ae2460;p=max%2Fsaltfiles.git

diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 57c58ec..2e44d7f 100644
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -50,19 +50,6 @@ precmd () {
 	__git_ps1 "" "$(virtual_env)${p}" "${NEWLINE}[%s]${NEWLINE}"
 }
 
-
-if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
-  gpg-connect-agent /bye >/dev/null 2>&1
-fi
-
-unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-fi
-
-
-gpg-connect-agent updatestartuptty /bye > /dev/null
-
 bindkey '^R' history-incremental-search-backward
 
 if [[ -f ~/.shell_aliases ]]; then
@@ -99,3 +86,6 @@ chpwd() {
         fi
     fi
 }
+
+export GPG_TTY=$(tty)
+gpg-connect-agent updatestartuptty /bye >/dev/null