Mutt configuration improvements.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/config/mutt/rc.sh b/config/mutt/rc.sh
new file mode 100755 (executable)
index 0000000..a0848c3
--- /dev/null
+++ b/config/mutt/rc.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+case "$1" in
+    artemis*)
+cat <<EOF
+set   crypt_autopgp
+set   crypt_autosign
+set   crypt_verify_sig
+set   pgp_use_gpg_agent
+set   pgp_retainable_sigs
+set   spoolfile=imaps://madcoder:\`gpg --decrypt --batch --quiet ~/.madmutt/hermes.gpg\`@hermes.madism.org/
+EOF
+    ;;
+
+    laphroaig*)
+cat <<EOF
+set   smtp_url=smtp://madcoder@hermes.madism.org:587/
+EOF
+    ;;
+
+    *)
+    ;;
+esac

diff --git a/muttrc b/muttrc
index 82dbc80..d4428d6 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -49,11 +49,11 @@ set   imap_list_subscribed
 set   imap_user=madcoder
 set   imap_headers="X-DSPAM-Result"
 set   imap_pipeline_depth=32
-set   header_cache=".cache/mutt/"
-set   message_cachedir=".cache/mutt/"
+set   certificate_file="~/.cache/mutt/certificates"
+set   header_cache="~/.cache/mutt/"
+set   message_cachedir="~/.cache/mutt/"
 set   mail_check=90
 set   timeout=15
-set   smtp_url=smtp://madcoder@hermes.madism.org/
 
 # Conf boites
 set   spoolfile=imaps://madcoder@hermes.madism.org/
@@ -69,6 +69,7 @@ set   mask=.
 set   reply_regexp="^((re|réf\.|aw)[ \t]*:[ \t]*)+"
 set   quote_regexp="^( *[>}|])+"
 
+source "~/.config/mutt/rc.sh $hostname|"
 source ~/.mutt/aliases
 source ~/.config/mutt/binds
 source ~/.config/mutt/colors