update i3 and vimrc

[dotfiles.git] / .mutt / muttrc

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 5de448c..8036a9b 100644 (file)
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -35,7 +35,7 @@ set timeout=2
 set mail_check=0
 set include=yes
 set delete=yes
-set confirmappend=yes
+set confirmappend=no
 set fast_reply=yes
 
 # Display options
@@ -61,9 +61,12 @@ set tilde
 set quote_regexp="^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 
 # Aliases
-set query_command = "abook --mutt-query '%s'"
-macro index,pager a "<pipe-message>abook --add-email-quiet<return>" "Add this sender to Abook"
+set query_command= "khard mutt --search '%s'"
 bind editor <Tab> complete-query
+bind editor ^T    complete
+macro index,pager A \
+    "<pipe-message>khard add-email<return>" \
+    "add the sender email address to khard"
 
 # Colors
 color normal white default
@@ -89,20 +92,7 @@ color index red default ~D
 color index brightblue default ~F
 
 # Crypto
-set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --batch --output - %f"
-set pgp_verify_command="gpg --no-verbose --batch --output - --verify %s %f"
-set pgp_decrypt_command="gpg --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="/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -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"
-set pgp_list_pubring_command="gpg --no-verbose --batch --with-colons --list-keys %r" 
-set pgp_list_secring_command="gpg --no-verbose --batch --with-colons --list-secret-keys %r" 
-set pgp_sign_as=0xAD3FEBE7
-set pgp_timeout=60
-set pgp_good_sign="^gpg: Good signature from"
+source /etc/Muttrc.gpg.dist
 set crypt_autosign
 set crypt_replysign
 set crypt_replysignencrypted=yes