From e5aeb77d42dcec12ccb2513fa04f13da7a99c797 Mon Sep 17 00:00:00 2001 From: Ryan Kavanagh Date: Sun, 13 Dec 2020 17:09:09 -0500 Subject: Improve alias handling in mutt --- .mutt/accounts.rc | 3 +++ .muttrc | 3 +++ gpg/.mutt/alias-cmu.rc.gpg | Bin 4881 -> 5206 bytes gpg/.mutt/alias.rc.gpg | Bin 5192 -> 2910 bytes 4 files changed, 6 insertions(+) diff --git a/.mutt/accounts.rc b/.mutt/accounts.rc index 6a11873..4593a95 100644 --- a/.mutt/accounts.rc +++ b/.mutt/accounts.rc @@ -54,6 +54,8 @@ set pager_format = '-%Z-RAK.AC: %C/%m: %-20.20n %s';\ set compose_format = '-- RAK.AC: Compose [Approx. msg size: %l Atts: %a]%>-';\ set status_format = '-%r-RAK.AC: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'" +# Sources cmu aliases to override any personal variants already loaded in +# ~/.muttrc account-hook imaps://rkavanag@andrew.cmu.edu@imap.gmail.com \ "set imap_user = 'rkavanag@andrew.cmu.edu';\ set imap_pass = 'CMU_PASS';\ @@ -68,6 +70,7 @@ set record = '=[Gmail]/Sent Mail';\ set copy = 'no';\ unset smtp_url;\ unset smtp_pass;\ +source "~/.mutt/alias-cmu.rc";\ set pager_format = '-%Z-CMU: %C/%m: %-20.20n %s';\ set compose_format = '-- CMU: Compose [Approx. msg size: %l Atts: %a]%>-';\ set status_format = '-%r-CMU: %f [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---'" diff --git a/.muttrc b/.muttrc index 09c1d26..7613109 100644 --- a/.muttrc +++ b/.muttrc @@ -129,6 +129,9 @@ set sendmail="sendmail -oem -oi" # to unset the folder option unset folder source ~/.mutt/accounts.rc +# load alias-cmu.rc before alias.rc so that alias.rc overrides any aliases +# in all accounts apart from SCS. The SCS account hook reloads alias-cmu.rc +# afterwards source ~/.mutt/alias-cmu.rc source ~/.mutt/alias.rc source ~/.mutt/mailinglists.rc diff --git a/gpg/.mutt/alias-cmu.rc.gpg b/gpg/.mutt/alias-cmu.rc.gpg index 49c3d9c..0f53b5d 100644 Binary files a/gpg/.mutt/alias-cmu.rc.gpg and b/gpg/.mutt/alias-cmu.rc.gpg differ diff --git a/gpg/.mutt/alias.rc.gpg b/gpg/.mutt/alias.rc.gpg index 7807e73..9c6b370 100644 Binary files a/gpg/.mutt/alias.rc.gpg and b/gpg/.mutt/alias.rc.gpg differ -- cgit v1.2.3