source multiple mailboxes files

[etc/mutt.git] / .mutt / muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 6571ea003327851863f621f6cb8d4c7be5e151c0..2b54bdf140482c92e74bc8026e723bbb9f7db586 100644 (file)
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -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.
 # 
 # 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
 #
 # 
 # set forward_quote=no
 #


@@ -2364,6 +2364,7 @@ set pgp_retainable_sigs=yes
 # have been marked as ``disabled'' by the user.
 # (PGP only)
 # 
 # have been marked as ``disabled'' by the user.
 # (PGP only)
 # 

+set pgp_show_unusable=no

 # 
 # set pgp_sign_as=""
 #
 # 
 # set pgp_sign_as=""
 #


@@ -2377,7 +2378,7 @@ set pgp_retainable_sigs=yes
 # keyid form to specify your key (e.g., ``0x00112233'').
 # (PGP only)
 # 
 # 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
 #
 # 
 # set pgp_strict_enc=yes
 #


@@ -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.
 # 
 # Note: On Debian systems, this option is set by default to
 # ``threads'' in /etc/Muttrc.
 # 

+set sort=threads

 # 
 # set sort_alias=alias
 #
 # 
 # set sort_alias=alias
 #


@@ -4545,8 +4547,9 @@ source $my_confdir/lists
 source $my_confdir/spam
 source $my_confdir/hooks
 
 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|"
 
 set alias_file="$my_confdir/aliases"
 source "test -f $alias_file && cat $alias_file 2>/dev/null || echo unset alias_file|"