aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-01-28 15:31:57 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-01-28 15:44:41 +1300
commita689fa37dd01d87a98e9c79f1581b27fd14d598e (patch)
tree0dafefeae6b581523bac421670847cc839acb951
parentAdd chn(1df) (diff)
downloaddotfiles-a689fa37dd01d87a98e9c79f1581b27fd14d598e.tar.gz
dotfiles-a689fa37dd01d87a98e9c79f1581b27fd14d598e.zip
More generic Mutt configuration
Remove some person and system specific stuff, including my signature; nothing complex about that, after all.
-rw-r--r--.gitignore1
-rw-r--r--Makefile34
-rw-r--r--mail/mailrc.m43
-rw-r--r--mutt/muttrc (renamed from mutt/muttrc.m4)31
-rwxr-xr-xmutt/muttrc.d/src6
-rw-r--r--mutt/signature2
-rw-r--r--vim/after/ftdetect/muttrc.vim12
7 files changed, 28 insertions, 61 deletions
diff --git a/.gitignore b/.gitignore
index 6e82dcd6..22e40356 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,5 @@ git/gitconfig
gnupg/gpg.conf
mail/mailrc
man/man7/dotfiles.7df
-mutt/muttrc
tmux/tmux.conf
urxvt/ext/select
diff --git a/Makefile b/Makefile
index e35d5c40..ae1655fa 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,6 @@
install-gtk \
install-i3 \
install-less \
- install-mail \
- install-maildir \
install-mutt \
install-ncmcpp \
install-newsbeuter \
@@ -113,9 +111,7 @@ clean distclean :
$(GAMES) \
git/gitconfig \
gnupg/gpg.conf \
- mail/mailrc \
- man/man7/dotfiles.7df \
- mutt/muttrc \
+ man/man8/dotfiles.7df \
tmux/tmux.conf \
urxvt/ext/select
@@ -135,22 +131,12 @@ gnupg/gpg.conf : gnupg/gpg.conf.m4
-D DOTFILES_KEYSERVER="$(KEYSERVER)" \
gnupg/gpg.conf.m4 > gnupg/gpg.conf
-mail/mailrc : mail/mailrc.m4
- m4 -D DOTFILES_SENDMAIL="$$(command -v "$(SENDMAIL)")" \
- mail/mailrc.m4 > "$@"
-
man/man7/dotfiles.7df : README.markdown man/man7/dotfiles.7df.header
cat man/man7/dotfiles.7df.header README.markdown | \
pandoc -sS -t man -o "$@"
MAILDIR := $(HOME)/Mail
-mutt/muttrc : mutt/muttrc.m4
- m4 \
- -D DOTFILES_SENDMAIL="$(SENDMAIL)" \
- -D DOTFILES_MAILDIR="$(MAILDIR)" \
- mutt/muttrc.m4 > mutt/muttrc
-
TMUX_BG := colour237
TMUX_FG := colour248
@@ -270,24 +256,12 @@ install-less :
install -pm 0644 -- less/lesskey "$(HOME)"/.lesskey
command -v lesskey && lesskey
-install-mail : mail/mailrc
- install -pm 0644 -- mail/mailrc "$(HOME)"/.mailrc
-
-install-maildir :
- for box in drafts inbox sent ; do \
- for dir in cur new tmp ; do \
- install -m 0755 -d -- \
- "$(MAILDIR)"/"$$box"/"$$dir" ; \
- done ; \
- done
-
-install-mutt : mutt/muttrc install-mail install-maildir
+install-mutt :
install -m 0755 -d -- \
- "$(HOME)"/.mutt \
+ "$(HOME)"/.muttrc.d \
"$(HOME)"/.cache/mutt
install -pm 0644 -- mutt/muttrc "$(HOME)"/.muttrc
- install -pm 0644 -- mutt/signature "$(HOME)"/.signature
- [ -f "$(HOME)"/.mutt/muttrc.local ] || touch "$(HOME)"/.mutt/muttrc.local
+ install -pm 0755 -- mutt/muttrc.d/src "$(HOME)"/.muttrc.d
install-ncmcpp :
install -m 0755 -d -- "$(HOME)"/.ncmpcpp
diff --git a/mail/mailrc.m4 b/mail/mailrc.m4
deleted file mode 100644
index 873fe080..00000000
--- a/mail/mailrc.m4
+++ /dev/null
@@ -1,3 +0,0 @@
-set sendmail=DOTFILES_SENDMAIL
-unset askcc
-set nosave skipempty
diff --git a/mutt/muttrc.m4 b/mutt/muttrc
index 4709adef..7f40e617 100644
--- a/mutt/muttrc.m4
+++ b/mutt/muttrc
@@ -1,23 +1,8 @@
-# Names
-set use_domain = yes
-set use_from = yes
-set reverse_name = yes
-
-# SMTP implementation
-set sendmail = 'DOTFILES_SENDMAIL'
-
-# Mailbox type and location
-set mbox_type = 'Maildir'
-set folder = 'DOTFILES_MAILDIR'
-
-# Submailboxes
-set spoolfile = '+inbox'
-set postponed = '+drafts'
-set record = '+sent'
-mailboxes !
-
# Addresses
set query_command = 'abook --mutt-query %s'
+set reverse_name = yes
+set use_domain = yes
+set use_from = yes
# Alerts
set beep_new = yes
@@ -113,7 +98,7 @@ set strict_threads = yes
set thorough_search = yes
# SSH
-set time_inc=250
+set time_inc = 250
# Encryption settings
set crypt_replysign = yes
@@ -136,18 +121,14 @@ bind generic,index,browser,pager \Cb previous-page
# Turn off annoying mailbox lock feature
bind index '%' noop
-# Jump to mailboxes
-macro generic,index,browser,pager gi '<change-folder>=inbox<enter>' 'Change to inbox folder'
-macro generic,index,browser,pager gs '<change-folder>=sent<enter>' 'Change to sent folder'
-
# Blindly save message to whatever box is suggested
macro index,pager S 's<enter>' 'Save message blindly'
# Run gms to retrieve all mail
-macro generic,index,browser,pager gm '!gms --quiet &<enter>' 'Run gms'
+macro generic,index,browser,pager gm '!gms --quiet &<enter>' 'Run gms(1df)'
# Shortcut to add addresses to abook
macro index,pager A '<pipe-message>abook --add-email<enter>' 'Add sender address to abook'
# Machine or account specific settings
-source ~/.mutt/muttrc.local
+source ~/.muttrc.d/src|
diff --git a/mutt/muttrc.d/src b/mutt/muttrc.d/src
new file mode 100755
index 00000000..584a2785
--- /dev/null
+++ b/mutt/muttrc.d/src
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Helper script to emit the source all muttrc subfiles, in LC_COLLATE order
+for rc in "$HOME"/.muttrc.d/*.rc ; do
+ [ -e "$rc" ] || continue
+ cat -- "$rc"
+done
diff --git a/mutt/signature b/mutt/signature
deleted file mode 100644
index a229b5f5..00000000
--- a/mutt/signature
+++ /dev/null
@@ -1,2 +0,0 @@
-Tom Ryder <https://sanctum.geek.nz/>
-The next 1<<10 years are ours.
diff --git a/vim/after/ftdetect/muttrc.vim b/vim/after/ftdetect/muttrc.vim
new file mode 100644
index 00000000..ff3776b5
--- /dev/null
+++ b/vim/after/ftdetect/muttrc.vim
@@ -0,0 +1,12 @@
+" Add automatic commands to detect .muttrc files
+augroup dfmuttrc
+
+ autocmd BufNewFile,BufRead
+ \ **/.dotfiles/mutt/muttrc.d/*.rc
+ \ setlocal filetype=muttrc
+
+ autocmd BufNewFile,BufRead
+ \ **/.muttrc.d/*.rc
+ \ setlocal filetype=muttrc
+
+augroup END