mutt: Update configuration

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

11 files changed, 339 insertions, 114 deletions

diff --git a/mutt/bootlin/muttrc b/mutt/bootlin/muttrc
new file mode 100644
index 0000000..217766f
--- /dev/null
+++ b/mutt/bootlin/muttrc
@@ -0,0 +1,43 @@
+# bootlin
+
+## password
+
+source "gpg -q --for-your-eyes-only --no-tty -d ~/.mutt/bootlin/passwords.gpg |"
+
+## mail
+
+set mbox_type=Maildir
+
+set folder="~/.mail/bootlin"
+set spoolfile="+/inbox"
+set postponed="+/drafts"
+set trash="+/trash"
+set record="+/sent"
+
+## smtp
+
+set smtp_url="smtp://paul.kocialkowski@bootlin.com:$smtp_pass@mail.gandi.net:587"
+
+## pgp
+
+set pgp_default_key=259A568D97887AD54179FB62DDC2E6CF7F9FBFD1
+
+## identity
+
+set realname="Paul Kocialkowski"
+set from="paul.kocialkowski@bootlin.com"
+set signature="~/.mutt/bootlin/signature"
+
+## alternates
+
+alternates "(paul.kocialkowski@bootlin\.com)|(paul@bootlin\.com)"
+
+## folders
+
+unmailboxes *
+mailboxes `find $HOME/.mail/bootlin/* -type d | sort | grep -vP "tmp$|new$|cur$" | sed "s,$HOME/.mail/bootlin/,+,g" | tr '\n' ' '`
+
+## cache
+
+set certificate_file="~/.mutt/bootlin/certificates"
+set header_cache="~/.cache/mutt/bootlin/headers"
diff --git a/mutt/bootlin/signature b/mutt/bootlin/signature
new file mode 100644
index 0000000..6ac0aef
--- /dev/null
+++ b/mutt/bootlin/signature
@@ -0,0 +1,3 @@
+Paul Kocialkowski, Bootlin
+Embedded Linux and kernel engineering
+https://bootlin.com
diff --git a/mutt/mailcap b/mutt/mailcap
index 8367128..749cdba 100644
--- a/mutt/mailcap
+++ b/mutt/mailcap
@@ -1,2 +1,4 @@
-text/html; iceweasel %s ; copiousoutput;
+text/plain; cat %s; copiousoutput
+text/html; elinks -dump %s; copiousoutput
 image/*; eog %s
+application/pdf; evince %s
diff --git a/mutt/muttrc b/mutt/muttrc
index e8f47b3..0004af6 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -1,13 +1,21 @@
 # mutt
 
-## sources
+## folders
+
+macro index <f1> "<sync-mailbox><enter-command>source ~/.mutt/paulk/muttrc<enter><change-folder>!<enter>"
+macro index <f2> "<sync-mailbox><enter-command>source ~/.mutt/bootlin/muttrc<enter><change-folder>!<enter>"
+
+source "$HOME/.mutt/muttrc-colors"
+source "$HOME/.mutt/bootlin/muttrc"
 
-source "gpg2 -dq $HOME/.mutt/passwords.gpg |"
+## pager
+
+bind pager "<up>" previous-line
+bind pager "<down>" next-line
 
 ## 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"
@@ -15,10 +23,48 @@ set send_charset="UTF-8"
 unset meta_key
 unset allow_8bit
 
+## ssl
+
+set ssl_starttls=yes
+set ssl_force_tls=yes
+
+## pgp
+
+set pgp_decode_command="gpg --no-verbose --batch --output - %f"
+set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f"
+set pgp_decrypt_command="gpg --no-verbose --batch --output - %f"
+set pgp_sign_command="gpg --no-verbose --batch --output - --armor --detach-sign --textmode %?a?-u %a? %f"
+set pgp_clearsign_command="gpg --no-verbose --batch --output - --armor --textmode --clearsign %?a?-u %a? %f"
+
+set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="pgpewrap gpg --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+
+set pgp_import_command="gpg --no-verbose --import -v %f"
+set pgp_export_command="gpg --no-verbose --export --armor %r"
+set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
+set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r"
+set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r"
+set pgp_good_sign="^gpg: Good signature from"
+set pgp_use_gpg_agent=yes
+
+## crypt
+
+set crypt_autopgp=yes
+set crypt_autosign=yes
+set crypt_replyencrypt=yes
+set crypt_replysignencrypted=yes
+
 ## alternatives
 
 alternative_order text/plain text/enriched text text/html
 
+## mailcap
+
+set mailcap_path="~/.mutt/mailcap"
+bind attach <return> view-mailcap
+
+auto_view text/html
+
 ## headers
 
 ignore *
@@ -32,137 +78,71 @@ hdr_order From: To: Date: CC: Subject:
 color normal white black
 color quoted cyan black
 color hdrdefault yellow black
-color tree cyan black
-color status cyan blue
-color indicator black cyan
+color tree blue black
+color status black yellow
+color indicator black blue
+
 color search black magenta
 color signature yellow black
 
-## macros
-
-macro index,pager <Tab> "<change-folder>?<toggle-mailboxes>" "Show incoming mailboxes list"
-
-## imap
-
-set imap_user=paulk
-set imap_pass=$my_pw_personal
-set folder="imap://paulk@gagarine.paulk.fr/"
-set spoolfile=+inbox
+color sidebar_highlight black yellow
+color sidebar_flagged red black
+color sidebar_divider blue black
+color sidebar_new yellow black
 
-#set imap_list_subscribed=yes
-#set imap_check_subscribed=yes
-
-## smtp
+## macros
 
-set smtp_url="smtp://$imap_user:$imap_pass@gagarine.paulk.fr"
+#macro index,pager <Tab> "<change-folder>?<toggle-mailboxes>" "Show incoming mailboxes list"
 
-## ssl
+## notification
 
-set ssl_starttls=yes
-set ssl_force_tls=yes
-
-## cache
-
-set header_cache="~/.cache/mutt"
-set message_cachedir="~/.cache/mutt"
+set mail_check=60
+set new_mail_command="notify-send -i email 'New mail' 'New mail in %b mailboxe(s)' &"
 
 ## display
 
-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 date_format="!%a %d %b %y, %H:%M"
+set index_format="%-20.20D - %-20.20n %S %s"
+set folder_format="%2C %5s %N %f"
+set status_format="%v %f %u/%m"
 
-set strict_threads="yes"
+set strict_threads=yes
+set sort=threads
 set sort_browser=reverse-date
 set sort_aux=last-date-received
+
 set sleep_time=0
 
-set beep_new="yes"
+set beep_new="no"
 set check_new="yes"
 
-## folders
-
-set record=+sent
-set postponed=+drafts
-
 ## compose
 
-set editor="gedit --wait"
+set editor="gedit -s"
 set fast_reply=yes
 
 ## reply
 
 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"
-set pgp_decrypt_command="gpg --passphrase-fd 0 --no-verbose --batch --output - %f"
-set pgp_sign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_clearsign_command="gpg --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 01B70C5D940CB63D5FA612C284FDC1EA8FEE950C -- -r %r -- %f"
-set pgp_encrypt_sign_command="pgpewrap gpg --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 01B70C5D940CB63D5FA612C284FDC1EA8FEE950C -- -r %r -- %f"
-set pgp_import_command="gpg --no-verbose --import -v %f"
-set pgp_export_command="gpg --no-verbose --export --armor %r"
-set pgp_verify_key_command="gpg --no-verbose --batch --fingerprint --check-sigs %r"
-set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r" 
-set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r" 
-set pgp_autosign=yes
-set pgp_sign_as=01B70C5D940CB63D5FA612C284FDC1EA8FEE950C
-set pgp_replyencrypt=yes
-set pgp_timeout=1800
-set pgp_good_sign="^gpg: Good signature from"
-set pgp_use_gpg_agent=yes
-
-set crypt_autosign=yes
-set crypt_replysignencrypted=yes
-set crypt_verify_sig=yes
-
-message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"
-
-# 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
-
-folder-hook . set sort=threads
-folder-hook contact set sort=date-sent
-folder-hook contact/patches set sort=threads
-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"
+## identity
 
-send-hook "~f paulk@paulk.fr" unset signature
-reply-hook "~f paulk@paulk.fr" unset signature
+set reverse_name=yes
+#set use_from=yes
 
-send-hook "~f contact@paulk.fr" set signature="~/.mutt/signatures/paulk"
-reply-hook "~f contact@paulk.fr" set signature="~/.mutt/signatures/paulk"
+## sidebar
 
-send-hook "~f paulk@replicant.us" set signature="~/.mutt/signatures/replicant"
-reply-hook "~f paulk@replicant.us" set signature="~/.mutt/signatures/replicant"
+set sidebar_width=24
+set sidebar_visible=yes
+set sidebar_divider_char="│"
+set sidebar_folder_indent=yes
 
-send-hook "~f paulk@embedded-freedom.org" unset signature
-reply-hook "~f paulk@embedded-freedom.org" unset signature
+bind index,pager <Tab> "sidebar-toggle-visible"
 
-# mailboxes
+bind index,pager <C-Up> sidebar-prev
+bind index,pager <C-Down> sidebar-next
+bind index,pager <C-Right> sidebar-open
 
-mailboxes +inbox +contact +contact/patches +embedded-freedom +replicant +replicant/notifications +sent
+bind index ! flag-message
+bind index - collapse-all
+bind index _ collapse-thread
diff --git a/mutt/muttrc-colors b/mutt/muttrc-colors
new file mode 100644
index 0000000..f49fe0a
--- /dev/null
+++ b/mutt/muttrc-colors
@@ -0,0 +1,55 @@
+## colors
+
+### interface
+
+color normal white black
+color indicator black blue
+color status black yellow
+color error brightwhite black
+
+color hdrdefault yellow black
+color tree blue black
+color search black magenta
+
+### sidebar
+
+color sidebar_highlight black yellow
+color sidebar_flagged red black
+color sidebar_divider blue black
+color sidebar_new yellow black
+
+### message
+
+color quoted cyan black
+color quoted1 blue black
+color quoted2 green black
+color quoted3 magenta black
+color quoted4 red black
+color quoted5 yellow black
+
+### index
+
+color index white black .
+color index blue black ~v # collapsed thread
+color index brightwhite black ~N # new
+color index brightwhite black ~O # old
+color index magenta black ~F # flagged
+color index red black ~D # deleted
+color index white black ~Q # replied
+
+### patch
+
+color body brightblue black "^(Signed-off-by:).*"
+color body brightgreen black "^(Acked-by:).*"
+color body brightgreen black "^(Reviewed-by:).*"
+color body brightred black "^(Fixes:).*"
+color body brightwhite black "^(Cc)"
+
+color body yellow black "^diff \-.*"
+color body brightwhite black "^index [a-f0-9].*"
+color body brightred black "^[\-]{3} .*"
+color body brightgreen black "^[\+]{3} .*"
+color body brightblue black "^@@ .*"
+color body brightblue black "^---$"
+color body green black "^[\+][^\+]+.*"
+color body red black "^\-[^\-]+.*"
diff --git a/mutt/paulk/imap/mailboxes b/mutt/paulk/imap/mailboxes
new file mode 100644
index 0000000..bd8d821
--- /dev/null
+++ b/mutt/paulk/imap/mailboxes
@@ -0,0 +1,38 @@
++drafts
++inbox
++inbox/chill
++inbox/culture
++inbox/graphics
++inbox/hardware
++inbox/notes
++inbox/paper
++inbox/politics
++inbox/setup
++junk
++contact
++contact/administration
++contact/couchsurfing
++contact/events
++contact/fosdem
++contact/france-insoumise
++contact/gerrit
++contact/github
++contact/orders
++contact/patches
++contact/rap
++contact/services
++contact/slack
++contact/travel
++embedded-freedom
++lists/coreboot
++lists/dri-devel
++lists/linux/media
++lists/linux/mediatek
++lists/linux/omap
++lists/linux/rockchip
++lists/linux/tegra
++lists/linux-sunxi
++replicant
++replicant/notifications
++sent
++trash
diff --git a/mutt/paulk/imap/muttrc b/mutt/paulk/imap/muttrc
new file mode 100644
index 0000000..7287f32
--- /dev/null
+++ b/mutt/paulk/imap/muttrc
@@ -0,0 +1,57 @@
+# paulk
+
+## password
+
+source "gpg -q --for-your-eyes-only --no-tty -d $HOME/.mutt/paulk/passwords.gpg |"
+
+## imap
+
+set imap_user=paulk
+set imap_list_subscribed=yes
+set imap_check_subscribed=no
+unset imap_passive
+
+set folder="imap://$imap_user@gagarine.paulk.fr/"
+set spoolfile="+inbox"
+set postponed="+drafts"
+set trash="+trash"
+set record="+sent"
+
+## smtp
+
+set smtp_url="smtp://$imap_user:$smtp_pass@gagarine.paulk.fr:2525"
+
+## pgp
+
+unset pgp_default_key
+
+## crypt
+
+unset crypt_autopgp
+unset crypt_autosign
+unset crypt_replyencrypt
+unset crypt_replysignencrypted
+
+## identity
+
+set realname="Paul Kocialkowski"
+
+## alternates
+
+alternates "(paulk@paulk\.fr)|(contact@paulk\.fr)|(paulk@replicant\.us)|(paulk@embedded-freedom\.org)"
+
+## folders
+
+unmailboxes *
+mailboxes `cat $HOME/.mutt/paulk/imap/mailboxes | tr '\n' ' '`
+
+folder-hook "gagarine.paulk.fr/." "set from='contact@paulk.fr'; set signature='~/.mutt/paulk/signature-contact'"
+folder-hook "gagarine.paulk.fr/inbox*" "set from='paulk@paulk.fr'; unset signature"
+folder-hook "gagarine.paulk.fr/replicant*" "set from='paulk@replicant.us'; set signature='~/.mutt/paulk/signature-replicant'"
+folder-hook "gagarine.paulk.fr/embedded-freedom" "set from='paulk@embedded-freedom.org'; unset signature"
+
+## cache
+
+set certificate_file="~/.mutt/paulk/certificates"
+set header_cache="~/.cache/mutt/paulk/headers"
+set message_cachedir="~/.cache/mutt/paulk/messages"
diff --git a/mutt/paulk/muttrc b/mutt/paulk/muttrc
new file mode 100644
index 0000000..69e8910
--- /dev/null
+++ b/mutt/paulk/muttrc
@@ -0,0 +1,53 @@
+# paulk
+
+## password
+
+source "gpg -q --for-your-eyes-only --no-tty -d $HOME/.mutt/paulk/passwords.gpg |"
+
+## mail
+
+set mbox_type=Maildir
+
+set folder="~/.mail/paulk"
+set spoolfile="+/inbox"
+set postponed="+/drafts"
+set trash="+/trash"
+set record="+/sent"
+
+## smtp
+
+set smtp_url="smtp://paulk:$smtp_pass@gagarine.paulk.fr:2525"
+
+## pgp
+
+unset pgp_default_key
+
+## crypt
+
+unset crypt_autopgp
+unset crypt_autosign
+unset crypt_replyencrypt
+unset crypt_replysignencrypted
+
+## identity
+
+set realname="Paul Kocialkowski"
+
+## alternates
+
+alternates "(paulk@paulk\.fr)|(contact@paulk\.fr)|(paulk@replicant\.us)|(paulk@embedded-freedom\.org)"
+
+## folders
+
+unmailboxes *
+mailboxes `find $HOME/.mail/paulk/* -type d | sort | grep -vP "tmp$|new$|cur$" | sed "s,$HOME/.mail/paulk/,+,g" | tr '\n' ' '`
+
+folder-hook "gagarine.paulk.fr/." "set from='contact@paulk.fr'; set signature='~/.mutt/paulk/signature-contact'"
+folder-hook "gagarine.paulk.fr/inbox*" "set from='paulk@paulk.fr'; unset signature"
+folder-hook "gagarine.paulk.fr/replicant*" "set from='paulk@replicant.us'; set signature='~/.mutt/paulk/signature-replicant'"
+folder-hook "gagarine.paulk.fr/embedded-freedom" "set from='paulk@embedded-freedom.org'; unset signature"
+
+## cache
+
+set certificate_file="~/.mutt/paulk/certificates"
+set header_cache="~/.cache/mutt/paulk/headers"
diff --git a/mutt/signatures/paulk b/mutt/paulk/signature-contact
index 2260dd8..eb4ed40 100644
--- a/mutt/signatures/paulk
+++ b/mutt/paulk/signature-contact
@@ -1,4 +1,4 @@
-Paul Kocialkowski, developer of free digital technology at the lower levels
+Developer of free digital technology and hardware support.
 
 Website: https://www.paulk.fr/
 Coding blog: https://code.paulk.fr/
diff --git a/mutt/signatures/replicant b/mutt/paulk/signature-replicant
index 1892ae4..1892ae4 100644
--- a/mutt/signatures/replicant
+++ b/mutt/paulk/signature-replicant
diff --git a/mutt/usage.txt b/mutt/usage.txt
deleted file mode 100644
index 38077ad..0000000
--- a/mutt/usage.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Compose view:
-* Encrypt GPG: s
-* Change from: Esc + f
-
-Mailbox view:
-* Undelete: u