X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=email%2F.mutt%2Fmuttrc;fp=email%2F.mutt%2Fmuttrc;h=6dd6c099718d5ad5ef37900d7cdbaa98b84568c4;hb=3232ebec1b74563f7dbd3ff7652c44976b6a705d;hp=e0a8bb1ac3d96098aad2735fcf26afde1916bfba;hpb=907122ffdf547aaf278270f2621bfc1d1112bf74;p=dotfiles.git

diff --git a/email/.mutt/muttrc b/email/.mutt/muttrc
index e0a8bb1..6dd6c09 100644
--- a/email/.mutt/muttrc
+++ b/email/.mutt/muttrc
@@ -18,13 +18,17 @@ set send_charset="us-ascii:utf-8"
 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>"
 
-macro compose <esc>1 "<esc>f^UMart Lubbers <mart@martlubbers.net><enter>ps"
-send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\""
+# 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 compose <esc>2 "<esc>f^UMart Lubbers <mart@cs.ru.nl><enter>pc"
-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\""
-send2-hook "~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>$"