update mutt to use notmuchHEADmaster

1 files changed, 32 insertions, 34 deletions

diff --git a/mutt/muttrc b/mutt/muttrc
index 0d5b395..46596c9 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -9,6 +9,16 @@ set pager_stop=yes
 set sort = threads
 set sort_aux = reverse-last-date-received
 
+set virtual_spoolfile=yes
+set folder=~/mail/.notmuch/
+virtual-mailboxes "inbox" "notmuch://?query=tag:inbox"
+virtual-mailboxes "archive" "notmuch://?query=tag:archive"
+virtual-mailboxes "sent" "notmuch://?query=tag:sent"
+virtual-mailboxes "trash" "notmuch://?query=tag:trash"
+set record = "~/mail/personal/Sent"
+set nm_record = yes
+set nm_record_tags = "sent"
+
 set fast_reply
 set fcc_attach
 set forward_format = "Fwd: %s"
@@ -17,16 +27,19 @@ set include
 set reverse_name
 set markers = no
 set mark_old = no
+set date_format = "%m/%d/%y"
+set index_format = "%2C: %d %Z %-12.12g %-15.15L (%<l?%4l&%4c>) %s"
 
 set header_cache = $XDG_CACHE_HOME/mutt/header_cache
 
-set mbox_type=Maildir
-set folder=~/mail/personal/
-set spoolfile= +INBOX
-mailboxes =INBOX =Archive =Sent =Trash =Junk =Drafts
-set postponed = +Drafts
-set trash = +Trash
-set record = +Sent
+macro index a "<modify-labels>+archive -unread -inbox<enter>" "Archive message"
+macro index t "<modify-labels>+todo -unread<enter>" "Todo message"
+macro index I "<modify-labels>+inbox -archive -trash<enter>" "Inbox message"
+macro index d "<modify-labels>+trash -unread -inbox<enter>" "Trash message"
+macro index N "<modify-labels>-unread<enter>" "Read message"
+macro index c "<change-vfolder>?" "Change to vfolder overview"
+macro index \\\\ "<vfolder-from-query>" "Search mailbox"
+bind index,pager l modify-labels
 
 bind index j noop
 bind index k noop
@@ -41,14 +54,18 @@ bind index gg first-entry
 bind index G last-entry
 bind index <space> tag-entry
 
-bind index e next-entry
-bind index i previous-entry
+bind browser o select-entry
+bind pager o view-attachments
+bind attach n exit
+bind attach o view-attach
+bind index,attach,browser e next-entry
+bind index,attach,browser i previous-entry
 bind index o display-message
 bind index s sort-mailbox
 bind index k toggle-read # only show unread
 
-bind index ^U previous-page
-bind index ^D next-page
+bind index \Cu previous-page
+bind index \Cd next-page
 
 bind pager e next-page
 bind pager i previous-page
@@ -64,26 +81,7 @@ bind index,pager C noop
 bind pager n exit
 bind pager k search-next
 
-macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox"
-macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox"
-macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox"
-macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts"
-macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts"
-macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts"
-macro index,pager gj "<change-folder>=Junk<enter>" "go to junk"
-macro index,pager Mj ";<save-message>=Junk<enter>" "move mail to junk"
-macro index,pager Cj ";<copy-message>=Junk<enter>" "copy mail to junk"
-macro index,pager gt "<change-folder>=Trash<enter>" "go to trash"
-macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash"
-macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash"
-macro index,pager gs "<change-folder>=Sent<enter>" "go to sent"
-macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent"
-macro index,pager Cs ";<copy-message>=Sent<enter>" "copy mail to sent"
-macro index,pager ga "<change-folder>=Archive<enter>" "go to archive"
-macro index,pager Ma ";<save-message>=Archive<enter>" "move mail to archive"
-macro index,pager Ca ";<copy-message>=Archive<enter>" "copy mail to archive"
-
-color index green default '.*'
-color index_author magenta default '.*'
-color index_number yellow default
-color index_subject cyan default '.*'
+#color index green default '.*'
+#color index_author magenta default '.*'
+#color index_number yellow default
+#color index_subject cyan default '.*'