move lines around
Merge branch 'nix' of github.com:philologer/shellconf into nix
davperms and jstor-rename tweaks