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

diff --git a/states/zsh/files/zshrc b/states/zsh/files/zshrc
index 57c58ec..f453e8b 100644
--- a/states/zsh/files/zshrc
+++ b/states/zsh/files/zshrc
@@ -23,7 +23,7 @@ compinit
 HISTFILE=~/.histfile
 HISTSIZE=100000
 SAVEHIST=100000
-setopt appendhistory autocd extendedglob nomatch
+setopt appendhistory autocd extendedglob nomatch extendedhistory correct
 unsetopt beep notify
 bindkey -v
 # End of lines configured by zsh-newuser-install
@@ -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