X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/f1ac6b910d78eb5703e430e4d3e38490981cc9bd..f44295774f814c854c0cde49fc59b5a756ffcda8:/.mutt/muttrc?ds=sidebyside

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 49df8e3..2b54bdf 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -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
 #
@@ -1847,7 +1847,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 +1855,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/)"
+#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 +2364,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 +2378,7 @@ set pgp_retainable_sigs=yes
 # keyid form to specify your key (e.g., ``0x00112233'').
 # (PGP only)
 # 
-set pgp_sign_as="0x330c4a75"
+set pgp_sign_as="0x9C9D6979AE941637"
 # 
 # set pgp_strict_enc=yes
 #
@@ -3430,7 +3431,7 @@ set record="=store"
 # and replying. The default value corresponds to the English "Re:" and
 # the German "Aw:".
 # 
-set reply_regexp="^((re([[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:space:]]*)+"
+set reply_regexp="^((re([-[(]?[[:digit:]]+[)]]?)?|a(nt)?w(ort)?|wg|s(gkb|v)):[[:space:]]*)+"
 # 
 # set reply_self=no
 #
@@ -3896,6 +3897,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 +4126,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
 #
@@ -4544,8 +4547,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_offlineimap_mailboxes = "$VARDIR/offlineimap/mailboxes"
+set my_mutt_mailboxes = "$VARDIR/mutt/mailboxes"
+source "cat $my_offlineimap_mailboxes $my_mutt_mailboxes 2>/dev/null|"
 
 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