Update mutt configuration

5 files changed, 115 insertions, 32 deletions

diff --git a/mutt/gpg.rc b/mutt/gpg.rc
new file mode 100644
index 0000000..20e7fc4
--- /dev/null
+++ b/mutt/gpg.rc
@@ -0,0 +1,88 @@
+# vim: set ft=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 --with-fingerprint --with-fingerprint --list-keys %r"
+
+# read in the secret key ring
+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --with-fingerprint --with-fingerprint --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"
+
+# pattern to verify a decryption occurred
+set pgp_decryption_okay="^\\[GNUPG:\\] DECRYPTION_OKAY"
+
diff --git a/mutt/mailcap b/mutt/mailcap
new file mode 100644
index 0000000..79e7716
--- /dev/null
+++ b/mutt/mailcap
@@ -0,0 +1,11 @@
+##this is used when (v)iewing a text/html attachment:
+##allowing you to browse and "click" links
+##order matters the first entry which passes the test is used
+#gui browser if $DISPLAY is set
+text/html; conkeror "%s" &; test=test -n "$DISPLAY"; nametemplate=%s.html
+#text browser otherwise
+text/html; w3m -v -F -T text/html "%s"; nametemplate=%s.html; needsterminal
+
+##auto_view will use the entry with the copiousoutput part:
+text/html; lynx -stdin -dump -force_html ; copiousoutput
+
diff --git a/mutt/muttfel b/mutt/muttfel
deleted file mode 100644
index 10ee924..0000000
--- a/mutt/muttfel
+++ /dev/null
@@ -1,7 +0,0 @@
-# vim: set filetype=muttrc:
-color status blue default
-set folder = "~/.mail/fel"
-source ~/.mutt/mailboxes
-set spoolfile = "+INBOX"
-set record = "+Sent\ Items"
-set postponed = "+Drafts"
diff --git a/mutt/muttgmail b/mutt/muttgmail
deleted file mode 100644
index dd3d409..0000000
--- a/mutt/muttgmail
+++ /dev/null
@@ -1,7 +0,0 @@
-# vim: set filetype=muttrc:
-color status red default
-set folder = "~/.mail/gmail"
-source ~/.mutt/mailboxes
-set spoolfile = "+INBOX"
-set record = "+Sent\ Items"
-set postponed = "+Drafts"
diff --git a/mutt/muttrc b/mutt/muttrc
index a174e30..f3431ff 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -3,27 +3,25 @@ set my_name="Karel Kočí"
 
 hdr_order Date From To Cc #Sorting emails by the given criteria (from left to right)
 set pager_index_lines= 5
-set sort = 'threads'
-set sort_aux = 'last-date-received'
+set sort=reverse-threads
+set sort_aux=last-date-received
+
+set mailcap_path 	= ~/.mutt/mailcap
+auto_view text/html
+alternative_order text/enriched text/plain text/html 
+macro attach 'V' "<pipe-entry>cat >~/.cache/mutt/mail.html && conkeror ~/.cache/mutt/mail.html && rm ~/.cache/mutt/mail.html<enter>"
+
+source ~/.mutt/gpg.rc
+set pgp_use_gpg_agent = yes
+set pgp_sign_as = 2B1F70F95F1B48DA2265A7FAA6BC8B8CEB31659B
+set pgp_timeout = 3600
+set crypt_autosign = yes
+set crypt_replyencrypt = yes
 
-#set mbox_type=Maildir
-#set folder = "~/.mail"
-#set spoolfile = "+gmail/Inbox"
-#set record = "+gmail/Sent"
-#set postponed = "+gmail/Drafts"
-#set header_cache=~/.cache/mutt
-#
-#set folder = "~/.imail"
-#source ~/.mutt/mailboxes
-#set spoolfile = "+gmail/INBOX"
-#set record = "+gmail/Sent\ Items"
-#set postponed = "+gmail/Drafts"
 
-macro index <F2> ':source ~/.mutt/muttgmail<enter>c~/.mail/gmail/INBOX<enter>'
 macro index <F3> ':source ~/.mutt/muttemail<enter>c~/.mail/email/INBOX<enter>'
-macro index <F4> ':source ~/.mutt/muttfel<enter>c~/.mail/fel/INBOX<enter>'
 
 source ~/.mutt/color
 
-# As default open gmail
-source ~/.mutt/muttgmail
+# As default open email
+source ~/.mutt/muttemail