X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=email%2F.mutt%2Fmuttrc;h=6dd6c099718d5ad5ef37900d7cdbaa98b84568c4;hb=3a92354af22bbdab45045d2acfe095d52a4eb59b;hp=44ab8af66feea22aa888b0f902c53342f20c3337;hpb=ec1f37d52d491d731b8b3463d8704102256a30ca;p=dotfiles.git

diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index 44ab8af..6dd6c09 100644
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -1,6 +1,8 @@
 # Basic information
 set from="mart@martlubbers.net"
-set use_from="yes
+alternates "mart@(cs\.ru\.nl|mart@martlubbers\.net)"
+set use_from=yes
+set reverse_name=yes
 set envelope_from=yes
 set mbox_type=Maildir
 set folder=~/.mutt/mail
@@ -13,11 +15,20 @@ source ~/.mutt/mailboxes
 # Receiving, sending and searching
 set sendmail="/home/mrl/.mutt/checkattach.sh msmtp -C /home/mrl/.config/msmtp/config"
 set send_charset="us-ascii:utf-8"
-macro index,pager $ "<shell-escape>offlineimap &<enter><sync-mailbox>" "Force refresh"
+macro index,pager $ "<shell-escape>/home/mrl/.mutt/force_sync.sh<enter><sync-mailbox>" "Force refresh"
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
-send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\""
-send2-hook "~f m.lubbers@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
-send2-hook "~f m.lubbers@science.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
+
+# Set the correct msmtp account for the different addresses
+send2-hook '~f mart@martlubbers.net'\
+	'set sendmail="msmtp -C /home/mrl/.config/msmtp/config -a net"'
+send2-hook '((~f m.lubbers@cs.ru.nl)|(~f m.lubbers@science.ru.nl)|(~f mart@cs.ru.nl))'\
+	'set sendmail="msmtp -C /home/mrl/.config/msmtp/config -a ru"'
+
+# Macro for switching to the ru address
+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'
 
 #folder-hook . push "<delete-pattern>~=<enter>$"
 
@@ -55,7 +66,9 @@ set mailcap_sanitize=yes
 # w3m --dump
 auto_view text/html
 # pdftotext
-auto_view application/pdf 
+auto_view application/pdf
+# khal
+auto_view application/ics
 # libreoffice --cat
 auto_view application/vnd.openxmlformats-officedocument.wordprocessingml.document
 auto_view application/msword