From 0fa5e7bd5fbb6b7af0c582c9f6e0aa63c705cdd1 Mon Sep 17 00:00:00 2001
From: Mart Lubbers <mart@martlubbers.net>
Date: Fri, 19 Jun 2015 08:55:13 +0200
Subject: [PATCH] added newsbeuter and externalized crypto in muttrc

---
 .mutt/muttrc       | 15 +--------------
 .newsbeuter/config |  2 ++
 install.sh         |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)
 create mode 100644 .newsbeuter/config

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 5de448c..f87bb6f 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -89,20 +89,7 @@ color index red default ~D
 color index brightblue default ~F
 
 # Crypto
-set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --batch --output - %f"
-set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f"
-set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch --output - %f"
-set pgp_sign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_clearsign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-set pgp_import_command="gpg --no-verbose --import -v %f"
-set pgp_export_command="gpg --no-verbose --export --armor %r"
-set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
-set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r" 
-set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r" 
-set pgp_sign_as=0xAD3FEBE7
-set pgp_timeout=60
-set pgp_good_sign="^gpg: Good signature from"
+source /etc/Muttrc.gpg.dist
 set crypt_autosign
 set crypt_replysign
 set crypt_replysignencrypted=yes
diff --git a/.newsbeuter/config b/.newsbeuter/config
new file mode 100644
index 0000000..9f96901
--- /dev/null
+++ b/.newsbeuter/config
@@ -0,0 +1,2 @@
+auto-reload yes
+datetime-format %F
diff --git a/install.sh b/install.sh
index 5411d05..a8b3c22 100644
--- a/install.sh
+++ b/install.sh
@@ -6,7 +6,7 @@ sudo localectl set-keymap --no-convert dvorak
 hf=(.bashrc .gitconfig .inputrc .vimrc .xinitrc .Xresources .toprc
 .vim .mutt/mailcap .mutt/msmtprc .mutt/muttrc .mutt/offlineimap.py
 .mutt/offlineimaprc .mutt/notmuch-config .config/i3/bar .config/i3/config
-.config/i3/gpass.sh .config/i3status/config)
+.config/i3/gpass.sh .config/i3status/config .newsbeuter/config)
 for f in ${hf[*]}
 do
 	unlink "$HOME/$f" || true
-- 
2.20.1