# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1552776223 14400
# Node ID 27f7431c8170674b1d7e6ad90e64e52f0df81826
# Parent  648b37626788c2b16dbad4742171e2f15c1b96e8
Fix up gpg stuff

diff --git a/.profile.common b/.profile.common
--- a/.profile.common
+++ b/.profile.common
@@ -10,6 +10,7 @@ make -s -C ~/.ssh || {
 export EDITOR=vim
 export SUDO_EDITOR=$HOME/bin/privim
 export LESS='Ri'
+export GPG_TTY="$(tty)"
 
 export PERL_CPANM_OPT='-nq --prompt'
 export DEVEL_REPL_PROFILE='Standard'
diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -298,10 +298,10 @@ augroup END
 " hacked to work with vimwiki
 augroup encrypted
   autocmd!
-  autocmd BufReadPre,FileReadPre *.gpg,*.gpg.wiki setl noswapfile noundofile nobackup viminfo=
-  autocmd BufReadPost *.gpg,*.gpg.wiki :sil %!GPG_TTY=/dev/tty gpg2 --decrypt 2> /dev/null
-  autocmd BufWritePre *.gpg,*.gpg.wiki :sil %!GPG_TTY=/dev/tty gpg2 -se -a --default-recipient-self
-  autocmd BufWritePost *.gpg,*.gpg.wiki :sil undo
+  autocmd BufReadPre,FileReadPre *.gpg,*.gpg.* setl noswapfile noundofile nobackup viminfo=
+  autocmd BufReadPost *.gpg,*.gpg.* :sil %!gpg2 -d
+  autocmd BufWritePre *.gpg,*.gpg.* :sil %!gpg2 -se -a --default-recipient-self
+  autocmd BufWritePost *.gpg,*.gpg.* :sil undo
 augroup END
 "}}}