X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=email%2F.mutt%2Fmuttrc;h=39af2ba4c99e3ad4b7d6e4ed127738fda52bcd27;hb=e7793f1b7978fa302c4da4c4943d849f7917b944;hp=8036a9bc10bc6fc71448624233368d5da375ede4;hpb=7c0c395e57530a31d96410759e5f65b12d2aaea2;p=dotfiles.git

diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index 8036a9b..39af2ba 100644
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -14,12 +14,7 @@ source ~/.mutt/mailboxes
 set sendmail="msmtp -C /home/mart/.mutt/msmtprc"
 macro index,pager $ "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter><sync-mailbox>" "Force refresh"
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
-macro index <F8> \
-	"<enter-command>set my_old_pipe_decode=\$pipe_decode my_old_wait_key=\$wait_key nopipe_decode nowait_key<enter>\
-	<shell-escape>notmuch-mutt -r --prompt search<enter>\
-	<change-folder-readonly>`echo ${XDG_CACHE_HOME:-$HOME/.cache}/notmuch/mutt/results`<enter>\
-	<enter-command>set pipe_decode=\$my_old_pipe_decode wait_key=\$my_old_wait_key<enter>" \
-	"notmuch: search mail"
+source /etc/Muttrc.d/notmuch-mutt.rc
 
 # Key bindings
 bind index gg first-entry
@@ -92,7 +87,7 @@ color index red default ~D
 color index brightblue default ~F
 
 # Crypto
-source /etc/Muttrc.gpg.dist
+source /etc/Muttrc.d/gpg.rc
 set crypt_autosign
 set crypt_replysign
 set crypt_replysignencrypted=yes