X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=email%2F.config%2Fmutt%2Fmuttrc;h=d900b28067044db5cafb4d37c942c7f4bb09bf45;hb=4b27ac9df10f43f9da8470eda7eb3552a83bc7be;hp=6da670c1eae6e5badd9a562998c0788ccb9e081a;hpb=c94b5c084a07c28fcefabb4daa7f83d4a0749c06;p=dotfiles.git

diff --git a/email/.config/mutt/muttrc b/email/.config/mutt/muttrc
index 6da670c..d900b28 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|mart@martlubbers\.net|Mart\.Lubbers@ru\.nl)"
 set use_from=yes
 set reverse_name=yes
 set envelope_from=yes
@@ -25,10 +25,8 @@ send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru
 	'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
@@ -67,11 +65,11 @@ 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
 
 # Pager options
 set pager_index_lines=20
@@ -90,7 +88,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