diff --git a/colors/guiwal.vim b/colors/guiwal.vim index fb67f8f..a40b3b7 100644 --- a/colors/guiwal.vim +++ b/colors/guiwal.vim @@ -65,7 +65,7 @@ execute "hi IncSearch guibg=" . color3 . " ctermbg=3 guifg=" . color0 . " ctermf execute "hi Search guibg=" . color3 . " ctermbg=3 guifg=" . color0 . " ctermfg=0" execute "hi Directory ctermbg=NONE guifg=" . color4 . " ctermfg=4" execute "hi MatchParen guibg=" . color1 . " ctermbg=1 guifg=" . color8 . " ctermfg=8" -execute "hi ColorColumn guibg=" . color0 . " ctermbg=0 guifg=" . color0 . " ctermfg=0" +execute "hi ColorColumn guibg=" . color0 . " ctermbg=0 guifg=" . color7 . " ctermfg=7" execute "hi signColumn ctermbg=NONE guifg=" . color4 . " ctermfg=4" execute "hi ErrorMsg ctermbg=NONE guifg=" . color8 . " ctermfg=8" execute "hi ModeMsg ctermbg=NONE guifg=" . color2 . " ctermfg=2" diff --git a/init.vim b/init.vim index 21af6f7..aa21698 100644 --- a/init.vim +++ b/init.vim @@ -87,8 +87,22 @@ set splitbelow set splitright "We'll set simpler mappings to switch between splits -nnoremap -nnoremap +"Decrease window size (replaces some weird netrw stuff) +nnoremap - +"Increase window size (Redraws the screen, use :redraw instead) +nnoremap + +nnoremap +nnoremap +nnoremap +nnoremap +"Decrease window size (Backspace clone) +inoremap - +"Increase window size (Replaces leaving `insertmode`, don't use `insertmode`) +inoremap + +inoremap i +inoremap i +inoremap i +inoremap i " }}} " Search --- {{{ @@ -106,6 +120,78 @@ nnoremap ev :tabedit $MYVIMRC nnoremap es :source $MYVIMRC " }}} +"Changing unused ctrl bindings +"List all tags in the current buffer (replaced pageup, use CTRL-u instead) +nnoremap BTags +"List all tags in directory +nnoremap Tags +"List all the recently opened files (replaced scroll one line up, use "k") +nnoremap History +"Search within the current buffer (replaced pagedown, use CTRL-d instead) +nnoremap / +"Search within the whole project +nnoremap Rg +"Search git history (replaced something weird with netrw) +nnoremap Commits +"Search git history within current buffer/selection +nnoremap BCommits +"Move line down (uses vim-unimpaired) (replaced move down, use "j") +nnoremap ]e +"Move line up (uses vim-unimpaired) (replaced move up, use "k") +nnoremap [e +"Search marks (replaced move down, use ) +nnoremap Marks +" nnoremap +"Search version controlled files (replaced move up, use "k") +nnoremap GFiles +"Search all files in directory +nnoremap Files +"Toggle file draw +nnoremap CHADopen +"Search all snippets (uses ultisnips) +nnoremap Snippets +"Search git history (replaced scroll one line up, use "k") +nnoremap Commits +"Search git history within current buffer/selection +nnoremap BCommits + +"List all tags in the current buffer +inoremap BTags +"List all tags in directory +inoremap Tags +"List all the recently opened files (replaced inserting characters from below) +inoremap History +"Search within the current buffer +inoremap / +"Search within the whole project +inoremap Rg +"Search git history (replaced backspace clone) +inoremap Commits +"Search git history within current buffer/selection +inoremap BCommits +"Move line down (uses vim-unimpaired) (replaced clone) +inoremap ]ei +"Move line up (uses vim-unimpaired) (replaced start digraph, use command instead) +inoremap [ei +"Search marks (replaced clone) +inoremap Marks +"Add line below (replaced execute single command in normal) +inoremap o +"Add line above +inoremap O +"Search version controlled files (replaced autocomplete reverse) +inoremap GFiles +"Search all files in directory +inoremap Files +"Toggle file draw (replaces CTRL-v clone) +nnoremap CHADopen +"Search all snippets (uses ultisnips) +inoremap Snippets +"Search git history (replaced inserting characters from above) +nnoremap Commits +"Search git history within current buffer/selection +nnoremap BCommits + "Add simple highlight removal nnoremap :nohlsearch @@ -119,10 +205,11 @@ inoremap kk inoremap hh "Delete a line in insert mode -inoremap ddi +" inoremap ddi "Use semicolon instead of colon for commands nnoremap ; : +nnoremap : ; "Append the line with a semicolon inoremap ; mzA;`za @@ -141,6 +228,7 @@ command! FormatJSON %!python -m json.tool " Allow saving of files as doas command! W execute 'silent! w !doas /usr/bin/tee % >/dev/null' edit! +command! X execute 'silent! x !doas /usr/bin/tee % >/dev/null' edit! " }}} @@ -166,8 +254,6 @@ nnoremap em :call ToggleEmmet() " Conceal markdown text set conceallevel=3 -nnoremap d CHADopen " Open file draw with ,d - let g:AutoPairsFlyMode = 1 let g:AutoPairsShortcutBackInsert = '' " Use to insert the closing parentheses if it jumped ahead by mistake @@ -204,9 +290,6 @@ let g:chadtree_settings = { nnoremap H ^ nnoremap L $ -"Move a line up or down -nnoremap ddp -nnoremap ddkP " }}} " Operator mappings --- {{{ @@ -214,8 +297,8 @@ onoremap in( :normal! f(vi( onoremap il( :normal! F)vi( onoremap an( :normal! f(va( onoremap al( :normal! F)va( -onoremap an{ :normal! f{vi( -onoremap al{ :normal! F}vi( +onoremap an{ :normal! f{vi{ +onoremap al{ :normal! F}vi " }}} " Abbreviations --- {{{