X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=email%2F.config%2Fmutt%2Fmuttrc;h=a556bc51d883fcc8b4916fbe3f04897d840f8742;hb=a512afc0dc1ab7513a2788a3c42de1e25d320ac7;hp=6e32d40c2c812d089f765d68c4cd66d158dac424;hpb=8da7d88b48dda854cd7483653b4885eb282ea35d;p=dotfiles.git

diff --git a/email/.config/mutt/muttrc b/email/.config/mutt/muttrc
index 6e32d40..a556bc5 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|Mart\.Lubbers@ru\.nl)"
+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
@@ -21,14 +21,12 @@ macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"
 # 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
+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
@@ -70,11 +68,11 @@ 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
 
 # Pager options
+#set pager=/usr/share/vim/vim82/macros/less.sh
 set pager_index_lines=20
 set pager_context=3
 set pager_stop
@@ -91,7 +89,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