mutt: Update config

5 files changed, 330 insertions, 25 deletions

diff --git a/.mutt/aliases b/.mutt/aliases
new file mode 100644
index 0000000..6074ce0
--- /dev/null
+++ b/.mutt/aliases
@@ -0,0 +1,3 @@
+alias gentoo-dev          gentoo-dev@lists.gentoo.org
+alias gentoo-dev-announce gentoo-dev-announce@lists.gentoo.org
+alias gentoo-project      gentoo-project@lists.gentoo.org
diff --git a/.mutt/colors.muttrc b/.mutt/colors.muttrc
new file mode 100644
index 0000000..a9af895
--- /dev/null
+++ b/.mutt/colors.muttrc
@@ -0,0 +1,87 @@
+# vim: filetype=muttrc
+
+# basic colors ---------------------------------------------------------
+
+color normal        white           default         
+color error         brightred       default         
+#color tilde         color235        default         
+#color message       brightblack     default         
+#color markers       red             color254        
+#color attachment    color254        default         
+color search        brightwhite     default         
+color status        brightwhite     blue
+color indicator     black           brightgreen
+color tree          brightblue      default
+
+# basic monocolor screen
+mono  bold          bold
+mono  underline     underline
+mono  indicator     reverse
+mono  error         bold
+
+# index ----------------------------------------------------------------
+
+##color index         red             default         "~D(!~p|~p)"               # deleted
+##color index         color235        default         ~F                         # flagged
+##color index         color166        default         ~=                         # duplicate messages
+##color index         color240        default         "~A!~N!~T!~p!~Q!~F!~D!~P"  # the rest
+##color index         J_base          default         "~A~N!~T!~p!~Q!~F!~D"      # the rest, new
+#color index         red             default         "~A"                        # all messages
+#color index         color166        default         "~E"                        # expired messages
+color index         white           default         "~N"                        # new messages
+#color index         white           default         "~O"                        # old messages
+#color index         color61         default         "~Q"                        # messages that have been replied to
+color index         default         default         "~R"                        # read messages
+color index         white           default         "~U"                        # unread messages
+#color index         white           default         "~U~$"                      # unread, unreferenced messages
+#color index         brightblack     default         "~v"                        # messages part of a collapsed thread
+#color index         brightblack     default         "~P"                        # messages from me
+#color index         color37         default         "~p!~F"                     # messages to me
+#color index         color37         default         "~N~p!~F"                   # new messages to me
+#color index         color37         default         "~U~p!~F"                   # unread messages to me
+#color index         color240        default         "~R~p!~F"                   # messages to me
+#color index         red             default         "~F"                        # flagged messages
+#color index         red             default         "~F~p"                      # flagged messages to me
+#color index         red             default         "~N~F"                      # new flagged messages
+#color index         red             default         "~N~F~p"                    # new flagged messages to me
+#color index         red             default         "~U~F~p"                    # new flagged messages to me
+color index         brightblack     red             "~D"                        # deleted messages
+color index         default         default         "~v~(!~N)"                  # collapsed thread with no unread
+color index         brightwhite     default         "~v~(~N)"                   # collapsed thread with some unread
+## statusbg used to indicated flagged when foreground color shows other status
+## for collapsed thread
+#color index         red             color235        "~v~(~F)!~N"                # collapsed thread with flagged, no unread
+#color index         color136        color235        "~v~(~F~N)"                 # collapsed thread with some unread & flagged
+#color index         color64         color235        "~N~v~(~F~N)"               # collapsed thread with unread parent & flagged
+#color index         color64         color235        "~N~v~(~F)"                 # collapsed thread with unread parent, no unread inside, but some flagged
+#color index         color37         color235        "~v~(~p)"                   # collapsed thread with unread parent, no unread inside, some to me directly
+#color index         color136        red             "~v~(~D)"                   # thread with deleted (doesn't differentiate between all or partial)
+##color index         color136        default         "~(~N)"                    # messages in threads with some unread
+##color index         color64         default         "~S"                       # superseded messages
+##color index         red             default         "~T"                       # tagged messages
+##color index         color166        red             "~="                       # duplicated messages
+#
+# message headers ------------------------------------------------------
+
+color header        brightwhite     default         "^(From|Subject):"
+
+# body -----------------------------------------------------------------
+
+color quoted        default         default         
+#color quoted1       color37         default         
+#color quoted2       color136        default         
+#color quoted3       red             default         
+#color quoted4       color166        default         
+#
+#color signature     color240        default         
+#color bold          color235        default         
+#color underline     color235        default         
+#color normal        color244        default         
+
+## PGP
+
+color body          brightblack     default         " +aka:.*"
+color body          brightgreen     default         "^Good signature .*"
+color body          brightwhite     red             "^\\*BAD\\* signature from.*"
+mono  body          bold                            "^Good signature"
+mono  body          bold                            "^\\*BAD\\* signature from.*"
diff --git a/.mutt/mailcap b/.mutt/mailcap
new file mode 100644
index 0000000..637f214
--- /dev/null
+++ b/.mutt/mailcap
@@ -0,0 +1,84 @@
+text/calendar; vcalendar %s; copiousoutput;
+
+# Plain text
+text/plain; vim %s
+
+#text/html; w3m -I %{charset} -dump %s; nametemplate=%s.html; copiousoutput
+text/html; lynx -dump -width=78 %s | sed 's/^   //'; copiousoutput; needsterminal; nametemplate=%s.html
+
+image/jpg; eog %s
+image/jpeg; eog %s
+image/pjpeg; eog %s
+image/png; eog %s
+image/gif; eog %s
+
+application/pdf; evince %s
+
+application/pgp-encrypted; gpg --decrypt; copiousoutput
+
+# LibreOffice stuff
+application/vnd.oasis.opendocument.database; libreoffice --nologo --base '%s'; edit=libreoffice --nologo --base '%s'; test=test -n "$DISPLAY"; description="OpenDocument Database"; nametemplate=%s.odb
+application/vnd.oasis.opendocument.chart; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Chart"; nametemplate=%s.odc
+application/vnd.oasis.opendocument.spreadsheet; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet"; nametemplate=%s.ods
+application/vnd.oasis.opendocument.spreadsheet-template; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Spreadsheet Template"; nametemplate=%s.ots
+application/vnd.oasis.opendocument.graphics; libreoffice --nologo --draw '%s'; edit=libreoffice --nologo --draw '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing"; nametemplate=%s.odg
+application/vnd.oasis.opendocument.graphics-template; libreoffice --nologo --draw '%s'; edit=libreoffice --nologo --draw '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing Template"; nametemplate=%s.otg
+application/vnd.oasis.opendocument.presentation; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="OpenDocument Presentation"; nametemplate=%s.odp
+application/vnd.oasis.opendocument.presentation-template; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="OpenDocument Presentation Template"; nametemplate=%s.otp
+application/vnd.oasis.opendocument.formula; libreoffice --nologo --math '%s'; edit=libreoffice --nologo --math '%s'; test=test -n "$DISPLAY"; description="OpenDocument Formula"; nametemplate=%s.odf
+application/vnd.oasis.opendocument.text; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document"; nametemplate=%s.odt
+application/vnd.oasis.opendocument.text-master; libreoffice --nologo -global '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Master Document"; nametemplate=%s.odm
+application/vnd.oasis.opendocument.text-template; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text Document Template"; nametemplate=%s.ott
+application/vnd.oasis.opendocument.text-web; libreoffice --nologo -web '%s'; edit=libreoffice --nologo -web '%s'; test=test -n "$DISPLAY"; description="OpenDocument HTML Document Template"; nametemplate=%s.oth
+application/vnd.sun.xml.base; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; description="OpenOffice.org Database"; nametemplate=%s.sdb
+application/vnd.sun.xml.calc; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet"; nametemplate=%s.sxc
+application/vnd.sun.xml.calc.template; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet Template"; nametemplate=%s.stc
+application/vnd.sun.xml.draw; libreoffice --nologo --draw '%s'; edit=libreoffice --nologo --draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing"; nametemplate=%s.sxd
+application/vnd.sun.xml.draw.template; libreoffice --nologo --draw '%s'; edit=libreoffice --nologo --draw '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing Template"; nametemplate=%s.std
+application/vnd.stardivision.calc; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="StarCalc 5.0"; nametemplate=%s.sdc
+application/vnd.stardivision.chart; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="StarChart 5.0"; nametemplate=%s.sds
+application/vnd.stardivision.draw; libreoffice --nologo --draw '%s'; edit=libreoffice --nologo --draw '%s'; test=test -n "$DISPLAY"; description="StarDraw 5.0"; nametemplate=%s.sda
+application/vnd.stardivision.impress; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="StarImpress 5.0"; nametemplate=%s.sdd
+application/vnd.stardivision.math; libreoffice --nologo --math '%s'; edit=libreoffice --nologo --math '%s'; test=test -n "$DISPLAY"; description="StarMath 5.0"; nametemplate=%s.sdf
+application/vnd.stardivision.writer-global; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0 Master Document"; nametemplate=%s.sgl
+application/vnd.stardivision.writer; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0"; nametemplate=%s.sdw
+application/vnd.sun.xml.impress; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation"; nametemplate=%s.sxi
+application/vnd.sun.xml.impress.template; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation Template"; nametemplate=%s.sti
+application/vnd.sun.xml.math; libreoffice --nologo --math '%s'; edit=libreoffice --nologo --math '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Formula"; nametemplate=%s.sxm
+application/vnd.sun.xml.writer; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; description="OpenOffice.org Text Document"; nametemplate=%s.sxw
+application/vnd.sun.xml.writer.global; libreoffice --nologo -global '%s'; edit=libreoffice --nologo --writer '%s'; description="OpenOffice.org Master Document"; nametemplate=%s.sxg
+application/vnd.sun.xml.writer.template; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; description="OpenOffice.org Text Document Template"; nametemplate=%s.stw
+text/csv; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv
+text/spreadsheet; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Spreadsheet Interchange Document"; nametemplate=%s.slk
+application/x-quattropro; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Quattro Pro 6 for Windows Spreadsheet"; nametemplate=%s.wb2
+application/x-dbf; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf
+application/vnd.ms-excel.sheet.macroEnabled.12; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet with Macros Enabled"; nametemplate=%s.xlsm
+application/vnd.ms-excel.template.macroEnabled.12; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template with Macros Enabled"; nametemplate=%s.xltm
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet"; nametemplate=%s.xlsx
+application/vnd.openxmlformats-officedocument.spreadsheetml.template; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML Spreadsheet Template"; nametemplate=%s.xltx
+application/vnd.lotus-1-2-3; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Lotus 1-2-3 spreadsheet"; nametemplate=%s.123
+application/vnd.ms-excel; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls
+application/msexcel; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls
+application/x-dbase; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf
+text/x-csv; libreoffice --nologo --calc '%s'; edit=libreoffice --nologo --calc '%s'; test=test -n "$DISPLAY"; description="CSV Document"; nametemplate=%s.csv
+application/vnd.ms-powerpoint.presentation.macroEnabled.12; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation with Macros Enabled"; nametemplate=%s.pptm
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show with Macros Enabled"; nametemplate=%s.ppsm
+application/vnd.ms-powerpoint.template.macroEnabled.12; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template with Macros Enabled"; nametemplate=%s.potm
+application/vnd.openxmlformats-officedocument.presentationml.presentation; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation"; nametemplate=%s.pptx
+application/vnd.openxmlformats-officedocument.presentationml.slideshow; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Slide Show"; nametemplate=%s.ppsx
+application/vnd.openxmlformats-officedocument.presentationml.template; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Office Open XML Presentation Template"; nametemplate=%s.potx
+application/vnd.ms-powerpoint; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document"; nametemplate=%s.ppt
+application/mspowerpoint; libreoffice --nologo --impress '%s'; edit=libreoffice --nologo --impress '%s'; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document"; nametemplate=%s.ppt
+text/mathml; libreoffice --nologo --math '%s'; edit=libreoffice --nologo --math '%s'; test=test -n "$DISPLAY"; description="MathML Formula"; nametemplate=%s.mml
+application/rtf; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf
+#application/x-extension-txt; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Plain Text Document"; nametemplate=%s.txt
+application/x-t602; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="T602 Document"; nametemplate=%s.602
+application/vnd.wordperfect; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect Document"; nametemplate=%s.wp
+application/vnd.ms-word.document.macroEnabled.12; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document with Macros Enabled"; nametemplate=%s.docm
+application/vnd.ms-word.template.macroEnabled.12; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document Template with Macros Enabled"; nametemplate=%s.dotm
+application/vnd.openxmlformats-officedocument.wordprocessingml.document; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document"; nametemplate=%s.docx
+application/vnd.openxmlformats-officedocument.wordprocessingml.template; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Office Open XML Document Template"; nametemplate=%s.dotx
+application/vnd.ms-works; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Works Document"; nametemplate=%s.wps
+application/msword; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Microsoft Word Document"; nametemplate=%s.doc
+application/wordperfect; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="WordPerfect Document"; nametemplate=%s.wp
+text/rtf; libreoffice --nologo --writer '%s'; edit=libreoffice --nologo --writer '%s'; test=test -n "$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf
diff --git a/.mutt/muttrc b/.mutt/muttrc
new file mode 100644
index 0000000..f8ada45
--- /dev/null
+++ b/.mutt/muttrc
@@ -0,0 +1,156 @@
+# vim: ft=muttrc
+
+set realname="Matt Turner"
+set from="mattst88@gmail.com"
+
+macro generic "<esc>1" ":set from=mattst88@gmail.com"
+macro generic "<esc>2" ":set from=mattst88@gentoo.org"
+
+alternative_order text/enriched text/html text/plain
+auto_view text/x-vcard text/html text/enriched
+
+set mbox_type = Maildir
+set folder    = "~/.mail"
+set mbox      = "+intel/Inbox"
+set record    = "+intel/Sent Items"
+set postponed = "+intel/Drafts"
+set spoolfile = "+intel/Inbox"
+set trash     = "+intel/Deleted Items"
+
+mailboxes = \
++intel/Inbox \
++intel/Sent\ Items \
++intel/Drafts \
++intel/Deleted\ Items
+
+set header_cache=~/.mutt/hcache
+set mail_check_stats
+
+# sidebar
+#set sidebar_width=15
+set sidebar_short_path = yes
+set sidebar_format="%B%* %N"
+set sidebar_visible = yes
+bind index,pager B sidebar-toggle-visible
+bind index,pager \ck sidebar-prev
+bind index,pager \cj sidebar-next
+bind index,pager \Co sidebar-open
+
+set alias_file= ~/.mutt/aliases
+source $alias_file
+
+set sendmail="/usr/bin/msmtp"
+
+### PGP
+set crypt_use_gpgme=yes
+
+# Automatically sign all outgoing messages
+set crypt_autosign=yes
+
+# Automatically verify the sig of a message when opened
+set crypt_verify_sig=yes
+
+# Automatically sign replies to messages which are signed
+# Automatically encrypt replies to messages which are encrypted
+# Automatically sign replies to messages which are encrypted
+set crypt_replysign=yes
+set crypt_replyencrypt=yes
+set crypt_replysignencrypted=yes
+
+folder-hook . `rm -f /tmp/mutt/*`
+
+# Basic Options --------------------------------------
+set wait_key = no        # shut up, mutt
+set mbox_type = Maildir  # mailbox type
+set timeout = 3          # idle time before scanning
+set mail_check = 0       # minimum time between scans
+unset move               # gmail does that
+set delete               # don't ask, just do
+unset confirmappend      # don't ask, just do!
+set quit                 # don't ask, just do!!
+unset mark_old           # read/new is good enough for me
+set beep_new             # bell on new mails
+set pipe_decode          # strip headers and eval mimes when piping
+set thorough_search      # strip headers and eval mimes before searching
+set recall = no          # don't ask if I want to recall a postponed message
+
+# Status Bar -----------------------------------------
+set status_chars  = " *%A"
+set status_format = "───[ Folder: %f ]───[%r%m messages%?n? (%n new)?%?d? (%d to delete)?%?t? (%t tagged)? ]───%>─%?p?( %p postponed )?───"
+
+# Index View Options ---------------------------------
+set date_format = "%m/%d"
+set sort = threads                         # like gmail
+set sort_aux = reverse-last-date-received  # like gmail
+set uncollapse_jump                        # don't collapse on an unread message
+set sort_re                                # thread based on regex
+set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
+
+# Format for index list
+set index_format = "%4C %Z %[%d/%b]  %-16.15F %?M?(%3M)&     ? %s %>"
+
+macro index F "<shell-escape>mbsync -a<enter>" "run mbsync to sync all mail"
+
+# Index Key Bindings ---------------------------------
+bind index gg       first-entry
+bind index G        last-entry
+bind index R        group-reply
+bind index <tab>    sync-mailbox
+bind index P recall-message
+
+# Pager View Options ---------------------------------
+set pager_index_lines = 10 # number of index lines to show
+set pager_context = 3      # number of context lines to show
+set pager_stop             # don't go to next message automatically
+set menu_scroll            # scroll in menus
+set tilde                  # show tildes like in vim
+unset markers              # no ugly plus signs
+auto_view text/html
+set strict_threads         # Don't thread by message subjec
+alternative_order text/html text/enriched text/plain 
+
+set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
+alternative_order text/plain text/enriched text/html
+
+# Header Options -------------------------------------
+ignore *                                # ignore all headers
+unignore from: to: cc: date: subject:   # show only these
+unhdr_order *                           # some distros order things by default
+hdr_order from: to: cc: date: subject:  # and in this order
+
+# Pager Key Bindings ---------------------------------
+bind pager k  previous-line
+bind pager j  next-line
+bind pager gg top
+bind pager G  bottom
+bind pager R  group-reply
+
+# View attachments properly.
+bind attach <return> view-mailcap
+
+# Compose View Options -------------------------------
+set envelope_from                    # which from?
+set sig_dashes                       # dashes before sig
+set edit_headers                     # show headers when composing
+set fast_reply                       # skip to compose when replying
+unset reply_self                     # don't include myself when replying
+unset askcc                          # don't ask for CC:
+set fcc_attach                       # save attachments with the body
+unset mime_forward                   # forward attachments as part of body
+set forward_format = "Fwd: %s"       # format of subject when forwarding
+set forward_decode                   # decode when forwarding
+set attribution = "On %d, %n wrote:" # format of quoting header
+set reply_to                         # reply to Reply to: field
+set reverse_name                     # reply as whomever it was to
+set include                          # include message in replies
+set forward_quote                    # include message in forwards
+set editor = "vim"                   # Use terminal Vim to compose email.
+set text_flowed = yes                # Flow text instead of using line breaks
+set sig_on_top                       # puts signature above quoted text
+# set display_filter = ~/.mutt/display_filter.sh
+set copy = yes
+
+set mailcap_path = ~/.mutt/mailcap
+
+source ~/.mutt/colors.muttrc
+#source /etc/mutt/notmuch-mutt.rc
diff --git a/.muttrc b/.muttrc
deleted file mode 100644
index 5c25aa6..0000000
--- a/.muttrc
+++ /dev/null
@@ -1,25 +0,0 @@
-set realname="Matt Turner"
-set from="mattst88@gmail.com"
-
-### PGP
-set pgp_sign_as=0x974CA72A
-set pgp_auto_decode = yes
-set pgp_use_gpg_agent = yes
-set pgp_autosign=yes
-set pgp_replyencrypt=yes
-
-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"
-set pgp_sign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_clearsign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x974CA72A -- -r %r -- %f"
-set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 0x974CA72A -- -r %r -- %f"
-set pgp_import_command="gpg --no-verbose --import -v %f"
-set pgp_export_command="gpg --no-verbose --export --armor %r"
-set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
-set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r"
-set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"
-
-set pgp_timeout=1800
-set pgp_good_sign="^gpg: Good signature from"