X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=.mutt%2Fmuttrc;h=8036a9bc10bc6fc71448624233368d5da375ede4;hb=026d4e8596a1f0f67ca38793025c146c9252f801;hp=8871d6d6f47b2530f435e488b2abf886ff82e2e6;hpb=159915cd7d8d22af8f27c7bc735079c4347877b2;p=dotfiles.git

diff --git a/.mutt/muttrc b/.mutt/muttrc
index 8871d6d..8036a9b 100644
--- a/.mutt/muttrc
+++ b/.mutt/muttrc
@@ -1,30 +1,44 @@
+# Basic information
 set from="mart@martlubbers.net"
 set use_from="yes
 set envelope_from=yes
-
-set sendmail="msmtp -C /home/mart/.mutt/msmtp"
-
-macro index,pager $ "<shell-escape>offlineimap -c ~/.mutt/offlineimaprc &<enter>" "Force refresh"
-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"
-
-macro index,pager \cb "| urlview\n"
-
 set mbox_type=Maildir
 set folder=~/.mutt/mail
 set spoolfile=+/INBOX/
 set record=+/Sent/
-# set trash=+/Trash/
 set postponed=+/Drafts/
 set mask="!^\\.[^.]"
+source ~/.mutt/mailboxes
+
+# Receiving, sending and searching
+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"
+
+# Key bindings
+bind index gg first-entry
+bind index G last-entry
+bind pager k previous-line
+bind pager j next-line
+bind pager gg top
+bind pager G bottom
+bind pager R group-reply 
+
+# Misc options
 set timeout=2
 set mail_check=0
-source ~/.mutt/mailboxes
+set include=yes
+set delete=yes
+set confirmappend=no
+set fast_reply=yes
 
+# Display options
 unset wait_key
 unset markers
 set sort_browser=alpha
@@ -34,7 +48,11 @@ set editor=vim
 set duplicate_threads=yes
 ignore headers *
 unignore headers from to subject date cc
+set mailcap_path=~/.mutt/mailcap
+set mailcap_sanitize=yes
+auto_view text/html
 
+# Pager options
 set pager_index_lines=20
 set pager_context=3
 set pager_stop
@@ -42,14 +60,15 @@ set menu_scroll
 set tilde
 set quote_regexp="^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 
-set alias_file=~/.mutt/alias
-source ~/.mutt/alias
-
-set include=yes
-set delete=yes
-set confirmappend=yes
-set fast_reply=yes
+# Aliases
+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
 color attachment brightyellow default
 color hdrdefault cyan default
@@ -72,23 +91,10 @@ color index blue default ~T
 color index red default ~D
 color index brightblue default ~F
 
-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"
+# Crypto
+source /etc/Muttrc.gpg.dist
 set crypt_autosign
 set crypt_replysign
 set crypt_replysignencrypted=yes
 set crypt_verify_sig=yes
-
 message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp"