From 6124c0b09653babdc038abc9c4623141b51a108f Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 20 May 2020 17:13:07 +1200 Subject: Separate local muttrc from aliases file --- Makefile | 1 + mutt/muttrc | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 05c5ff29..71cac213 100644 --- a/Makefile +++ b/Makefile @@ -503,6 +503,7 @@ install-mutt: install-gnupg install-mail mutt/filters/markdown-to-html $(XDG_CONFIG_HOME)/mutt cp -p -- mutt/muttrc.d/src \ $(XDG_CONFIG_HOME)/mutt/muttrc.d + touch -- $(XDG_CONFIG_HOME)/mutt/aliases cp -p -- mutt/filters/markdown-to-html \ $(HOME)/.local/share/mutt/libexec/filters diff --git a/mutt/muttrc b/mutt/muttrc index f20ddcee..7a1e3e31 100644 --- a/mutt/muttrc +++ b/mutt/muttrc @@ -21,6 +21,14 @@ set abort_noattach_regexp = "attached is|(find|i've|see) attached" # unset abort_unmodified +# Put the alias file in a nice XDG location, distinct from the muttrc, so that +# we don't end up losing them each time the dotfiles are reinstalled; muttrd(5) +# points out that this file needs to be explicitly sourced, too. +# +set alias_file \ + = ~/.config/mutt/aliases +source $alias_file + # Don't send terminal bells on errors, but do send them when new mail arrives, # because that should light up my tmux window label and/or urxvt window. # @@ -213,10 +221,12 @@ macro index,pager \\A \ 'Add sender address to abook' # Shortcut to reload configuration +set my_muttrc \ + = ~/.config/mutt/muttrc macro generic,index,browser,pager \\R '\ unhook *\ -source $alias_file\ -echo "Reloaded with $alias_file"' \ +source $my_muttrc\ +echo "Reloaded $my_muttrc"' \ "Clear hooks and reload" # Shortcut to toggle thread display -- cgit v1.2.3