From 7f94c04724f970f1e17e3bbc4491f440e80371ad Mon Sep 17 00:00:00 2001 From: "chawley (penguin)" Date: Thu, 8 May 2025 20:34:37 -0400 Subject: [PATCH] Removed extraneous comments, improved keybindings Finally removed all the commented out lines that I was saving in case I needed to roll them back. Switched some keybindings to keys that made more sense. --- .vimrc | 48 ++++++++++++------------------------------------ 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/.vimrc b/.vimrc index 0fe6fa9..b4c10aa 100644 --- a/.vimrc +++ b/.vimrc @@ -25,9 +25,10 @@ set scrolloff=10 " number of lines to keep a set showmatch " show matching brackets when text indicator is over them set splitright " Split to right by default if !has('nvim') - set term=xterm-256color " LOTS of colors + set term=xterm-256color " LOTS of colors endif set wildmenu " enhanced command line completion +set fillchars=vert:\|,fold:.,diff:- " Text Wrapping set colorcolumn= " disable colorzing column @@ -229,31 +230,14 @@ let g:fzf_action = { \ 'ctrl-l': function('PasteFzfWikiLink') \ } -" --------------------------------------------------------------------------------------------------------------------- -" ==> Colors -" Term GUI Colors -" colorscheme replaced by ~/.vimcustom -" If there is a file at ~/.vimcustom, the colorscheme defined in that file -" will be applied. If not, colorscheme defaults to 'darkburn' - -" cursorcolumn -"hi cursorcolumn cterm=NONE ctermbg=black ctermfg=white -" visual mode colors -"hi visual cterm=NONE ctermbg=lightyellow ctermfg=black - -set fillchars=vert:\|,fold:.,diff:- -" In split windows - active buffer status bar is green, inactive is yellow -"hi StatusLine ctermfg=white ctermbg=darkgreen cterm=bold -"hi StatusLineNC ctermfg=darkgray ctermbg=gray cterm=none - " --------------------------------------------------------------------------------------------------------------------- " => Keymaps: Highlights -" to turn off search highlight -nnoremap :nohls +" to toggle search highlight +nnoremap :nohls -" C to toggle row/column highlight -nnoremap C :set cursorline! cursorcolumn! +" to toggle row/column highlight +nnoremap :set cursorline! cursorcolumn! " --------------------------------------------------------------------------------------------------------------------- " ==> Keymaps: Buffers & Panes @@ -277,9 +261,6 @@ nnoremap c :bd " to save buffer nnoremap :w -" to bring up the copy buffer -noremap "+ - " -arrow keys to navigate panes " UP map [1;3A @@ -381,18 +362,11 @@ hi SpellCap cterm=underline ctermbg=none hi SpellBad cterm=underline ctermbg=none hi SpellLocal cterm=underline ctermbg=none hi SpellRare cterm=underline ctermbg=none -"hi SpellCap cterm=underline ctermbg=none ctermfg=magenta -"hi SpellBad cterm=underline ctermbg=none ctermfg=red -"hi SpellLocal cterm=underline ctermbg=none ctermfg=gray -"hi SpellRare cterm=underline ctermbg=none ctermfg=gray " --------------------------------------------------------------------------------------------------------------------- " ==> Templates: markdown documents with frontmatter (.md) autocmd BufNewFile *.md so $HOME/.vim/templates/mdfm -"autocmd BufNewFile *.md %s/filename:.*/s//filename:\=expand('%:t:r') -"autocmd BufNewFile *.md %s/filename:.*/\='filename: '.expand('%:t:r') -"autocmd BufNewFile *.md exe "g/^filename:.*/s//filename: " .expand('%:t:r') autocmd BufNewFile *.md exe "g/^filecreated:.*/s//filecreated: " .strftime("%Y-%m-%d") autocmd BufNewFile *.md exe "normal Go" autocmd BufWritePre,filewritepre *.md execute "normal! ma" @@ -423,13 +397,9 @@ nnoremap ,begend :-1read $HOME/.vim/templates/begendjA nnoremap ,sh :0read $HOME/.vim/templates/sh :1dd :4%s/filename/\=expand('%:t')/g " section readinglist header -"nnoremap ,rl :0read $HOME/.vim/templates/readinglist :1dd $ -"nnoremap ,rl :0read $HOME/.vim/templates/rlfm zR :1dd :%s/^filename:/\="filename: " . expand('%:t:r')/g nnoremap ,rl :0read $HOME/.vim/templates/rlfm zR :1dd " section markdown file header -"nnoremap ,md :0read $HOME/.vim/templates/md :1dd :%s/filename/\=expand('%:t:r')/g -"nnoremap ,md :0read $HOME/.vim/templates/mdfm zR :1dd :%s/^filename:/\="filename: " . expand('%:t:r')/g nnoremap ,md :0read $HOME/.vim/templates/mdfm zR :1dd " --------------------------------------------------------------------------------------------------------------------- @@ -445,6 +415,12 @@ autocmd FileType netrw setl bufhidden=delete autocmd BufNewFile,BufReadPost *.{yaml,yml} set filetype=yaml foldmethod=manual autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab +" --------------------------------------------------------------------------------------------------------------------- +" ==> Colors +" Term GUI Colors +" colorscheme replaced by ~/.vimcustom +" If there is a file at ~/.vimcustom, the colorscheme defined in that file +" will be applied. If not, colorscheme defaults to 'darkburn' " --------------------------------------------------------------------------------------------------------------------- " ==> Source Local Customizations and Set Colorscheme