X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=muttrc;h=298c8f75e942137eb25415dd9cd99cf7ac69d070;hb=7f7a9390474f44073a8a612c91df49b32b40cad5;hp=df48b41e3d0e8955268dff09d1b1df0507b42ee2;hpb=7df7ab410d3a07d88f42cb9a83752d11f3093001;p=dotfiles.git

diff --git a/muttrc b/muttrc
index df48b41..298c8f7 100644
--- a/muttrc
+++ b/muttrc
@@ -3,21 +3,27 @@ set realname="Mart Lubbers"
 set from="mart@martlubbers.net"
 set use_from=yes
 set envelope_from=yes
-<<<<<<< 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
+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"
 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 $ "<sync-mailbox><shell-escape>offlineimap -c ~/.mutt/offlineimaprc -k Repository_Remote:remotepass=$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"
+
+#Scoring mechanism to pin emails
+unscore *
+score ~A 0
+score ~F 1
+macro index \CP "<flag-message><enter-command>unscore *<enter><enter-command>score ~A 0<enter><enter-command>score ~F 1<enter>" "toggle pin"
+#set index_format="%1N %4C %Z %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"
+
 
 # Folders
 set mbox_type=Maildir
@@ -29,17 +35,18 @@ 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=1
 source ~/.mutt/mailboxes		# Generated by offlineimap
 
 #View
 unset wait_key
 unset markers
-set sort_browser=reverse-date
-set sort_aux=reverse-last-date-received
+set sort_browser=alpha
+set sort=reverse-score
+set sort_aux=reverse-date
 set editor="vim" 
-set duplicate_threads = yes
+set duplicate_threads=yes
 auto_view text/html
 #Pager
 set pager_index_lines=20
@@ -106,8 +113,9 @@ color index green default ~p# To me
 color index brightyellow default ~N# New
 color index blue default ~T# Tagged
 color index red default ~D# Deleted
+color index brightblue default ~F
 
-#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"