diff options
| author | June McEnroe <june@causal.agency> | 2016-04-07 11:09:29 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2016-04-07 11:09:29 -0400 |
| commit | 9e54e9f3b85a66c62c2a9b3ea6a142d910e73f29 (patch) | |
| tree | 2f9d8bc734e0e7b6c50213648bacd400aac03eb7 | |
| parent | Add git config override include (diff) | |
| download | src-9e54e9f3b85a66c62c2a9b3ea6a142d910e73f29.tar.gz src-9e54e9f3b85a66c62c2a9b3ea6a142d910e73f29.zip | |
Use default pinentry and set GPG_TTY
Diffstat (limited to '')
| -rw-r--r-- | .gnupg/gpg-agent.conf | 1 | ||||
| -rw-r--r-- | .zshrc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf index a3248d08..75634342 100644 --- a/.gnupg/gpg-agent.conf +++ b/.gnupg/gpg-agent.conf @@ -1,2 +1 @@ use-standard-socket -pinentry-program /usr/local/bin/pinentry-mac diff --git a/.zshrc b/.zshrc index dde4e356..a0b34c32 100644 --- a/.zshrc +++ b/.zshrc @@ -13,6 +13,7 @@ KEYTIMEOUT=1 PATH=$PATH:~/.bin export EDITOR=vim GIT_EDITOR=vim type nvim > /dev/null && EDITOR=nvim GIT_EDITOR=nvim && alias vim=nvim +export GPG_TTY=$TTY [[ "$OSTYPE" =~ 'darwin' ]] && alias osx=true || alias osx=false osx && export CLICOLOR=1 || alias ls='ls --color' grep='grep --color' |