From 28cad284acad5b311745cf099b634132fc56c22c Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Tue, 5 Mar 2024 21:34:28 -0500 Subject: [PATCH] Remove vim-unimpaired and vim-repeat, and manually add the [ ] feature of vim-unimpaired that adds lines above and below the current one --- .gitmodules | 6 ------ readme.md | 2 -- vim/bundle/vim-repeat | 1 - vim/bundle/vim-unimpaired | 1 - vim/config/keyboard.vim | 16 +++++++--------- 5 files changed, 7 insertions(+), 19 deletions(-) delete mode 160000 vim/bundle/vim-repeat delete mode 160000 vim/bundle/vim-unimpaired diff --git a/.gitmodules b/.gitmodules index a025de6..4eefe23 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,18 +22,12 @@ [submodule "vim/bundle/vim-signify"] path = vim/bundle/vim-signify url = https://github.com/mhinz/vim-signify -[submodule "vim/bundle/vim-repeat"] - path = vim/bundle/vim-repeat - url = https://github.com/tpope/vim-repeat.git [submodule "vim/bundle/vim-polyglot-darkcloud"] path = vim/bundle/vim-polyglot-darkcloud url = https://github.com/prurigro/vim-polyglot-darkcloud.git [submodule "vim/bundle/tabular"] path = vim/bundle/tabular url = https://github.com/godlygeek/tabular -[submodule "vim/bundle/vim-unimpaired"] - path = vim/bundle/vim-unimpaired - url = https://github.com/tpope/vim-unimpaired.git [submodule "vim/bundle/ReplaceWithRegister"] path = vim/bundle/ReplaceWithRegister url = https://github.com/prurigro/ReplaceWithRegister.git diff --git a/readme.md b/readme.md index 99c734d..e2ba842 100644 --- a/readme.md +++ b/readme.md @@ -144,8 +144,6 @@ For a complete list of mappings specific to **darkcloud-nvimconfig**, check the * [vim-signify](https://github.com/mhinz/vim-signify): When a version controlled file is changed, this displays a column showing where and how, and allows for navigation to and between differences * [vim-togglelist](https://github.com/milkypostman/vim-togglelist): A simple plugin for vim that allows you to bind a key to toggle the Location List and the Quickfix List * [vim-trailing-whitespace](https://github.com/bronson/vim-trailing-whitespace): Highlights and allows for the easy removal of trailing whitespace in documents -* [vim-unimpaired](https://github.com/tpope/vim-unimpaired): Pairs of handy bracket mappings - * [vim-repeat](https://github.com/tpope/vim-repeat): Enable repeating supported plugin maps with "." ## Credits diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat deleted file mode 160000 index 24afe92..0000000 --- a/vim/bundle/vim-repeat +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 24afe922e6a05891756ecf331f39a1f6743d3d5a diff --git a/vim/bundle/vim-unimpaired b/vim/bundle/vim-unimpaired deleted file mode 160000 index 6d44a6d..0000000 --- a/vim/bundle/vim-unimpaired +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6d44a6dc2ec34607c41ec78acf81657248580bf1 diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim index 78c6eae..f9ff8cd 100644 --- a/vim/config/keyboard.vim +++ b/vim/config/keyboard.vim @@ -134,12 +134,10 @@ " w | (N) -> remove whitespace " | (V) -> indent all the lines currently selected " | (N) -> indent the current line -" > | (V) -> indent all the lines currently selected -" > | (N) -> indent the current line " | (V) -> un-indent all the lines currently selected " | (N) -> un-indent the current line -" < | (V) -> un-indent all the lines currently selected -" < | (N) -> un-indent the current line +" [ | (N) -> insert a blank line above the current one +" ] | (N) -> insert a blank line below the current one " " (macros) " ' | (N) -> run a macro @@ -521,15 +519,15 @@ "remove trailing whitespace nnoremap w ':FixWhitespace:echo "Trailing whitespace has been removed"' - "tab/> and untab/< the currently selected lines + "tab and untab the currently selected lines vnoremap >gv nnoremap v>gv - vnoremap > >gv - nnoremap > v>gv vnoremap v - vnoremap < < v + + "insert blank lines above and below the current one + nnoremap ] :call append(line("."), repeat([""], v:count1)) + nnoremap [ :call append(line(".")-1, repeat([""], v:count1)) "} "MACROS:{