diff options
| -rw-r--r-- | gpg-agent.conf | 6 | ||||
| -rw-r--r-- | zshrc | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/gpg-agent.conf b/gpg-agent.conf index 646d2d4..58c6ceb 100644 --- a/gpg-agent.conf +++ b/gpg-agent.conf @@ -3,9 +3,3 @@ enable-ssh-support default-cache-ttl 60 max-cache-ttl 120 -#pinentry-program /usr/bin/pinentry-curses -#pinentry-program /usr/bin/pinentry-tty -#pinentry-program /usr/bin/pinentry-x11 -#pinentry-program /usr/local/bin/pinentry-curses -#pinentry-program /usr/local/bin/pinentry-mac -pinentry-program /usr/bin/pinentry @@ -31,14 +31,6 @@ fi export PS1='$user_prompt@%M %F{cyan}%2~%f ${vcs_info_msg_0_}%(?..%F{red}[%?]%f )%# ' -if [ ! -f $HOME/server ] && [ ! $UID -eq 0 ]; then - export GPG_TTY="$(tty)" - export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) - gpgconf --launch gpg-agent - gpg-connect-agent updatestartuptty /bye > /dev/null - gpg-connect-agent "scd serialno" "learn --force" /bye > /dev/null -fi - alias l="ls -lah" alias ll="ls -lh" alias okular="setsid okular" |