X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=email%2F.config%2Fmutt%2Fmuttrc;h=f3b77de107e14bfe8191fb8e7f424ae37bd68a18;hb=38ba5c6f02bd115152226ba93976835a89c70294;hp=4312542c043d519c829ab8d9fb1d1ec7b9c4f198;hpb=64d152f05fd4754fe1f48e37f1b9875b7b5f43b1;p=dotfiles.git

diff --git a/email/.config/mutt/muttrc b/email/.config/mutt/muttrc
index 4312542..f3b77de 100644
--- a/email/.config/mutt/muttrc
+++ b/email/.config/mutt/muttrc
@@ -1,6 +1,6 @@
 # Basic information
-set from="mart@martlubbers.net"
-alternates "mart@(cs\.ru\.nl|mart@martlubbers\.net)"
+set from="Mart Lubbers <mart@martlubbers.net>"
+alternates "(mart@cs\.ru\.nl|m\.lubbers@cs\.ru\.nl|mart@martlubbers\.net|Mart\.Lubbers@ru\.nl)"
 set use_from=yes
 set reverse_name=yes
 set envelope_from=yes
@@ -15,20 +15,25 @@ source ~/.local/share/offlineimap/mailboxes
 # Receiving, sending and searching
 set sendmail="checkattach.sh msmtp -a net"
 set send_charset="us-ascii:utf-8"
-macro index,pager $ "<shell-escape>/home/mrl/.config/mutt/force_sync.sh<enter><sync-mailbox>" "Force refresh"
+macro index,pager $ "<shell-escape>sync_mail.sh<enter><sync-mailbox>" "Force refresh"
+
+# viewing and printing
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
+set print_command='set -e; f=`mktemp -p "$HOME"/.cache/mutt`; \
+        muttprint -P A4 -p TO_FILE:"$f"; evince "$f"; rm "$f"'
 
 # Set the correct msmtp account for the different addresses
 send2-hook '~f mart@martlubbers.net'\
 	'set sendmail="checkattach.sh msmtp -a net"'
-send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru.nl))'\
+send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru.nl)|(~f m.lubbers@cs.ru.nl))'\
 	'set sendmail="checkattach.sh msmtp -a ru"'
 
 # Macro for switching to the ru address
+alias identity_1         Mart Lubbers <mart@martlubbers.net>
+alias identity_2         Mart Lubbers <mart@cs.ru.nl>
+macro compose v "<edit-from>^Uidentity\_<tab>" "Select from"
+macro compose <esc>1 "<esc>f^UMart Lubbers <mart@martlubbers.net><enter>"
 macro compose <esc>2 "<esc>f^UMart Lubbers <mart@cs.ru.nl><enter>"
-# Disable pgp when sending from a ru address
-send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru.nl)) (~g|~G)'\
-	'push <pgp-menu>c'
 
 # Key bindings
 bind index gg first-entry
@@ -54,12 +59,13 @@ unset markers
 set sort_browser=alpha
 set sort=threads
 set sort_aux=date
-set editor=vim
+set editor="vim -c '%!proofpoint_decoder'"
 set duplicate_threads=yes
 ignore headers *
 unignore headers from to subject date cc
 set mailcap_path=~/.config/mutt/mailcap
 set mailcap_sanitize=yes
+set display_filter="proofpoint_decoder"
 
 # w3m --dump
 auto_view text/html
@@ -67,14 +73,17 @@ auto_view text/html
 auto_view application/pdf
 # khal
 auto_view application/ics
+auto_view text/calendar
 # libreoffice --cat
 auto_view application/vnd.openxmlformats-officedocument.wordprocessingml.document
-auto_view application/msword
-auto_view application/vnd.openxmlformats-officedocument.wordprocessingml.document
 auto_view application/vnd.oasis.opendocument.text
+auto_view application/msword
+# vcards
+auto_view text/x-vcard
 
 # Pager options
-set pager_index_lines=20
+#set pager=/usr/share/vim/vim82/macros/less.sh
+set pager_index_lines=5
 set pager_context=3
 set pager_stop
 set menu_scroll
@@ -90,7 +99,7 @@ macro index,pager A \
     "add the sender email address to khard"
 
 # sidebar
-source ~/.config/mutt/sidebar.muttrc
+#source ~/.config/mutt/sidebar.muttrc
 
 # notmuch
 source ~/.config/mutt/notmuch.muttrc