neomutt updates

Cleaned up some more conflicts

neomutt/mailboxes

@@ -4,18 +4,19 @@
 #
 
 # Where are mailboxes stored
-set folder="imaps://imap.gmail.com/"
+set folder="imaps://imap.misfit.rodeo/INBOX"
 
 # Where archived mail goes
-set mbox="+[Gmail]/All Mail"
-#set mbox="imaps://imap.gmail.com/[Gmail]/All Mail"
+set mbox="+Archive"
+#set mbox="imaps://imap.misfit.rodeo/[Gmail]/All Mail"
 
 # Where postponed messaged die
-set postponed="+[Gmail]/Drafts"
+set postponed="+Drafts"
 
 # ... and it gets saved in =outbox.
 # Gmail does this automatically, let's not duplicate...
 #set record="+[Gmail]/Sent Mail"
+set record="+Sent"
 
 # Look me up
 set spoolfile="+INBOX"

neomutt/mailcap

@@ -25,3 +25,4 @@ text/vcard;                 mutt_vcard_filter; copiousoutput
 text/x-diff;                view %s; needsterminal
 
 text/x-patch;               view %s; needsterminal
+application/zip;	    unzip -c %s; copiousoutput; nametemplate=%s.zip

neomutt/neomuttrc

@@ -1,10 +1,10 @@
 set realname="Orien Vandenbergh"
 set signature="~/.signature.txt"
-set from="orien.vandenbergh@guidepointsecurity.com"
+set from="orien@misfit.rodeo"
 set use_from = yes
 set envelope_from = yes
 
-set hostname=felurian.guidepointsecurity.com        # Name of the localhost
+set hostname=home.icebergh.us                       # Name of the localhost
 set hidden_host                                     # Hide host details
 set alias_file=~/.config/neomutt/aliases            # Personal mail aliases
 #set query_command="~/bin/mutt-ldap '%s'"           # How to query the company contacts

neomutt/save-hooks

@@ -11,3 +11,5 @@ save-hook '=f @rtx.com' "=Customers/RTX"
 save-hook '=f @shu.edu' "=Customers/SHU"
 save-hook '=f @partner.paloaltonetworks.com' "=Partners/PaloAlto"
 save-hook '.*' "=[Gmail]/All Mail"
+#save-hook .* =Archive/`date "+%Y-%m"`
+#save-hook .* "=[Gmail]/All Mail"