4 files changed, 93 insertions, 15 deletions
diff --git a/.mutt/crypto b/.mutt/crypto
new file mode 100644
index 0000000..d6c9def
--- /dev/null
+++ b/.mutt/crypto
@@ -0,0 +1,85 @@
+# -*-muttrc-*-
+#
+# Command formats for gpg.
+# 
+# This version uses gpg-2comp from 
+#   http://70t.de/download/gpg-2comp.tar.gz
+#
+# $Id$
+#
+# %p    The empty string when no passphrase is needed,
+#       the string "PGPPASSFD=0" if one is needed.
+#
+#       This is mostly used in conditional % sequences.
+#
+# %f    Most PGP commands operate on a single file or a file
+#       containing a message.  %f expands to this file's name.
+#
+# %s    When verifying signatures, there is another temporary file
+#       containing the detached signature.  %s expands to this
+#       file's name.
+#
+# %a    In "signing" contexts, this expands to the value of the
+#       configuration variable $pgp_sign_as.  You probably need to
+#       use this within a conditional % sequence.
+#
+# %r    In many contexts, mutt passes key IDs to pgp.  %r expands to
+#       a list of key IDs.
+
+# Note that we explicitly set the comment armor header since GnuPG, when used
+# in some localiaztion environments, generates 8bit data in that header, thereby
+# breaking PGP/MIME.
+
+# decode application/pgp
+set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+
+# verify a pgp/mime signature
+set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
+
+# decrypt a pgp/mime attachment
+set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+
+# create a pgp/mime signed attachment
+# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
+set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
+
+# create a application/pgp signed (old-style) message
+# set pgp_clearsign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
+set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
+
+# create a pgp/mime encrypted attachment
+# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+
+# create a pgp/mime encrypted and signed attachment
+# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+
+# import a key into the public key ring
+set pgp_import_command="gpg --no-verbose --import %f"
+
+# export a key from the public key ring
+set pgp_export_command="gpg --no-verbose --export --armor %r"
+
+# verify a key
+set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
+
+# read in the public key ring
+set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" 
+
+# read in the secret key ring
+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" 
+
+# fetch keys
+# set pgp_getkeys_command="pkspxycwrap %r"
+
+# pattern for good signature - may need to be adapted to locale!
+
+# set pgp_good_sign="^gpgv?: Good signature from "
+
+# OK, here's a version which uses gnupg's message catalog:
+# set pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`"
+
+# This version uses --status-fd messages
+set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
+
diff --git a/.mutt/mailcap b/.mutt/mailcap
index 59df58e..5961957 100644
--- a/.mutt/mailcap
+++ b/.mutt/mailcap
@@ -1,3 +1,4 @@
-text/html; pandoc -f html -t markdown; copiousoutput; compose=vim %s
+text/html; w3m -dump %s; nametemplate=%s.html; copiousoutput
+text/html; uzbl-browser %s ;
 image/*; feh %s
 application/pdf; zathura %s
diff --git a/.mutt/muttrc b/.mutt/muttrc
index 252aca2..64d43c4 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -1,15 +1,15 @@
 # General information
-set from             = "u.vaes13@imperial.ac.uk"
+set from             = "urbain.p.vaes@gmail.com"
 set realname         = "Urbain Vaes"
 set use_from         = yes
 set envelope_from    = yes
 set weed
 
 # Encryption
-source /usr/share/doc/mutt-kz/samples/gpg.rc
+source ~/.mutt/crypto
 set crypt_autosign = no
 set crypt_replyencrypt = yes
-set fcc_clear = yes
+set pgp_auto_decode = yes
 set pgp_autosign = yes
 set pgp_sign_as = 716064C0
 set pgp_use_gpg_agent = yes
@@ -22,8 +22,8 @@ set header_cache     = ~/.mutt/cache/headers
 set message_cachedir = ~/.mutt/cache/bodies
 set certificate_file = ~/.mutt/certificates
 set mailcap_path     = ~/.mutt/mailcap
+set signature        = ~/.mutt/signature
 set tmpdir           = ~/.mutt/temp
-set signature        = ~/.mutt/sig
 
 # Maildirs
 set spoolfile = "+Main/Main"
@@ -100,13 +100,3 @@ bind   pager   R    group-reply
 `[ "$COLORSCHEME" = "light" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-light-16.muttrc || echo set`
 `[ "$COLORSCHEME" = "dark" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-dark-16.muttrc || echo set`
 `[ "$COLORSCHEME" = "default" ] && echo source $HOME/.mutt/solarized/mutt-colors-solarized-dark-16.muttrc || echo set`
-
-color index red default "~F"
-color index brightblue default "~f edfenergy"
-color index brightblue default "~f terravision"
-color index magenta default "~f avaaz"
-color index magenta default "~f santos"
-color index magenta default "~f rusudan"
-color index cyan default "~U"
-color index green default "~f pavliotis"
-color index green default "~f abdulle"
diff --git a/.mutt/signature b/.mutt/signature
new file mode 100644
index 0000000..1b04db1
--- /dev/null
+++ b/.mutt/signature
@@ -0,0 +1,2 @@
+Urbain Vaes
+urbain.p.vaes@gmail.com