Update mutt, weechat dotfiles.

diff --git a/dotfiles/user/server/minimal/muttrc b/dotfiles/user/server/minimal/muttrc
index 517ff9991401b7dfc1179a8e2c950ef4efa696ff..d87fc08ec2f03c34345727110cfaf68e2f9a2dbe 100644 (file)
--- a/dotfiles/user/server/minimal/muttrc
+++ b/dotfiles/user/server/minimal/muttrc
@@ -40,3 +40,27 @@ set sort=reverse-date
 # potentially important attachments.
 set index_format="%4C %Z %?X?[%X]&   ? %{%b %d} %-15.15L (%?l?%4l&%4c?) %s"
 alternative_order multipart/related text/plain text/html
+
+# Defaults from /usr/share/doc/mutt/examples/gpg.rc
+set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
+set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?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"
+set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap gpg %?p?--passphrase-fd 0? --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 %f"
+set pgp_export_command="gpg --no-verbose --export --armor %r"
+set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
+set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r"
+set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r"
+set pgp_good_sign="^\\[GNUPG:\\] GOODSIG"
+
+# Further stuff from http://codesorcery.net/old/mutt/mutt-gnupg-howto
+set pgp_autosign=yes
+set pgp_sign_as=0x98F64A5F
+set pgp_replyencrypt=yes
+set pgp_timeout=1800
+
+# Promoting my public key.
+my_hdr X-PGP-Key: https://dump.plomlompom.com/dump/plomlompom.asc

diff --git a/dotfiles/user/server/personal/minimal/weechatrc b/dotfiles/user/server/personal/minimal/weechatrc
index 917e4e6530eefe6f09020458d29d40f1cdd541a9..3601d48c4a8f2eb212ad111a31c5f8f93e53b84a 100644 (file)
--- a/dotfiles/user/server/personal/minimal/weechatrc
+++ b/dotfiles/user/server/personal/minimal/weechatrc
@@ -6,7 +6,7 @@
 /server add localhost localhost
 /connect localhost
 /server del freenode
-/server add freenode irc.freenode.net -nicks=plomlompom,plomlomp0m,ploml0mp0m,pl0ml0mp0m -realname="Christian Heller" -autojoin=#nodrama.de,#twitter.de,#freie-gesellschaft,#zrolaps,#twtxt,#freakazoid
+/server add freenode irc.freenode.net -nicks=plomlompom,plomlomp0m,ploml0mp0m,pl0ml0mp0m -realname="Christian Heller" -autojoin=#nodrama.de,#twitter.de,#freie-gesellschaft,#zrolaps,#twtxt,#freakazoid,#nodrama.finance,#unordentlich
 /server add rizon irc.rizon.net -nicks=AlfredEdel,AlfredEde1,A1fredEdel,A1fredEde1 -autojoin=#8chan-deutsch,#mememagic -username=foo
 /server add quakenet irc.quakenet.org -nicks=plomlompom,plomlomp0m,ploml0mp0m,pl0ml0mp0m -realname="Christian Heller" -autojoin=#rgrd
 /connect freenode