aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-12 22:23:49 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-12 22:23:49 +1200
commitb93a457d06cfb4b295532bc2333ef9e814431bc8 (patch)
tree78752e530a7476b9efc3ca5dcc8d6671a82e2bf1
parentAdd groups generation to Mutt config (diff)
downloaddotfiles-b93a457d06cfb4b295532bc2333ef9e814431bc8.tar.gz
dotfiles-b93a457d06cfb4b295532bc2333ef9e814431bc8.zip
Switch Mutt to XDG basedirs
-rw-r--r--Makefile8
-rw-r--r--mutt/muttrc6
-rwxr-xr-xmutt/muttrc.d/src4
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 28627664..10d96388 100644
--- a/Makefile
+++ b/Makefile
@@ -480,9 +480,11 @@ install-mpv:
cp -p -- mpv/* $(XDG_CONFIG_HOME)/mpv
install-mutt: install-mail
- mkdir -p -- $(HOME)/.muttrc.d $(XDG_CACHE_HOME)/mutt
- cp -p -- mutt/muttrc $(HOME)/.muttrc
- cp -p -- mutt/muttrc.d/src $(HOME)/.muttrc.d
+ mkdir -p -- $(XDG_CONFIG_HOME)/mutt \
+ $(XDG_CONFIG_HOME)/mutt/muttrc.d \
+ $(XDG_CACHE_HOME)/mutt
+ cp -p -- mutt/muttrc $(XDG_CACHE_HOME)/mutt
+ cp -p -- mutt/muttrc.d/src $(XDG_CONFIG_HOME)/mutt/muttrc.d
install-ncmcpp: install-mpd
mkdir -p -- $(HOME)/.ncmpcpp
diff --git a/mutt/muttrc b/mutt/muttrc
index bf3a34d7..3af07a55 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -136,8 +136,8 @@ macro index,pager A \
# Shortcut to reload configuration
macro generic,index,browser,pager \\R \
- ':source ~/.muttrc<enter>:echo "Config reloaded!"<enter>' \
- 'Reload ~/.muttrc'
+ ':source ~/.config/mutt/muttrc<enter>:echo "Config reloaded!"<enter>' \
+ 'Reload muttrc'
# Machine or account specific settings
-source ~/.muttrc.d/src|
+source ~/.config/mutt/muttrc.d/src|
diff --git a/mutt/muttrc.d/src b/mutt/muttrc.d/src
index d0d501bc..8b2aad6b 100755
--- a/mutt/muttrc.d/src
+++ b/mutt/muttrc.d/src
@@ -1,7 +1,7 @@
#!/bin/sh
# Build groups from address lists
-for rc in "$HOME"/.muttrc.d/groups/*.rc ; do
+for rc in "$HOME"/.config/mutt/muttrc.d/groups/*.rc ; do
[ -e "$rc" ] || continue
group=$rc
group=${group##*/}
@@ -13,7 +13,7 @@ for rc in "$HOME"/.muttrc.d/groups/*.rc ; do
done
# Emit the source all muttrc subfiles, in LC_COLLATE order
-for rc in "$HOME"/.muttrc.d/*.rc ; do
+for rc in "$HOME"/.config/mutt/muttrc.d/*.rc ; do
[ -e "$rc" ] || continue
cat -- "$rc"
done