X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=muttrc;h=2a0efbc9c46fe3de86decdc3fa4e3e8297dd0a5f;hb=6e14aad4dfbc43fd816f25f945f46636f7645522;hp=de6534c0e7697bcec677c70b078935ab81498304;hpb=5223e76a4302c4de131593feea3987398c60445d;p=dotfiles.git

diff --git a/muttrc b/muttrc
index de6534c..2a0efbc 100644
--- a/muttrc
+++ b/muttrc
@@ -3,25 +3,13 @@ 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 -k Repository_Remote:password=$my_msmtp_pass &<enter>" "Force refresh"
+macro index,pager $ "<sync-mailbox><shell-escape>offlineimap -c ~/.mutt/offlineimaprc -k Repository_Remote:remotepass=$my_msmtp_pass<enter><sync-mailbox>" "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>\
@@ -39,8 +27,8 @@ set postponed="+Drafts/"		# Drafts
 set mask="!^\\.[^.]"
 set certificate_file=~/.mutt/certs
 set imap_check_subscribed=yes
-set sleep_time=0
-set mail_check=5
+#set sleep_time=0
+#set mail_check=5
 source ~/.mutt/mailboxes		# Generated by offlineimap
 
 #View