mutt: Cleanup

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

1 files changed, 61 insertions, 59 deletions

diff --git a/mutt/muttrc b/mutt/muttrc
index 6b34919..e8f47b3 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,25 +1,25 @@
-## Mutt ##
+# mutt
 
-# Sources #
+## sources
 
 source "gpg2 -dq $HOME/.mutt/passwords.gpg |"
 
-# Encoding #
+## encoding
 
 set charset="UTF-8"
 set locale="fr_FR.UTF-8"
-set assumed_charset=UTF-8
-set config_charset=UTF-8
-set send_charset=UTF-8
+set assumed_charset="UTF-8"
+set config_charset="UTF-8"
+set send_charset="UTF-8"
 
 unset meta_key
 unset allow_8bit
 
-# Alternatives #
+## alternatives
 
 alternative_order text/plain text/enriched text text/html
 
-# Headers  #
+## headers
 
 ignore *
 unignore From: Date: Subject: To: CC:
@@ -27,7 +27,7 @@ unignore From: Date: Subject: To: CC:
 unhdr_order *
 hdr_order From: To: Date: CC: Subject:
 
-# Colors #
+## colors
 
 color normal white black
 color quoted cyan black
@@ -38,69 +38,69 @@ color indicator black cyan
 color search black magenta
 color signature yellow black
 
-# Macro #
+## macros
 
 macro index,pager <Tab> "<change-folder>?<toggle-mailboxes>" "Show incoming mailboxes list"
 
-macro compose v ":source ~/.mutt/identity_\`echo $(($(date +%s) % \
-    $(ls ~/.mutt/identity_[0-9]* | wc -l) + 1))\`\n"
-
-# Variables #
-
-# Documentation : http://www.mutt.org/doc/manual/manual-6.html#variables
-
-## IMAP ##
+## imap
 
 set imap_user=paulk
 set imap_pass=$my_pw_personal
-set folder=imap://paulk@gagarine.paulk.fr/
+set folder="imap://paulk@gagarine.paulk.fr/"
 set spoolfile=+inbox
 
-# Folders are listed manually
-#set imap_list_subscribed
-#set imap_check_subscribed
+#set imap_list_subscribed=yes
+#set imap_check_subscribed=yes
 
-## SMTP ##
+## smtp
 
-set smtp_url=smtp://$imap_user:$imap_pass@gagarine.paulk.fr
+set smtp_url="smtp://$imap_user:$imap_pass@gagarine.paulk.fr"
 
-##  SSL ##
+## ssl
 
 set ssl_starttls=yes
 set ssl_force_tls=yes
 
-## Cache ##
+## cache
 
 set header_cache="~/.cache/mutt"
 set message_cachedir="~/.cache/mutt"
 
-## Common ##
-
-set sleep_time=0
+## display
 
-set reply_regexp="^((re|Re|RE)([\[0-9\]+])*|aw)[ \t]*:[ \t]*"
-set reverse_name
+set date_format="%d/%m/%y %H:%M"
+set index_format="%C/%m - %D %S %n - %s"
+set folder_format="%C - %3s %N %f"
+set status_format="%v - %f - %u/%m"
 
 set strict_threads="yes"
-set sort_browser="reverse-date"
-set sort_aux="last-date-received"
+set sort_browser=reverse-date
+set sort_aux=last-date-received
+set sleep_time=0
 
-set record="+sent"
-set postponed="+drafts"
 set beep_new="yes"
 set check_new="yes"
+
+## folders
+
+set record=+sent
+set postponed=+drafts
+
+## compose
+
 set editor="gedit --wait"
-set date_format="%d/%m/%y %H:%M"
-set index_format="%C/%m - %D %S %n - %s"
-set folder_format="%C - %3s %N %f"
-#set compose_format=""
+set fast_reply=yes
 
-set realname="Paul Kocialkowski"
-set fast_reply="yes"
-set status_format="%v - %f - %u/%m"
-set mailcap_path = ~/.mutt/mailcap
+## reply
 
-## GPG ##
+set reply_regexp="^((re|Re|RE)([\[0-9\]+])*|aw)[ \t]*:[ \t]*"
+
+## mailcap
+
+set mailcap_path="~/.mutt/mailcap"
+bind attach <return> view-mailcap
+
+## gpg
 
 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"
@@ -127,11 +127,17 @@ set crypt_verify_sig=yes
 
 message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
 
-# Alternates #
+# identity
+
+set realname="Paul Kocialkowski"
+set from="contact@paulk.fr"
+set use_from=yes
+
+# alternates
 
 alternates "(paulk@paulk\.fr)|(contact@paulk\.fr)|(paulk@replicant\.us)|(paulk@embedded-freedom\.org)"
 
-# Hooks #
+# hooks
 
 folder-hook . set sort=threads
 folder-hook contact set sort=date-sent
@@ -140,27 +146,23 @@ folder-hook replicant set sort=date-sent
 folder-hook replicant/notifications set sort=threads
 folder-hook embedded-freedom set sort=date-sent
 
-folder-hook inbox set from=paulk@paulk.fr
-folder-hook contact set from=contact@paulk.fr
-folder-hook replicant set from=paulk@replicant.us
-folder-hook embedded-freedom set from=paulk@embedded-freedom.org
+folder-hook inbox set from="paulk@paulk.fr"
+folder-hook contact set from="contact@paulk.fr"
+folder-hook replicant set from="paulk@replicant.us"
+folder-hook embedded-freedom set from="paulk@embedded-freedom.org"
 
 send-hook "~f paulk@paulk.fr" unset signature
 reply-hook "~f paulk@paulk.fr" unset signature
 
-send-hook "~f contact@paulk.fr" set signature=~/.mutt/signatures/paulk
-reply-hook "~f contact@paulk.fr" set signature=~/.mutt/signatures/paulk
+send-hook "~f contact@paulk.fr" set signature="~/.mutt/signatures/paulk"
+reply-hook "~f contact@paulk.fr" set signature="~/.mutt/signatures/paulk"
 
-send-hook "~f paulk@replicant.us" set signature=~/.mutt/signatures/replicant
-reply-hook "~f paulk@replicant.us" set signature=~/.mutt/signatures/replicant
+send-hook "~f paulk@replicant.us" set signature="~/.mutt/signatures/replicant"
+reply-hook "~f paulk@replicant.us" set signature="~/.mutt/signatures/replicant"
 
 send-hook "~f paulk@embedded-freedom.org" unset signature
 reply-hook "~f paulk@embedded-freedom.org" unset signature
 
-# Mailboxes #
+# mailboxes
 
 mailboxes +inbox +contact +contact/patches +embedded-freedom +replicant +replicant/notifications +sent
-
-# Bind #
-
-bind attach <return> view-mailcap