Merge branch 'master' of github.com:dopefishh/dotfiles

[dotfiles.git] / muttrc

diff --git a/muttrc b/muttrc
index 8ed4a1a..b2005ff 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -5,8 +5,8 @@ set envelope_from=yes
 set my_hdr="X-PGP-Key: http://www.martlubbers.net/mart@martlubbers.net.asc"
 
 # Receiving and sending email
-set my_msmtp_pass=`gpg -d ~/passwd.gpg | grep -i mail | awk '{print $3}'; echo $?`
-set sendmail="/usr/local/bin/msmtp -C /home/mart/.mutt/msmtp --password=$my_msmtp_pass -f mart@martlubbers.net -a net"
+set my_force_agent=`gpg -dq ~/passwd.gpg >> /dev/null`
+set sendmail="msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
 
 # Bindings index
 bind index gg first-entry
@@ -21,8 +21,14 @@ bind pager R group-reply
 
 # Macros
 macro index S "<shell-escape>mutt-notmuch-py ~/.mutt/mail/temp<enter><change-folder-readonly>+temp<enter>" "search mail (using notmuch)"
-macro index,pager $ "<sync-mailbox><shell-escape>offlineimap -c ~/.mutt/offlineimaprc -k Repository_Remote:remotepass=$my_msmtp_pass &<enter>" "Force refresh"
-macro index,pager \CT "<tag-pattern>~C vim@vim.org | ~C vim_use<enter><tag-prefix-cond><save-message>=vim<enter><end-cond><tag-pattern>~C lists.debian.org<enter><tag-prefix-cond><save-message>=debian<enter><end-cond><tag-pattern>~C mutt-users@mutt.org<enter><tag-prefix-cond><save-message>=mutt<enter><end-cond><tag-pattern>~C praat-users<enter><tag-prefix-cond><save-message>=praat<enter><end-cond><sync-mailbox>" "Clean up mailing lists"
+macro index,pager $ "<sync-mailbox><shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter>" "Force refresh"
+macro index,pager \CT "\
+<tag-pattern>~C vim@vim.org | ~C vim_use<enter><tag-prefix-cond><save-message>=vim<enter><end-cond>\
+<tag-pattern>~C lists.debian.org<enter><tag-prefix-cond><save-message>=debian<enter><end-cond>\
+<tag-pattern>~C mutt-users@mutt.org<enter><tag-prefix-cond><save-message>=mutt<enter><end-cond>\
+<tag-pattern>~C praat-users<enter><tag-prefix-cond><save-message>=praat<enter><end-cond>\
+<tag-pattern>~C i3-discuss@i3.zekjur.net<enter><tag-prefix-cond><save-message>=i3<enter><end-cond>\
+<sync-mailbox>" "Clean up mailing lists"
 macro index,pager \cb "|urlview\n"
 
 # Folders
@@ -69,6 +75,7 @@ subscribe vim_use@googlegroups.com
 subscribe vim@vim.org
 subscribe mutt-user@mutt.org
 subscribe praat-users@egroups.com
+subscribe i3-discuss@i3.zekjur.net
 
 #Skip some options
 set include=yes
@@ -122,3 +129,5 @@ set crypt_autosign
 set crypt_replysign
 set crypt_replysignencrypted=yes
 set crypt_verify_sig=yes
+
+message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"