X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/90fd01289d3b5edecaeb9c799e8cac31eeab500f..47a34268b18fe509d8ebec679ef1a9d7529060ac:/.mutt/muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 7bae4ba..f042cbb 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -1,6 +1,6 @@
 # from /usr/share/doc/mutt/examples/Muttrc.gz
 
-set my_confdir="~/.mutt"
+set my_confdir="$HOME/.mutt"
 
 # set abort_nosubject=ask-yes
 #
@@ -247,7 +247,7 @@ set my_confdir="~/.mutt"
 # in a reply.  For a full listing of defined printf()-like sequences see
 # the section on ``$index_format''.
 # 
-set attribution="also sprach %n <%a> [%[%Y.%m.%d.%H%M %z]]:"
+set attribution="also sprach %n <%a> [%[%Y-%m-%d %H:%M %z]]:"
 # 
 # set autoedit=no
 #
@@ -923,7 +923,7 @@ set folder="~/mail"
 # This variable controls the default subject when forwarding a message.
 # It uses the same format sequences as the ``$index_format'' variable.
 # 
-set forward_format="%s [Fwd: %a]"
+set forward_format="(fwd) %s"
 # 
 # set forward_quote=no
 #
@@ -1372,7 +1372,7 @@ set ignore_list_reply_to=yes
 # use the viewer defined in that entry to convert the body part to text
 # form.
 # 
-set implicit_autoview=yes
+set implicit_autoview=no
 # 
 # set include=ask-yes
 #
@@ -1552,6 +1552,7 @@ set include=yes
 # This variable specifies which files to consult when attempting to
 # display MIME bodies not directly supported by Mutt.
 # 
+set mailcap_path="$my_confdir/mailcap.icalendar:$my_confdir/mailcap.backgrounding:$my_confdir/mailcap.htmldump"
 # 
 # set mailcap_sanitize=yes
 #
@@ -1847,7 +1848,7 @@ set mime_forward=ask-yes
 # This option sets the filename used for signature parts in PGP/MIME
 # signed messages.
 # 
-set pgp_mime_signature_filename="digital_signature_gpg.asc"
+#set pgp_mime_signature_filename="digital_signature_gpg.asc"
 # 
 # set pgp_mime_signature_description="Digital signature"
 #
@@ -1855,7 +1856,7 @@ set pgp_mime_signature_filename="digital_signature_gpg.asc"
 # Type: string
 # Default: "Digital signature"
 # 
-set pgp_mime_signature_description="Digital signature (see http://martin-krafft.net/gpg/sig-policy/999bbcc4/current)"
+#set pgp_mime_signature_description="Digital signature (see http://martin-krafft.net/gpg/sig-policy/999bbcc4/current)"
 # 
 # This option sets the Content-Description used for signature parts in
 # PGP/MIME signed messages.
@@ -2364,6 +2365,7 @@ set pgp_retainable_sigs=yes
 # have been marked as ``disabled'' by the user.
 # (PGP only)
 # 
+set pgp_show_unusable=no
 # 
 # set pgp_sign_as=""
 #
@@ -2377,7 +2379,7 @@ set pgp_retainable_sigs=yes
 # keyid form to specify your key (e.g., ``0x00112233'').
 # (PGP only)
 # 
-set pgp_sign_as="0x999bbcc4"
+set pgp_sign_as="0x9C9D6979AE941637"
 # 
 # set pgp_strict_enc=yes
 #
@@ -3686,7 +3688,7 @@ set save_history=100
 # arguments as recipient addresses.
 # 
 #set sendmail="/bin/true"
-set sendmail="~/.mutt/sendmail"
+set sendmail="$my_confdir/sendmail"
 #set sendmail="/usr/sbin/sendmail -oem -oi"
 # 
 # set sendmail_wait=0
@@ -3896,6 +3898,7 @@ set simple_search="~L %s | ~s %s"
 # Note: On Debian systems, this option is set by default to
 # ``threads'' in /etc/Muttrc.
 # 
+set sort=threads
 # 
 # set sort_alias=alias
 #
@@ -4124,6 +4127,7 @@ set status_format=" %r %f [m:%?M?%M/?%m%?n? n:%n?%?o? o:%o?%?d? d:%d?%?F? f:%F?%
 # ``$sort_re'' for a less drastic way of controlling this
 # behaviour.
 # 
+set strict_threads=yes
 # 
 # set suspend=yes
 #
@@ -4526,14 +4530,16 @@ set xterm_set_titles=yes
 # Controls the format of the title bar of the xterm provided that
 # xterm_set_titles has been set. This string is identical in formatting
 # to the one used by ``$status_format''.
-# 
+#
 set xterm_title="mutt@%h [%?M?%M/?%m, n:%n]%?V? [%V]?"
-# 
+#
 
-auto_view text/html
+auto_view text/html application/ics text/calendar
 #auto_view application/x-gunzip application/x-tar-gz application/x-tar application/x-gtar
 #auto_view application/postscript
-alternative_order text/enriched text/plain text application/postscript image/*
+alternative_order multipart/mixed multipart/related text/html text/enriched text/*
+#alternative_order text/plain text/enriched text/html
+#alternative_order text/enriched text/plain text application/postscript image/*
 mime_lookup application/octet-stream
 
 source $my_confdir/colours
@@ -4544,8 +4550,11 @@ source $my_confdir/lists
 source $my_confdir/spam
 source $my_confdir/hooks
 
-set my_mailboxes = `ls ~/.var/offlineimap/mailboxes 2>/dev/null || echo /dev/null`
-source $my_mailboxes
+set my_mutt_mailboxes = "$VARDIR/mutt/mailboxes"
+source "test -f $my_mutt_mailboxes && cat $my_mutt_mailboxes|
+#source "$my_confdir/list-mailboxes $folder $spoolfile|"
 
 set alias_file="$my_confdir/aliases"
 source "test -f $alias_file && cat $alias_file 2>/dev/null || echo unset alias_file|"
+
+source $my_confdir/sidebar