From 2a8a894dbd0f0bb86f7de687830e10ac8f76e028 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 4 Jul 2018 01:27:33 +1200 Subject: Use :nnoremap for Perl vim maps --- vim/after/ftplugin/perl.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim index 37cd1c08..759dc1d3 100644 --- a/vim/after/ftplugin/perl.vim +++ b/vim/after/ftplugin/perl.vim @@ -18,9 +18,9 @@ if exists('g:no_plugin_maps') || exists('g:no_perl_maps') endif " Set mappings -nmap c :call compiler#Make('perl') -nmap l :call compiler#Make('perlcritic') -nmap t :call filter#Stable('perltidy') +nnoremap c :call compiler#Make('perl') +nnoremap l :call compiler#Make('perlcritic') +nnoremap t :call filter#Stable('perltidy') let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap c' \ . '|nunmap l' -- cgit v1.2.3 From 0fbcaee280d1eed2cc779b3b2ef3038091f4b621 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 4 Jul 2018 01:29:05 +1200 Subject: Break up some long VimL lines --- vim/after/ftplugin/perl.vim | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim index 759dc1d3..acfb72c4 100644 --- a/vim/after/ftplugin/perl.vim +++ b/vim/after/ftplugin/perl.vim @@ -18,9 +18,12 @@ if exists('g:no_plugin_maps') || exists('g:no_perl_maps') endif " Set mappings -nnoremap c :call compiler#Make('perl') -nnoremap l :call compiler#Make('perlcritic') -nnoremap t :call filter#Stable('perltidy') +nnoremap c + \ :call compiler#Make('perl') +nnoremap l + \ :call compiler#Make('perlcritic') +nnoremap t + \ :call filter#Stable('perltidy') let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap c' \ . '|nunmap l' -- cgit v1.2.3 From 26d69e9a62174777683c7cf29cfcd2f7d331bbc4 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 4 Jul 2018 02:08:49 +1200 Subject: Correct alphabetical order of filetype.vim --- vim/filetype.vim | 68 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/vim/filetype.vim b/vim/filetype.vim index 66b26455..ad2545a0 100644 --- a/vim/filetype.vim +++ b/vim/filetype.vim @@ -106,11 +106,6 @@ augroup filetypedetect \,?*.patch \,?*.rej \ setfiletype diff - " GTK settings files - autocmd BufNewFile,BufRead - \ .gktrc*, - \,gktrc* - \ setfiletype gtkrc " INI files autocmd BufNewFile,BufRead \ ?*.ini @@ -162,6 +157,11 @@ augroup filetypedetect \,/etc/gshadow- \,/etc/gshadow.edit \ setfiletype group + " GTK settings files + autocmd BufNewFile,BufRead + \ .gktrc*, + \,gktrc* + \ setfiletype gtkrc " Vim help files autocmd BufNewFile,BufRead \ ~/.vim/doc/?*.txt @@ -250,12 +250,6 @@ augroup filetypedetect \,?*.[1-9] \,*/man[1-9]*/?*.[1-9]* \ setfiletype nroff - " pass(1) password files - autocmd BufNewFile,BufRead - \ /dev/shm/pass.?*/?*.txt - \,$TMPDIR/pass.?*/?*.txt - \,/tmp/pass.?*/?*.txt - \ setfiletype password " UNIX password and shadow files autocmd BufNewFile,BufRead \ /etc/passwd @@ -265,6 +259,12 @@ augroup filetypedetect \,/etc/shadow- \,/etc/shadow.edit \ setfiletype passwd + " pass(1) password files + autocmd BufNewFile,BufRead + \ /dev/shm/pass.?*/?*.txt + \,$TMPDIR/pass.?*/?*.txt + \,/tmp/pass.?*/?*.txt + \ setfiletype password " Perl 5 files autocmd BufNewFile,BufRead \ ?*.pl @@ -310,6 +310,18 @@ augroup filetypedetect autocmd BufNewFile,BufRead \ robots.txt \ setfiletype robots + " Ruby + autocmd BufNewFile,BufRead + \ ?*.rb + \ setfiletype ruby + " sed files + autocmd BufNewFile,BufRead + \ ?*.sed + \ setfiletype sed + " Services files + autocmd BufNewFile,BufRead + \ /etc/services + \ setfiletype services " Bash shell autocmd BufNewFile,BufRead \ ?*.bash @@ -349,40 +361,23 @@ augroup filetypedetect \,xinitrc \ let b:is_posix = 1 \|setfiletype sh - " sed files - autocmd BufNewFile,BufRead - \ ?*.sed - \ setfiletype sed - " Services files + " SQL autocmd BufNewFile,BufRead - \ /etc/services - \ setfiletype services + \ ?*.sql + \ setfiletype sql " OpenSSH configuration autocmd BufNewFile,BufRead \ ssh_config,*/.ssh/config \ setfiletype sshconfig - " OpenSSH server configuration - autocmd BufNewFile,BufRead - \ sshd_config - \ setfiletype sudoers " sudoers(5) autocmd BufNewFile,BufRead \ sudoers \,sudoers.tmp \ setfiletype sshdconfig - " tmux configuration files - autocmd BufNewFile,BufRead - \ .tmux.conf - \,tmux.conf - \ setfiletype tmux - " Ruby - autocmd BufNewFile,BufRead - \ ?*.rb - \ setfiletype ruby - " SQL + " OpenSSH server configuration autocmd BufNewFile,BufRead - \ ?*.sql - \ setfiletype sql + \ sshd_config + \ setfiletype sudoers " Subversion commit autocmd BufNewFile,BufRead \ svn-commit*.tmp @@ -404,6 +399,11 @@ augroup filetypedetect \ .tidyrc \,tidyrc \ setfiletype tidy + " tmux configuration files + autocmd BufNewFile,BufRead + \ .tmux.conf + \,tmux.conf + \ setfiletype tmux " Tab-separated (TSV) files autocmd BufNewFile,BufRead \ ?*.tsv -- cgit v1.2.3 From a6b23888a58c2fb6cbc6ab7510772999f6c82b91 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 4 Jul 2018 10:56:26 +1200 Subject: Simplify .vimrc leader map settings --- vim/vimrc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index b1fbbbd4..ed855b41 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -213,13 +213,12 @@ nnoremap ]t :tabnext nmap [ PutBlankLinesAbove nmap ] PutBlankLinesBelow -" Normal mode leader mappings below; use rather than on the -" non-plugin maps so that they work on vim-tiny +" Normal leader maps; use not for vim-tiny " \a toggles 'formatoptions' 'a' flag using a plugin -nnoremap a :ToggleOptionFlagLocal formatoptions a +nnoremap a :ToggleOptionFlagLocal formatoptions a " \b toggles copy-pasteable linebreak settings -nmap b CopyLinebreakToggle +nmap b CopyLinebreakToggle " \c toggles 'cursorline' nnoremap c :set cursorline! cursorline? " \C toggles 'cursorcolumn' @@ -249,9 +248,9 @@ nnoremap M :map " \n toggles line numbers nnoremap n :set number! number? " \o opens a line below in paste mode -nmap o PasteOpenBelow +nmap o PasteOpenBelow " \o opens a line above in paste mode -nmap O PasteOpenAbove +nmap O PasteOpenAbove " \p toggles paste mode nnoremap p :set paste! paste? " \r reloads .vimrc @@ -269,7 +268,7 @@ nnoremap V :let b: t: w: " \w toggles wrapping nnoremap w :set wrap! wrap? " \x strips trailing whitespace via a custom plugin -nmap x StripTrailingWhitespace +nmap x StripTrailingWhitespace " \z sets NZ English spelling (compare \u) nnoremap z :setlocal spelllang=en_nz -- cgit v1.2.3 From cd28ccec63f7c1cb00b5f35aca6a8bff2a750581 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 4 Jul 2018 11:08:55 +1200 Subject: Have Vim Perl major version bump map reset minor --- vim/autoload/perl.vim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vim/autoload/perl.vim b/vim/autoload/perl.vim index 5349eb49..a4c8724a 100644 --- a/vim/autoload/perl.vim +++ b/vim/autoload/perl.vim @@ -16,9 +16,10 @@ function! perl#BumpVersion(major) abort let [l:lvalue, l:major, l:minor, l:rest] \ = matchlist(getline(l:li), g:perl#verpat)[1:4] if a:major - let l:major = perl#Incf(l:major) + let l:major = perl#Setf(l:major, l:major + 1) + let l:minor = perl#Setf(l:minor, 0) else - let l:minor = perl#Incf(l:minor) + let l:minor = perl#Setf(l:minor, l:minor + 1) endif let l:version = l:major.'.'.l:minor call setline(l:li, l:lvalue.l:version.l:rest) @@ -39,7 +40,6 @@ function! perl#BumpVersionMajor() abort endfunction " Helper function to format a number without decreasing its digit count -function! perl#Incf(num) abort - let l:inc = a:num + 1 - return repeat('0', strlen(a:num) - strlen(l:inc)).l:inc +function! perl#Setf(old, new) abort + return repeat('0', strlen(a:old) - strlen(a:new)).a:new endfunction -- cgit v1.2.3 From d91e4c77ebe9a7dcc3336b25e0570551a933f974 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 4 Jul 2018 13:08:30 +1200 Subject: Spin off Vim Perl version bump into ftplugin --- .gitmodules | 3 +++ vim/after/ftplugin/perl.vim | 8 ++++---- vim/autoload/perl.vim | 45 -------------------------------------------- vim/bundle/perl_version_bump | 1 + 4 files changed, 8 insertions(+), 49 deletions(-) delete mode 100644 vim/autoload/perl.vim create mode 160000 vim/bundle/perl_version_bump diff --git a/.gitmodules b/.gitmodules index 6f4c3e62..390e7400 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,6 +52,9 @@ [submodule "vim/bundle/markdown_autoformat"] path = vim/bundle/markdown_autoformat url = https://sanctum.geek.nz/code/vim-markdown-autoformat.git +[submodule "vim/bundle/perl_version_bump"] + path = vim/bundle/perl_version_bump + url = https://sanctum.geek.nz/code/vim-perl-version-bump.git # My Vim colorschemes [submodule "vim/bundle/juvenile"] diff --git a/vim/after/ftplugin/perl.vim b/vim/after/ftplugin/perl.vim index acfb72c4..1a7df559 100644 --- a/vim/after/ftplugin/perl.vim +++ b/vim/after/ftplugin/perl.vim @@ -30,10 +30,10 @@ let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap t' " Bump version numbers -nnoremap v - \ :call perl#BumpVersionMinor() -nnoremap V - \ :call perl#BumpVersionMajor() +nmap v + \ PerlVersionBumpMinor +nmap V + \ PerlVersionBumpMajor let b:undo_ftplugin = b:undo_ftplugin \ . '|nunmap v' \ . '|nunmap V' diff --git a/vim/autoload/perl.vim b/vim/autoload/perl.vim deleted file mode 100644 index a4c8724a..00000000 --- a/vim/autoload/perl.vim +++ /dev/null @@ -1,45 +0,0 @@ -" Version number specifier format -let g:perl#verpat = '\m\C^' - \ . '\(our\s\+\$VERSION\s*=\D*\)' - \ . '\(\d\+\)\.\(\d\+\)' - \ . '\(.*\)' - -" Version number bumper -function! perl#BumpVersion(major) abort - let l:view = winsaveview() - let l:li = search(g:perl#verpat) - if !l:li - echomsg 'No version number declaration found' - return - endif - let l:matches = matchlist(getline(l:li), g:perl#verpat) - let [l:lvalue, l:major, l:minor, l:rest] - \ = matchlist(getline(l:li), g:perl#verpat)[1:4] - if a:major - let l:major = perl#Setf(l:major, l:major + 1) - let l:minor = perl#Setf(l:minor, 0) - else - let l:minor = perl#Setf(l:minor, l:minor + 1) - endif - let l:version = l:major.'.'.l:minor - call setline(l:li, l:lvalue.l:version.l:rest) - if a:major - echomsg 'Bumped major $VERSION: '.l:version - else - echomsg 'Bumped minor $VERSION: '.l:version - endif - call winrestview(l:view) -endfunction - -" Explanatory wrappers -function! perl#BumpVersionMinor() abort - call perl#BumpVersion(0) -endfunction -function! perl#BumpVersionMajor() abort - call perl#BumpVersion(1) -endfunction - -" Helper function to format a number without decreasing its digit count -function! perl#Setf(old, new) abort - return repeat('0', strlen(a:old) - strlen(a:new)).a:new -endfunction diff --git a/vim/bundle/perl_version_bump b/vim/bundle/perl_version_bump new file mode 160000 index 00000000..80c98e8b --- /dev/null +++ b/vim/bundle/perl_version_bump @@ -0,0 +1 @@ +Subproject commit 80c98e8b11832cf78f2fc3ee43599749be8ee6a6 -- cgit v1.2.3 From 601719ad5162ded9b438dd871dfe862e20f6e721 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 4 Jul 2018 17:03:19 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 244e4c17..128a9aed 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.20.0 -Tue Jul 3 13:20:13 UTC 2018 +tejr dotfiles v1.21.0 +Wed Jul 4 05:03:12 UTC 2018 -- cgit v1.2.3 From b737de009f2566fb7b892ea17584997eeb76cad0 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 4 Jul 2018 17:03:51 +1200 Subject: Rebuild dotfiles(7) manual page --- man/man7/dotfiles.7df | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index f8f6a453..7c4d410e 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -732,6 +732,16 @@ along a pipeline. \f[C]vi(1)\f[]. .RE .IP \[bu] 2 +Two editor wrapper tools: +.RS 2 +.IP \[bu] 2 +\f[C]mked(1df)\f[] creates paths to all its arguments before invoking +\f[C]$EDITOR\f[]. +.IP \[bu] 2 +\f[C]mkvi(1df)\f[] creates paths to all its arguments before invoking +\f[C]$VISUAL\f[]. +.RE +.IP \[bu] 2 \f[C]ap(1df)\f[] reads arguments for a given command from the standard input, prompting if appropriate. .IP \[bu] 2 -- cgit v1.2.3