aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--VERSION4
-rw-r--r--bash/bash_completion.d/keep.bash2
-rw-r--r--bash/bashrc.d/keep.bash4
-rw-r--r--finger/pgpkey14
-rw-r--r--install/conf.sh7
-rw-r--r--ksh/kshrc.d/keep.ksh4
-rw-r--r--man/man1/phpcsff.1df21
-rw-r--r--mutt/muttrc8
-rw-r--r--vim/vimrc11
-rw-r--r--zsh/zshrc.d/keep.zsh4
11 files changed, 66 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 8146f1cc..4e435b69 100644
--- a/Makefile
+++ b/Makefile
@@ -593,9 +593,9 @@ install-vim-cache:
mkdir -p -- \
$(VIMDIR)/cache \
$(VIMDIR)/cache/backup \
- $(VIMDIR)/cache/spell \
$(VIMDIR)/cache/swap \
- $(VIMDIR)/cache/undo
+ $(VIMDIR)/cache/undo \
+ $(VIMDIR)/cache/view
install-vim-compiler:
mkdir -p -- $(VIMDIR)/compiler
diff --git a/VERSION b/VERSION
index 99df474c..716bee24 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v8.17.0
-Sun, 05 Apr 2020 13:24:21 +0000
+tejr dotfiles v8.18.0
+Wed, 22 Apr 2020 12:53:03 +0000
diff --git a/bash/bash_completion.d/keep.bash b/bash/bash_completion.d/keep.bash
index 4b479eca..8bb4615f 100644
--- a/bash/bash_completion.d/keep.bash
+++ b/bash/bash_completion.d/keep.bash
@@ -44,7 +44,7 @@ _keep() {
fi
# Build list of kept names
- bashkeep=${BASHKEEP:-"$HOME"/.bashkeep.d}
+ bashkeep=${XDG_DATA_HOME:-"$HOME"/.local/share}/bashkeep
for keep in "$bashkeep"/"$2"*.bash ; do
# Skip directories
! [[ -d $keep ]] || continue
diff --git a/bash/bashrc.d/keep.bash b/bash/bashrc.d/keep.bash
index 6796aae7..2e2424a3 100644
--- a/bash/bashrc.d/keep.bash
+++ b/bash/bashrc.d/keep.bash
@@ -29,7 +29,7 @@ keep() {
# Figure out the directory to which we're reading and writing these scripts
local bashkeep
- bashkeep=${BASHKEEP:-"$HOME"/.bashkeep.d}
+ bashkeep=${XDG_DATA_HOME:-"$HOME"/.local/share}/bashkeep
mkdir -p -- "$bashkeep" || return
# Parse options
@@ -140,7 +140,7 @@ EOF
}
# Load any existing scripts in bashkeep
-for bashkeep in "${BASHKEEP:-"$HOME"/.bashkeep.d}"/*.bash ; do
+for bashkeep in "${XDG_DATA_HOME:-"$HOME"/.local/share}"/bashkeep/*.bash ; do
[[ -e $bashkeep ]] || continue
source "$bashkeep"
done
diff --git a/finger/pgpkey b/finger/pgpkey
index e69de29b..1f62c961 100644
--- a/finger/pgpkey
+++ b/finger/pgpkey
@@ -0,0 +1,14 @@
+pub rsa4096 2013-03-12 [SC] [expires: 2020-05-16]
+ FA09 C06E 1B67 0CD0 B2F5 DE60 C142 86EA 77BB 8872
+uid [ultimate] Thomas Ryder (tyrmored, tejr) <tom@sanctum.geek.nz>
+uid [ultimate] Thomas Ryder <tejr@echo-n.nz>
+uid [ultimate] Thomas Ryder <secretary@plug.org.nz>
+uid [ultimate] Thomas Ryder (TEJR) <tejr@cpan.org>
+uid [ultimate] Thomas Ryder <tyrmored@inspire.net.nz>
+uid [ultimate] Thomas Ryder <tej.ryder@gmail.com>
+sub rsa4096 2013-03-12 [E] [expires: 2020-05-16]
+ 9DF1 A89F F8D9 70AF 3265 C882 96C2 CD91 E67A C61D
+sub rsa4096 2013-03-12 [S] [expires: 2020-05-16]
+ 3179 90A1 4597 A1FC F82D 953A B5AF 5F89 2592 6609
+sub rsa4096 2019-08-06 [A] [expires: 2020-05-16]
+ 42AE 569D 6162 7C52 03B0 74ED D58F F1F0 7E90 9B49
diff --git a/install/conf.sh b/install/conf.sh
index f50cde73..1634f0cb 100644
--- a/install/conf.sh
+++ b/install/conf.sh
@@ -1,10 +1,11 @@
-# Read extra targets from an optional ~/.dotfiles.conf file
-if [ -e "$HOME"/.dotfiles.conf ] ; then
+# Read extra targets from an optional configuration file
+conf=${XDG_CONFIG_HOME:-"$HOME"/.config}/dotfiles/config
+if [ -e "$conf" ] ; then
while read -r line ; do
case $line in
'#'*|'') ;;
*) set -- "$@" "$line" ;;
esac
- done < "$HOME"/.dotfiles.conf
+ done < $conf
fi
make install "$@"
diff --git a/ksh/kshrc.d/keep.ksh b/ksh/kshrc.d/keep.ksh
index c1546deb..f61a7a4d 100644
--- a/ksh/kshrc.d/keep.ksh
+++ b/ksh/kshrc.d/keep.ksh
@@ -40,7 +40,7 @@ function keep {
# Figure out the directory to which we're reading and writing these scripts
typeset kshkeep
- kshkeep=${KSHKEEP:-"$HOME"/.kshkeep.d}
+ kshkeep=${XDG_DATA_HOME:-"$HOME"/.local/share}/kshkeep
mkdir -p -- "$kshkeep" || return
# Parse options
@@ -152,7 +152,7 @@ EOF
}
# Load any existing scripts in kshkeep
-for kshkeep in "${KSHKEEP:-"$HOME"/.kshkeep.d}"/*.ksh ; do
+for kshkeep in "${XDG_DATA_HOME:-"$HOME"/.local/share}"/kshkeep/*.ksh ; do
[[ -e $kshkeep ]] || continue
source "$kshkeep"
done
diff --git a/man/man1/phpcsff.1df b/man/man1/phpcsff.1df
new file mode 100644
index 00000000..a6364367
--- /dev/null
+++ b/man/man1/phpcsff.1df
@@ -0,0 +1,21 @@
+.TH PHPCSFF 1df "April 2020" "Manual page for phpcsff"
+.SH NAME
+.B phpcsff
+\- use php-cs-fixed as a source filter
+.SH SYNOPSIS
+.B phpcsff
+source.php
+.br
+.B phpcsff
+\< source.php
+.br
+.B phpcsff
+source.php > source.fixed.php
+.br
+.SH DESCRIPTION
+.B phpcsff
+allows the use of PHP linter php-cs-fixer as a stream filter, to work around its fixed edit-in-place behaviour using temporary files. It's intended for use as an 'equalprg' in Vim, but it might be useful in other circumstances too.
+.SH SEE ALSO
+<https://github.com/FriendsOfPHP/PHP-CS-Fixer>
+.SH AUTHOR
+Tom Ryder <tom@sanctum.geek.nz>
diff --git a/mutt/muttrc b/mutt/muttrc
index b61b4af6..47c2b6ac 100644
--- a/mutt/muttrc
+++ b/mutt/muttrc
@@ -129,13 +129,15 @@ bind index '%' noop
# 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(1df)'
-
# Shortcut to add addresses to abook
macro index,pager A \
'<pipe-message>abook --add-email-quiet<enter>' \
'Add sender address to abook'
+# Shortcut to reload configuration
+macro generic,index,browser,pager \\R \
+ ':source ~/.muttrc<enter>:echo "Config reloaded!"<enter>' \
+ 'Reload ~/.muttrc'
+
# Machine or account specific settings
source ~/.muttrc.d/src|
diff --git a/vim/vimrc b/vim/vimrc
index d0525c30..adbc9f05 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -242,6 +242,17 @@ if has#('persistent_undo')
call path#Create($MYVIM.'/undo')
endif
+" Set up a directory for files generated by :mkview. To date, I think I have
+" used this twice in my life, but may as well be consistent with the other
+" directories of this type. This isn't a comma-separated list like the others
+" ('backupdir', 'directory', 'spell', 'undodir')
+"
+if has#('mksession')
+ execute 'set viewdir='
+ \.option#Escape(option#item#Escape($MYVIM.'/view'))
+ call path#Create($MYVIM.'/view')
+endif
+
" Now that we have a bit more confidence in our runtime environment, set up
" all of the filetype detection, plugin, and indent hooks.
"
diff --git a/zsh/zshrc.d/keep.zsh b/zsh/zshrc.d/keep.zsh
index 869d2039..ddcb96e2 100644
--- a/zsh/zshrc.d/keep.zsh
+++ b/zsh/zshrc.d/keep.zsh
@@ -29,7 +29,7 @@ keep() {
# Figure out the directory to which we're reading and writing these scripts
local zshkeep
- zshkeep=${ZSHKEEP:-"$HOME"/.zshkeep.d}
+ zshkeep=${XDG_DATA_HOME:-"$HOME"/.local/share}/zshkeep
mkdir -p -- "$zshkeep" || return
# Parse options
@@ -141,7 +141,7 @@ EOF
}
# Load any existing scripts in zshkeep
-for zshkeep in "${ZSHKEEP:-"$HOME"/.zshkeep.d}"/*.zsh(N) ; do
+for zshkeep in "${XDG_DATA_HOME:-"$HOME"/.local/share}"/zshkeep/*.zsh ; do
[[ -e $zshkeep ]] || continue
source "$zshkeep"
done