From 860381889df27843d3b45ed1f5572537245783a2 Mon Sep 17 00:00:00 2001 From: Reiner Herrmann Date: Fri, 27 Nov 2015 14:15:59 +0100 Subject: adapt configs to use gpg2 --- bashrc | 2 +- debian/devscripts | 1 + git/gitconfig | 2 ++ muttrc | 8 ++++++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bashrc b/bashrc index 11ccbba..b0b3bc0 100644 --- a/bashrc +++ b/bashrc @@ -60,9 +60,9 @@ export SDL_AUDIODRIVER=alsa export XDG_DATA_HOME=$HOME/.local/share export LESS="-R -M --shift 10" export EMAIL="reiner@reiner-h.de" +export GPG_TTY=$(tty) # use vim as pager (VimTip 167) export MANPAGER="/bin/sh -c \"col -b -x | view -u ~/.vim/pager.vim -c 'set ft=man nomod nolist' -\"" export PERLDOC_PAGER=$MANPAGER - diff --git a/debian/devscripts b/debian/devscripts index 2b051b7..c86d3b3 100644 --- a/debian/devscripts +++ b/debian/devscripts @@ -1,3 +1,4 @@ DEBSIGN_KEYID=5374AA4F +DEBSIGN_PROGRAM=gpg2 DEBUILD_LINTIAN_OPTS="-EvIL +pedantic --show-overrides --color=always" DEBUILD_DPKG_BUILDPACKAGE_OPTS="-jauto" diff --git a/git/gitconfig b/git/gitconfig index 5763835..b690c7f 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -22,3 +22,5 @@ [alias] ctags = !.git/hooks/ctags +[gpg] + program = gpg2 diff --git a/muttrc b/muttrc index b9bfb03..cedae1a 100644 --- a/muttrc +++ b/muttrc @@ -1,7 +1,7 @@ # Documentation available at http://www.mutt.org/doc/devel/manual.html#reference # imap settings -source /home/reiner/.mutt/imap_pass # import password from external file to prevent accidental pasting :) +source ~/.mutt/imap_pass # import password from external file to prevent accidental pasting :) set folder="imap://reiner@mail.reiner-h.de/INBOX" set imap_idle set imap_check_subscribed @@ -95,8 +95,12 @@ folder-hook . 'push ' # collapse threads # gpg settings -source /usr/share/doc/mutt/examples/gpg.rc +# - gpg.rc copied from /etc/Muttrc.d/ and replaced gpg with gpg2 +source ~/.mutt/gpg.rc set crypt_autosign +set crypt_replyencrypt +set crypt_opportunistic_encrypt +set crypt_replysignencrypted set crypt_verify_sig -- cgit v1.2.3