aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-20 17:46:13 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-20 17:46:13 +1200
commit29536af223306647c2b269b32b71856a5d8673a6 (patch)
tree67a7b672de579a4f90b178cd293ecf35fbdbbfa8
parentMerge branch 'release/v9.6.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-9.7.0.tar.gz (sig)
dotfiles-9.7.0.zip
Merge branch 'release/v9.7.0'v9.7.0
* release/v9.7.0: Add a few missing periods Separate local muttrc from aliases file
-rw-r--r--Makefile1
-rw-r--r--VERSION4
-rw-r--r--mutt/muttrc20
3 files changed, 18 insertions, 7 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/VERSION b/VERSION
index d4d34b02..2b90306f 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v9.6.0
-Wed, 20 May 2020 05:09:36 +0000
+tejr dotfiles v9.7.0
+Wed, 20 May 2020 05:46:12 +0000
diff --git a/mutt/muttrc b/mutt/muttrc
index f20ddcee..8d7b57fb 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -17,10 +17,18 @@ set abort_noattach_regexp = "attached is|(find|i've|see) attached"
# Don't assume I don't want to continue editing a message if I didn't change
# anything to it; if I want to send a message with just my signature, that's my
-# right
+# right.
#
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.
#
@@ -93,7 +101,7 @@ set quit = ask-yes
# I prefer a slightly stricter pattern to match what is and isn't a quote; this
# avoids flagging things like closing braces on new lines in code blocks as
-# quotes
+# quotes.
#
set quote_regexp = '^(>[ \t]*)+'
@@ -180,7 +188,7 @@ set autocrypt_dir \
= ~/.local/share/mutt/autocrypt
# Set custom filter to generate an HTML part for plain-text messages in
-# Markdown style; defaults to off, per God's will and common decency
+# Markdown style; defaults to off, per God's will and common decency.
#
set send_multipart_alternative_filter \
= ~/.local/libexec/mutt/filters/markdown-to-html
@@ -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 '\
<enter-command>unhook *<enter>\
-<enter-command>source $alias_file<enter>\
-<enter-command>echo "Reloaded with $alias_file"<enter>' \
+<enter-command>source $my_muttrc<enter>\
+<enter-command>echo "Reloaded $my_muttrc"<enter>' \
"Clear hooks and reload"
# Shortcut to toggle thread display