summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <curtis.mcenroe@adgear.com>2016-04-07 11:09:29 -0400
committerJune McEnroe <curtis.mcenroe@adgear.com>2016-04-07 11:09:29 -0400
commitd15f911d453e0e56938f1748fa844d8facb58a5d (patch)
tree71a7dadfcb5ffa0c513c00358a8ced7f03562345
parentAdd git config override include (diff)
downloadsrc-d15f911d453e0e56938f1748fa844d8facb58a5d.tar.gz
src-d15f911d453e0e56938f1748fa844d8facb58a5d.zip
Use default pinentry and set GPG_TTY
Diffstat (limited to '')
-rw-r--r--.gnupg/gpg-agent.conf1
-rw-r--r--.zshrc1
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'