X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=.mutt%2Fmuttrc;h=f87bb6f2e288af0ab7c1f7dcc844a612df62dd1b;hb=0fa5e7bd5fbb6b7af0c582c9f6e0aa63c705cdd1;hp=d50b334c1b4dcce73cedc6a5eba4cddc53fdd496;hpb=9f2faeff19b7695a9abc6bf4360b1e83972ce1a5;p=dotfiles.git

diff --git a/.mutt/muttrc b/.mutt/muttrc
index d50b334..f87bb6f 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -21,15 +21,6 @@ macro index <F8> \
 	<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
 	"notmuch: search mail"
 
-# Clean up mailing lists
-macro index,pager \Ct "\
-<tag-pattern>~C vim@vim.org | ~C vim_use<enter><tag-prefix-cond><save-message>=vim<enter><end-cond>\
-<tag-pattern>~C lists.debian.org<enter><tag-prefix-cond><save-message>=debian<enter><end-cond>\
-<tag-pattern>~C mutt-users@mutt.org<enter><tag-prefix-cond><save-message>=mutt<enter><end-cond>\
-<tag-pattern>~C praat-users<enter><tag-prefix-cond><save-message>=praat<enter><end-cond>\
-<tag-pattern>~C i3-discuss@i3.zekjur.net<enter><tag-prefix-cond><save-message>=i3<enter><end-cond>\
-<sync-mailbox>" "Clean up mailing lists"
-
 # Key bindings
 bind index gg first-entry
 bind index G last-entry
@@ -70,8 +61,9 @@ set tilde
 set quote_regexp="^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 
 # Aliases
-set alias_file=~/.mutt/alias
-source ~/.mutt/alias
+set query_command = "abook --mutt-query '%s'"
+macro index,pager a "<pipe-message>abook --add-email-quiet<return>" "Add this sender to Abook"
+bind editor <Tab> complete-query
 
 # Colors
 color normal white default
@@ -97,20 +89,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