X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=muttrc;h=de6534c0e7697bcec677c70b078935ab81498304;hb=5223e76a4302c4de131593feea3987398c60445d;hp=4c4fe7e73613a30bb806ee1f2fae4f6993ffe031;hpb=1cce2d664871e9f0f910a8f6c044c92b129b73a8;p=dotfiles.git

diff --git a/muttrc b/muttrc
index 4c4fe7e..de6534c 100644
--- a/muttrc
+++ b/muttrc
@@ -3,13 +3,31 @@ set realname="Mart Lubbers"
 set from="mart@martlubbers.net"
 set use_from=yes
 set envelope_from=yes
+<<<<<<< HEAD
+set my_msmtp_pass=`gpg --use-agent -d ~/passwd.gpg | grep -i mail | awk '{print $3}'`
+set sendmail="/usr/local/bin/msmtp -C /home/mart/.mutt/msmtp --password=$my_msmtp_pass -f mart@martlubbers.net -a net"
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+set sendmail="/usr/bin/msmtp --passwordeval -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+=======
 set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+>>>>>>> 1cce2d664871e9f0f910a8f6c044c92b129b73a8
+=======
+set sendmail="/usr/bin/msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net"
+>>>>>>> 1cce2d664871e9f0f910a8f6c044c92b129b73a8
+>>>>>>> 35592efa3b150a2efcb320ffb12aaa66e2c1f43c
 set my_hdr="X-PGP-Key: http://www.martlubbers.net/mart@martlubbers.net.asc"
 
+# Macros
 # Force offlineimap to refresh in the background
-macro index,pager \CR "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter>" "Force refresh"
+macro index,pager \CR "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc -k Repository_Remote:password=$my_msmtp_pass &<enter>" "Force refresh"
 # Move all the mailing lists to the appropriate folder
-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><sync-mailbox>" "Clean up mailing lists"
+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>\
+<sync-mailbox>" "Clean up mailing lists"
 
 # Folders
 set mbox_type=Maildir
@@ -99,7 +117,7 @@ color index brightyellow default ~N# New
 color index blue default ~T# Tagged
 color index red default ~D# Deleted
 
-#Crypto stuff
+#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"