From ee26568b5f0cf9459893ea0c2b223d117414f0ca Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 13:37:13 +1200 Subject: Update vim-colon-operator to v0.5.0 --- vim/bundle/colon_operator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/colon_operator b/vim/bundle/colon_operator index 8238405d..915fe150 160000 --- a/vim/bundle/colon_operator +++ b/vim/bundle/colon_operator @@ -1 +1 @@ -Subproject commit 8238405d96e500be5c2eedfa638e94e58cc56ac7 +Subproject commit 915fe15069acbe3f4021a998344eeda921ea1cd9 -- cgit v1.2.3 From 2c382f4be48cc52840eb3fe21106039cc045a7a4 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 13:46:19 +1200 Subject: Use :map then :sunmap to abbreviate nox mappings --- vim/vimrc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index a8c216dc..29e2a80c 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -429,12 +429,10 @@ onoremap _ :normal! `[v`] onoremap % :normal! 1GVG " \{ and \} move to lines with non-space chars before current column -nmap { (VerticalRegionUp) -nmap } (VerticalRegionDown) -omap { (VerticalRegionUp) -omap } (VerticalRegionDown) -xmap { (VerticalRegionUp) -xmap } (VerticalRegionDown) +map { (VerticalRegionUp) +sunmap { +map } (VerticalRegionDown) +sunmap } " \/ types :vimgrep for me ready to enter a search pattern nnoremap / :vimgrep /\c/j ** -- cgit v1.2.3 From 40390704cf21fa61046371d276a9e5e0e29ca696 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 13:49:50 +1200 Subject: Update vim-vertical-region to v1.3.0 --- vim/bundle/vertical_region | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/vertical_region b/vim/bundle/vertical_region index 1ccf6ca6..8d0f5186 160000 --- a/vim/bundle/vertical_region +++ b/vim/bundle/vertical_region @@ -1 +1 @@ -Subproject commit 1ccf6ca601381d88464c3956f71c83e8d7e39194 +Subproject commit 8d0f51861cace12c36e3074556f9043c3bd72a0b -- cgit v1.2.3 From 82d5d62679a8d5c3f7b283d23cab718bf7ce2ae3 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 13:52:58 +1200 Subject: Compact 'wildignore' setting a bit --- vim/vimrc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 29e2a80c..f54b20db 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -193,8 +193,7 @@ set virtualedit+=block set visualbell t_vb= " Tab completion settings -set wildignore=*~,#*# - \,*.7z +set wildignore=*~,#*#,*.7z,.DS_Store,.git,.hg,.svn \,*.a,*.adf,*.asc,*.au,*.aup,*.avi \,*.bin,*.bmp,*.bz2 \,*.class @@ -214,7 +213,6 @@ set wildignore=*~,#*# \,*.wav,*.webm \,*.xbm,*.xcf,*.xls,*.xlsx,*.xpm,*.xz \,*.zip - \,.DS_Store,.git,.hg,.svn if exists('+wildignorecase') set wildignorecase " Case insensitive, if supported (v7.3.072) endif -- cgit v1.2.3 From 91b69d6ba0b1da81ed5e46419dc8dd36bb09005c Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 13:57:03 +1200 Subject: Adjust insert mode CTRL-L mapping --- vim/vimrc | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index f54b20db..2d385e5f 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -250,13 +250,11 @@ endif " Map double Ctrl-K in insert mode to search digraph names imap (DigraphSearch) -" Stack normal/visual/select Ctrl-L to clear search highlight -nnoremap :nohlsearch +" Stack Ctrl-L to clear search highlight, make it work in insert mode too +nmap :nohlsearch +inoremap vnoremap :nohlsearchgv -" Make Ctrl-L work in insert mode too; good for choppy terminals -inoremap :redraw - " Remap normal/visual & and g& to preserve substitution flags nnoremap & :&& xnoremap & :&& -- cgit v1.2.3 From 686d9db39979e54a70ada76730fe6826c4a583b5 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 14:00:48 +1200 Subject: Update vim-sahara to v1.4.0 --- vim/bundle/sahara | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/bundle/sahara b/vim/bundle/sahara index 7504b620..b2afabb4 160000 --- a/vim/bundle/sahara +++ b/vim/bundle/sahara @@ -1 +1 @@ -Subproject commit 7504b62005330302110ed26f84ac2f588251ca72 +Subproject commit b2afabb4e064f68729f69356bf1c5e7fb3e94630 -- cgit v1.2.3 From c261f39862a70acb62b9bb63f38dc7d72eac850a Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 14:32:48 +1200 Subject: Remove mapping loop from normal CTRL-L in vimrc Duh... --- vim/vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 2d385e5f..fe3cb647 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -251,9 +251,9 @@ endif imap (DigraphSearch) " Stack Ctrl-L to clear search highlight, make it work in insert mode too -nmap :nohlsearch -inoremap +nnoremap :nohlsearch vnoremap :nohlsearchgv +inoremap :nohlsearch " Remap normal/visual & and g& to preserve substitution flags nnoremap & :&& -- cgit v1.2.3 From 2df4949713ee433a158ad310b51613ce7cd66099 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 14:38:35 +1200 Subject: Add first attempt at Git template dir --- .gitignore | 1 + Makefile | 14 ++++++++++++-- git/template/description | 1 + git/template/hooks/post-update.sh | 4 ++++ 4 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 git/template/description create mode 100644 git/template/hooks/post-update.sh diff --git a/.gitignore b/.gitignore index 309644a0..6b634a75 100644 --- a/.gitignore +++ b/.gitignore @@ -170,6 +170,7 @@ /games/zs /git/gitconfig /git/gitconfig.m4 +/git/template/hooks/post-update /gnupg/gpg.conf /gnupg/gpg.conf.m4 /include/mktd.m4 diff --git a/Makefile b/Makefile index 9468ff85..3740970e 100644 --- a/Makefile +++ b/Makefile @@ -261,7 +261,9 @@ GAMES = games/aaf \ games/xyzzy \ games/zs -all: $(BINS) git/gitconfig gnupg/gpg.conf +GIT_TEMPLATE_HOOKS = git/template/hooks/post-update + +all: $(BINS) git/gitconfig $(GIT_TEMPLATE_HOOKS) gnupg/gpg.conf clean distclean: rm -f -- \ @@ -269,6 +271,7 @@ clean distclean: $(BINS_M4) \ $(BINS_SH) \ $(GAMES) \ + $(GIT_TEMPLATE_HOOKS) \ dillo/dillorc \ dillo/dillorc.m4 \ git/gitconfig \ @@ -414,8 +417,15 @@ install-games-man: mkdir -p -- $(HOME)/.local/share/man/man6 cp -p -- man/man6/*.6df $(HOME)/.local/share/man/man6 -install-git: git/gitconfig +install-git: git/gitconfig $(GIT_TEMPLATE_HOOKS) cp -p -- git/gitconfig $(HOME)/.gitconfig + find git/template \ + -type d -exec sh -c 'mkdir -p -- \ + $(HOME)/.git-template"$${1#git/template}"' \ + _ {} \; \ + -o -exec sh -c 'cp -p -- "$$1" \ + $(HOME)/.git-template"$${1#git/template}"' \ + _ {} \; install-gnupg: gnupg/gpg.conf mkdir -m 0700 -p -- $(HOME)/.gnupg diff --git a/git/template/description b/git/template/description new file mode 100644 index 00000000..9e2d17e8 --- /dev/null +++ b/git/template/description @@ -0,0 +1 @@ +I have no description, and I must scream. diff --git a/git/template/hooks/post-update.sh b/git/template/hooks/post-update.sh new file mode 100644 index 00000000..7199a513 --- /dev/null +++ b/git/template/hooks/post-update.sh @@ -0,0 +1,4 @@ +bare=$(git config core.bare) +case $bare in + true) git update-server-info ;; +esac -- cgit v1.2.3 From 1933e360a83a3fada24b378ca2dffe2818d224dd Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 14:45:33 +1200 Subject: Add check and lint targets for git template hooks --- Makefile | 8 ++++++++ check/git-template-hooks.sh | 3 +++ lint/git-template-hooks.sh | 5 +++++ 3 files changed, 16 insertions(+) create mode 100644 check/git-template-hooks.sh create mode 100644 lint/git-template-hooks.sh diff --git a/Makefile b/Makefile index 3740970e..2057b3fd 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,7 @@ check-bash \ check-bin \ check-games \ + check-git-template-hooks \ check-ksh \ check-login-shell \ check-man \ @@ -76,6 +77,7 @@ lint-bash \ lint-bin \ lint-games \ + lint-git-template-hooks \ lint-ksh \ lint-sh \ lint-urxvt \ @@ -666,6 +668,9 @@ check-bin: $(BINS) check-games: $(GAMES) sh check/games.sh +check-git-template-hooks: $(GIT_TEMPLATE_HOOKS) + sh check/git-template-hooks.sh + check-man: sh check/man.sh @@ -705,6 +710,9 @@ lint-bin: check-bin lint-games: check-games sh lint/games.sh +lint-git-template-hooks: check-git-template-hooks + sh lint/git-template-hooks.sh + lint-ksh: check-ksh sh lint/ksh.sh diff --git a/check/git-template-hooks.sh b/check/git-template-hooks.sh new file mode 100644 index 00000000..42d3a69f --- /dev/null +++ b/check/git-template-hooks.sh @@ -0,0 +1,3 @@ +for sh in git/template/hooks/*.sh ; do + sh -n "${sh%.sh}" || exit +done diff --git a/lint/git-template-hooks.sh b/lint/git-template-hooks.sh new file mode 100644 index 00000000..74f20fc6 --- /dev/null +++ b/lint/git-template-hooks.sh @@ -0,0 +1,5 @@ +set -- +for bin in git/template/hooks/*.sh ; do + set -- "$@" "${bin%.sh}" +done +shellcheck -e SC1090 -- "$@" || exit -- cgit v1.2.3 From 6417908f8504957a1b78f9ccd7991a081e546857 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Wed, 29 May 2019 14:46:11 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 7111cc15..3584a06d 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v5.3.0 -Wed May 29 01:30:13 UTC 2019 +tejr dotfiles v5.4.0 +Wed May 29 02:46:11 UTC 2019 -- cgit v1.2.3