X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=mutt%2F.mutt%2Fmuttrc;h=eb2dfdd620ce31fce46a04dba85bca1c05a2b213;hb=9e0eb5e482e453e3e80a6fef313654993553ebfd;hp=fe2c17cc8095a6e256cb7ad3f016cf906903d9e8;hpb=f8f88d253b5b9d7fa1ca39344cec44be79d8db80;p=dotfiles.git

diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc
index fe2c17c..eb2dfdd 100644
--- a/mutt/.mutt/muttrc
+++ b/mutt/.mutt/muttrc
@@ -23,12 +23,14 @@ set hostname = "stargrave.org"
 set realname = "Sergey Matveev"
 set query_command="mu cfind --format=mutt-ab '%s'"
 set forward_format = "Fwd: %s"
-set indent_string = ">"
-set attribution = "*** %n [%{%Y-%m-%d %H:%M}]:"
 set index_format = "%4C %Z[%1H] %{%m-%d} [%N] %-15.15L (%?l?%4l&%4c?)%?M?[#%02M]?%?Y?[%Y]? %s"
 set pipe_decode = yes
 set crypt_protected_headers_write = yes
 set print_command="cat > /tmp/mail-printed"
+my_hdr User-Agent: Mutt/2.1.3 GnuPG/2.3.2 Vim/8.2 FreeBSD/12.0 (amd64)
+set attribution = "*** %n [%{%Y-%m-%d %H:%M}]:"
+set forward_attribution_intro = "----- BEGIN %i -----"
+set forward_attribution_trailer = "----- END %i -----"
 
 macro index <F1> "<next-unread-mailbox><enter>" "Go to new mail"
 macro index <F5> ":set mbox_type = mbox\n" "mbox mailbox type"
@@ -60,40 +62,11 @@ unignore \
     User-Agent \
     Message-Id
 
-macro index <F2> ":source ~/.mutt/accounts/stargrave.org\n" "Profile: stargrave.org"
-macro index <F3> ":source ~/.mutt/accounts/stcnet.ru\n" "Profile: stcnet.ru"
-macro index <F4> ":source ~/.mutt/accounts/riseup.net\n" "Profile: riseup.net"
-
-alternates stargrave@stargrave.org junk@stargrave.org
-mailboxes =mbox \
-    =blog-comment \
-    =rss \
-    =monitoring \
-    =arbeit \
-    =crypto \
-    =debian \
-    =gnu \
-    =gnupg \
-    =golang \
-    =gopher \
-    =spam \
-    =suckless \
-    =fbsd \
-    =vim \
-    =zfs \
-    =zsh
-
-# set mime_forward = yes
-# set mime_forward_rest = yes
-
 fcc-hook .* $record
-
 folder-hook . "set sort = threads; push <collapse-all>"
 
-folder-hook =rss "set sort = date"
-folder-hook =blog-comment "set sort = date"
-folder-hook =monitoring "set sort = date"
-
-source ~/.mutt/monthly
+source ~/.mutt/mailboxes
+source ~/.mutt/accounts/rc
 
-source ~/.mutt/accounts/stargrave.org
+# set mime_forward = yes
+# set mime_forward_rest = yes