From 9e54e9f3b85a66c62c2a9b3ea6a142d910e73f29 Mon Sep 17 00:00:00 2001
From: June McEnroe <june@causal.agency>
Date: Thu, 7 Apr 2016 11:09:29 -0400
Subject: Use default pinentry and set GPG_TTY

---
 .gnupg/gpg-agent.conf | 1 -
 .zshrc                | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

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'
-- 
cgit 1.4.1