From dc449cfd641e5b872dde4cd9fbdcfe0baa912b96 Mon Sep 17 00:00:00 2001
From: Franziska Kunsmann <hi@kunsmann.eu>
Date: Tue, 24 Sep 2019 16:17:25 +0200
Subject: [PATCH] Update mutt config

* mailserver is now mx0.kunbox.net (ex42-1048908.dc1.fsn1.hetzner.srv.kunbox.net)
* show 25 characters of sender name in index (instead of 15)
* update gpg key id
---
 .muttrc    | 16 ++++++++--------
 .neomuttrc |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.muttrc b/.muttrc
index 9ae854e..eab2b2b 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,11 +1,9 @@
 source ~/.mutt/passwords
 
 
-set editor=`echo \$EDITOR`
-
 set realname="Franziska Kunsmann"
 
-set folder="imap://kaito.kunbox.net/"
+set folder="imap://mx0.kunbox.net/"
 set spoolfile="+INBOX"
 set record="+Sent"
 set postponed="+Drafts"
@@ -13,7 +11,7 @@ set trash="+Trash"
 
 set from=hi@kunsmann.eu
 set use_from=yes
-set smtp_url=smtp://$imap_user:$imap_pass@kaito.kunbox.net:587/
+set smtp_url=smtp://$imap_user:$imap_pass@mx0.kunbox.net:587/
 
 set send_charset=utf-8
 set edit_headers=yes
@@ -41,12 +39,14 @@ set mailcap_path=~/.mutt/mailcap
 alternative_order text/plain text/html
 auto_view text/html
 
+set index_format="%4C %Z %{%b %d} %-25.25L (%?l?%4l&%4c?) %s"
+
 set editor="vim -c 'set spell spelllang=de,en'"
 
 source ~/.mutt/gpg.rc
 
 set pgp_use_gpg_agent=yes
-set pgp_sign_as=12E3D2136B818350
+set pgp_sign_as=5FE37FF3C981A9146C3805324205EF53ECE0D2BC
 set pgp_timeout=60
 set pgp_autosign=yes
 set crypt_autosign=yes
@@ -59,8 +59,8 @@ set pgp_verify_command="gpg --status-fd=2 --no-verbose --batch --output - --veri
 set pgp_decrypt_command="gpg --status-fd=2 --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 92924DA2FBE83349C086AAB87CB6EE07E4A1BD2A -- -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 92924DA2FBE83349C086AAB87CB6EE07E4A1BD2A -- -r %r -- %f"
+set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 5FE37FF3C981A9146C3805324205EF53ECE0D2BC -- -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 5FE37FF3C981A9146C3805324205EF53ECE0D2BC -- -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"
@@ -68,7 +68,7 @@ set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys
 set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r" 
 
 send-hook . 'reset pgp_autoencrypt'
-send-hook "!~l ~t intern@lists.mond-basis\\.eu" "set crypt_autoencrypt crypt_autosign"
+send-hook "!~l ~t office@ccc.de" "set crypt_autoencrypt crypt_autosign"
 
 set query_command= "khard email --parsable '%s'"
 bind editor <Tab> complete-query
diff --git a/.neomuttrc b/.neomuttrc
index 8cee37f..48624e4 100644
--- a/.neomuttrc
+++ b/.neomuttrc
@@ -3,7 +3,7 @@ source ~/.muttrc
 set new_mail_command="notify-send --app-name=NeoMutt --icon=~/.mutt/icon.png 'New Mail' '%n new messages in %f, %b other unread mailboxes' &"
 
 set pgp_self_encrypt=yes
-set pgp_default_key=12E3D2136B818350
+set pgp_default_key=5FE37FF3C981A9146C3805324205EF53ECE0D2BC
 
 set sidebar_divider_char='│'