aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2020-05-17 15:45:29 +1200
committerTom Ryder <tom@sanctum.geek.nz>2020-05-17 15:45:29 +1200
commit282c1a6a934e7197343c9a1aee8802393acd3454 (patch)
tree9abf2dfdb6089a08387c8ac769a65d486f9c08b0
parentMerge branch 'release/v8.38.0' (diff)
parentBump VERSION (diff)
downloaddotfiles-8.39.0.tar.gz (sig)
dotfiles-8.39.0.zip
Merge branch 'release/v8.39.0'v8.39.0
* release/v8.39.0: Use less misleading suffix for group lists Don't use protected PGP headers anymore Remove inappropriate reverse() call Remove vestigial reference to $MYVIM without cond Add a few more filetype detection hooks Correct a comment
-rw-r--r--VERSION4
-rw-r--r--mutt/muttrc1
-rwxr-xr-xmutt/muttrc.d/src4
-rw-r--r--vim/filetype.vim29
-rw-r--r--vim/vimrc8
5 files changed, 36 insertions, 10 deletions
diff --git a/VERSION b/VERSION
index 6fa19988..206452e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v8.38.0
-Fri, 15 May 2020 15:43:40 +0000
+tejr dotfiles v8.39.0
+Sun, 17 May 2020 03:45:25 +0000
diff --git a/mutt/muttrc b/mutt/muttrc
index 3af07a55..e2356dd0 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -102,7 +102,6 @@ set thorough_search = yes
set time_inc = 250
# Encryption settings
-set crypt_protected_headers_write = yes
set crypt_replysign = yes
set crypt_replyencrypt = yes
set crypt_replysignencrypted = yes
diff --git a/mutt/muttrc.d/src b/mutt/muttrc.d/src
index 8b2aad6b..f03ad462 100755
--- a/mutt/muttrc.d/src
+++ b/mutt/muttrc.d/src
@@ -1,11 +1,11 @@
#!/bin/sh
# Build groups from address lists
-for rc in "$HOME"/.config/mutt/muttrc.d/groups/*.rc ; do
+for rc in "$HOME"/.config/mutt/muttrc.d/groups/*.list ; do
[ -e "$rc" ] || continue
group=$rc
group=${group##*/}
- group=${group%.rc}
+ group=${group%.list}
while read -r member ; do
printf 'group -group %s -addr %s\n' \
"$group" "$member"
diff --git a/vim/filetype.vim b/vim/filetype.vim
index 339824f0..91327ba0 100644
--- a/vim/filetype.vim
+++ b/vim/filetype.vim
@@ -171,6 +171,11 @@ augroup filetypedetect
\ ?*.l
\,?*.lex
\ setfiletype lex
+ " limits.conf(5) files
+ autocmd BufNewFile,BufRead
+ \ limits.conf
+ \,*/limits.d/*.conf
+ \ setfiletype limits
" Lisp
autocmd BufNewFile,BufRead
\ ?*.lisp
@@ -191,10 +196,15 @@ augroup filetypedetect
\ ?*.msg
\,mutt-*-[0-9]\+-[0-9]\+-[0-9]\+
\ setfiletype mail
- " Mail messages
+ " Mail aliases
autocmd BufNewFile,BufRead
\ aliases
\ setfiletype mailaliases
+ " Mailcap (MIME app reference) files
+ autocmd BufNewFile,BufRead
+ \ mailcap
+ \,.mailcap
+ \ setfiletype mailcap
" Makefiles
autocmd BufNewFile,BufRead
\ Makefile
@@ -246,6 +256,10 @@ augroup filetypedetect
\,/etc/shadow-
\,/etc/shadow.edit
\ setfiletype passwd
+ " Packet capture files
+ autocmd BufNewFile,BufRead
+ \ ?*.pcap
+ \ setfiletype pcap
" Perl 5 files
autocmd BufNewFile,BufRead
\ ?*.pl
@@ -272,6 +286,10 @@ augroup filetypedetect
autocmd BufNewFile,BufRead
\ ?*.pod6
\ setfiletype pod6
+ " protocols(5) files
+ autocmd BufNewFile,BufRead
+ \ protocols
+ \ setfiletype protocols
" Python files
autocmd BufNewFile,BufRead
\ ?*.py
@@ -299,6 +317,10 @@ augroup filetypedetect
autocmd BufNewFile,BufRead
\ ?*.rb
\ setfiletype ruby
+ " Samba config
+ autocmd BufNewFile,BufRead
+ \ smb.conf
+ \ setfiletype samba
" sed files
autocmd BufNewFile,BufRead
\ ?*.sed
@@ -367,6 +389,11 @@ augroup filetypedetect
autocmd BufNewFile,BufRead
\ svn-commit*.tmp
\ setfiletype svn
+ " sysctl configuration files
+ autocmd BufNewFile,BufRead
+ \ /etc/sysctl.conf
+ \,/etc/sysctl.d/*.conf
+ \ setfiletype sysctl
" Systemd unit files
autocmd BufNewFile,BufRead
\ */systemd/*.*
diff --git a/vim/vimrc b/vim/vimrc
index 6cde7036..e96b333b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -2,7 +2,7 @@
" Tom Ryder (tejr)’s Literate Vimrc
" ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
"
-" Last updated: Fri, 15 May 2020 13:24:13 UTC
+" Last updated: Sat, 16 May 2020 04:57:25 UTC
"
" │ And I was lifted up in heart, and thought
" │ Of all my late-shown prowess in the lists,
@@ -370,7 +370,7 @@ endif
" <https://github.com/vim/vim/releases/tag/v7.0.187>
"
if exists('##SourceCmd')
- autocmd vimrc SourceCmd $MYVIMRC,$MYVIM/vimrc
+ autocmd vimrc SourceCmd $MYVIMRC/vimrc
\ ReloadVimrc
if $MYVIM !=# ''
autocmd vimrc SourceCmd $MYVIM/vimrc
@@ -438,10 +438,10 @@ if xdg#DataHome() !=# '' || !empty(xdg#DataDirs())
\ 'option#item#Escape(v:val.''/dictionary.txt'')'
\), ','))
execute 'set thesaurus^='.option#Escape(join(map(
- \ reverse(extend(
+ \ extend(
\ xdg#DataHome() !=# '' ? [xdg#DataHome()] : [],
\ xdg#DataDirs()
- \)),
+ \),
\ 'option#item#Escape(v:val.''/thesaurus.txt'')'
\), ','))
endif