Getting closer to a working mutt config

mailcap

@@ -1,2 +1,4 @@
-text/html; luakit %s &; test=test -n "%DISPLAY"; needsterminal;
+#text/html; luakit %s &; test=test -n "%DISPLAY"; needsterminal;
+#text/html; firefox %s &; test=test -n "%DISPLAY"; needsterminal;
+text/html; firefox %s;
 text/html; w3m -I %{charset} -T text/html; copiousoutput;

mutt/DswanIOCOM.muttrc

@@ -1,11 +1,4 @@
-#set from          = "dswan@iocom.com"
-#set sendmail      = "msmtp -a DswanIOCOM"
-
-#set spoolfile = "+DswanIOCOM/INBOX"
-#set mbox      = "+DswanIOCOM/archive"
-#set postponed = "+DswanIOCOM/drafts"
-
-color status white blue
+#color status white blue
 
 # Receive options.
 set imap_user = "dswan@insors.com"
@@ -15,6 +8,8 @@ set spoolfile = +INBOX
 set postponed = +Drafts
 set record = +Sent
 
+set move = yes
+
 # Send options.
 set smtp_url = "smtps://dswan@secure.emailsrvr.com"
 set smtp_pass = $my_iocom_password
@@ -22,10 +17,6 @@ set realname = "Dustin Swan"
 set from = "dswan@iocom.com"
 set hostname = "iocom.com"
 
-# Connection options
-set ssl_force_tls = yes
-unset ssl_starttls
-
 # Hook
 account-hook $folder "set imap_user = dswan@insors.com"
 account-hook $folder "set imap_pass = $my_iocom_password"

mutt/DustinswanGmail.muttrc

@@ -1,19 +1,13 @@
-#set from     = "dustinswan@gmail.com"
-#set sendmail = "msmtp -a DustinswanGmail"
-
-#set spoolfile = "+DustinswanGmail/INBOX"
-#set mbox      = "+DustinswanGmail/archive"
-#set postponed = "+DustinswanGmail/drafts"
-
-color status white red
+#color status white red
 
 # Receive options.
 set imap_user = "dustinswan@gmail.com"
 set imap_pass = $my_gmail_password
-set folder = "imaps://dustinswan@imap.gmail.com"
+set folder = "imaps://imap.gmail.com"
 set spoolfile = +INBOX
 set postponed = +Drafts
 # set record = +Sent # Gmail saves this automatically
+unset record
 
 set move = no
 
@@ -24,10 +18,6 @@ set realname = 'Dustin Swan'
 set from = "dustinswan@gmail.com"
 set hostname = "gmail.com"
 
-# Connection options
-set ssl_force_tls = yes
-unset ssl_starttls
-
 # Hook
 account-hook $folder "set imap_user = dustinswan@gmail.com"
 account-hook $folder "set imap_pass = $my_gmail_password"

mutt/muttrc

@@ -21,7 +21,6 @@ folder-hook DswanIOCOM 'source ~/.mutt/DswanIOCOM.muttrc'
 set sendmail_wait = 0
 set send_charset = "utf-8"
 
-unset record
 
 bind index gg first-entry
 bind index G  last-entry
@@ -39,7 +38,7 @@ bind pager R  group-reply # Was g
 #unmy_hdr *
 
 # Use ppl for address book
-set query_command = "ppl mutt '%s'"
+# set query_command = "ppl mutt '%s'"
 
 # Sorting
 set sort = threads
@@ -48,7 +47,7 @@ set sort_aux = reverse-last-date-received
 # Sidebar
 set sidebar_delim   = '  │'
 set sidebar_visible = yes
-set sidebar_width   = 41
+set sidebar_width   = 50
 # color sidebar_new color221 color233
 bind index <down>     sidebar-next
 bind index <up>       sidebar-prev
@@ -59,15 +58,12 @@ bind index <right>    sidebar-open
 #set status_format = "---[ Folder: %f ]---[%r%n messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]---%>-%?p?( %p postponed )?---""
 
 # Fucking html mail
-#auto_view text/html
-#alternative_order text/plain text/enriched text/html
+auto_view text/html
+alternative_order text/plain text/enriched text/html
 
 # Colors
-# source ~/.mutt/mutt-colors-solarized-dark-256.muttrc
+source ~/.mutt/mutt-colors-solarized-dark-256.muttrc
 
-# Notmuch
-# 'L' performs a notmuch query, showing only the results
-#macro index L "<enter-command>unset wait_key<enter><shell-escape>read -p 'notmuch query: ' x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;chomp@a;s/\^id:// for@a;$,=\"|\";print@a'\`\"<enter>" "show only messages matching a notmuch pattern"
 # 'a' shows all messages again (supersedes default <alias> binding)
 macro index a "<limit>all\n" "show all messages (undo limit)"
 
@@ -88,13 +84,16 @@ set imap_keepalive = 300
 unset imap_passive
 set mail_check = 60
 
+set ssl_force_tls = yes
+unset ssl_starttls
+
 # IOCOM
 source "~/.mutt/DswanIOCOM.muttrc"
-folder-hook 'imaps://dswan@secure.emailsrvr.com""' 'source ~/.mutt/DswanIOCOM.muttrc'
+folder-hook 'imaps://secure.emailsrvr.com' 'source ~/.mutt/DswanIOCOM.muttrc'
 
 # Gmail
 source "~/.mutt/DustinswanGmail.muttrc"
-folder-hook 'imaps://dustinswan@imap.gmail.com' 'source ~/.mutt/DustinswanGmail.muttrc'
+folder-hook 'imaps://imap.gmail.com' 'source ~/.mutt/DustinswanGmail.muttrc'
 
-macro index <f2> '<change-folder>imaps://dustinswan@imap.gmail.com<enter>'
-macro index <f3> '<change-folder>imaps://dswan@secure.emailsrvr.com<enter>'
+macro index <f2> '<change-folder>imaps://imap.gmail.com<enter>'
+macro index <f3> '<change-folder>imaps://secure.emailsrvr.com<enter>'