From a177c3f8963952ee8629a670ab46013fa25f4e21 Mon Sep 17 00:00:00 2001 From: Alex Karle Date: Wed, 29 Dec 2021 22:23:36 -0500 Subject: [PATCH] vim: Remove gvimrc, cleanup ftplugins, & colorschemes I haven't used gvim since I was on Windows, which has been almost a year and I don't plan on touching anytime soon. Likewise, I don't usually install ripgrep these days / or use the :grep command (:Ggrep all the way!), so the special handling isn't needed. Another change was the removal of vc.vim -- of late, I found that having spell checking with bg=light is totally unreadable, so it's better to revert to colo default with bg=dark (I mean, I'm not really spending much time in the virtual console..., so the original purpose is less important!) --- .vim/colors/vc.vim | 16 ---------------- .vim/ftplugin/c.vim | 5 +++++ .vim/ftplugin/pod.vim | 1 - .vim/ftplugin/python.vim | 3 --- .vim/ftplugin/tex.vim | 4 ---- .vim/ftplugin/vader.vim | 3 --- .vim/gvimrc | 27 --------------------------- .vim/improved.vim | 14 +------------- 8 files changed, 6 insertions(+), 67 deletions(-) delete mode 100644 .vim/colors/vc.vim create mode 100644 .vim/ftplugin/c.vim delete mode 100644 .vim/ftplugin/pod.vim delete mode 100644 .vim/ftplugin/vader.vim delete mode 100644 .vim/gvimrc diff --git a/.vim/colors/vc.vim b/.vim/colors/vc.vim deleted file mode 100644 index 8a27fba..0000000 --- a/.vim/colors/vc.vim +++ /dev/null @@ -1,16 +0,0 @@ -" colors/vc.vim -" -" An adaptation of the default colorscheme for the Linux Virtual Console -" (also just my preferred 'default' should there be no gruvbox installed) -" -" Preferred Setup: -" ================ -" - Vim 8.1 (NeoVim insists on setting &t_Co to 256 / dropped t_XX settings) -" - &t_Co == 8 -" - TERM=linux (default VC) or TERM=tmux/screen -" - Base 8-color pallete from gruvbox -" - bg=light -hi! StatusLine cterm=NONE ctermfg=0 ctermbg=7 -hi! StatusLineNC cterm=NONE ctermfg=0 ctermbg=7 -hi! Folded cterm=NONE ctermfg=3 ctermbg=0 -hi! LineNr cterm=NONE ctermfg=7 ctermbg=0 diff --git a/.vim/ftplugin/c.vim b/.vim/ftplugin/c.vim new file mode 100644 index 0000000..54acb43 --- /dev/null +++ b/.vim/ftplugin/c.vim @@ -0,0 +1,5 @@ +" TAB is TAB +setlocal softtabstop=8 +setlocal shiftwidth=8 +setlocal noexpandtab +setlocal nosmarttab diff --git a/.vim/ftplugin/pod.vim b/.vim/ftplugin/pod.vim deleted file mode 100644 index 1e3cd9b..0000000 --- a/.vim/ftplugin/pod.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal textwidth=80 diff --git a/.vim/ftplugin/python.vim b/.vim/ftplugin/python.vim index da21201..363f1da 100644 --- a/.vim/ftplugin/python.vim +++ b/.vim/ftplugin/python.vim @@ -5,6 +5,3 @@ " zc -- close a fold by indent (at cursor until end indent) " zo -- open a closed fold setlocal foldmethod=indent - -" Set the local :make command to run flake8 -setlocal makeprg=flake8\ % diff --git a/.vim/ftplugin/tex.vim b/.vim/ftplugin/tex.vim index c681ff3..e68fac3 100644 --- a/.vim/ftplugin/tex.vim +++ b/.vim/ftplugin/tex.vim @@ -1,7 +1,3 @@ -" ignore the wrapped lines -noremap k gk -noremap j gj - " spell check! setlocal spell spelllang=en_us diff --git a/.vim/ftplugin/vader.vim b/.vim/ftplugin/vader.vim deleted file mode 100644 index 7e52c0f..0000000 --- a/.vim/ftplugin/vader.vim +++ /dev/null @@ -1,3 +0,0 @@ -" vader.vim is a Vim testing framework by Junegunn -" https://github.com/junegunn/vader.vim -setlocal foldmethod=marker diff --git a/.vim/gvimrc b/.vim/gvimrc deleted file mode 100644 index b8ec952..0000000 --- a/.vim/gvimrc +++ /dev/null @@ -1,27 +0,0 @@ -" Disable visual bells -set noerrorbells visualbell t_vb= -autocmd GUIEnter * set visualbell t_vb= - -" Pretty printing -set printoptions=left:1in,right:1in,paper:letter -set printfont=Consolas:h11 - -" Minimal UI -set guioptions= " Don't show guioptions (toolbar, scrollbar,..) -set guicursor=a:blinkon0 " Don't blink the cursor (not my thang) - -" Font that doesn't hurt my eyes at a size depending on the screen -if has('gui_macvim') - set guifont=Inconsolata:h15 -elseif has('win32') || has('win64') - set guifont=Consolas:h11 -else - set guifont=Inconsolata\ 14 -end - -" Bigger size on startup -set lines=50 -set columns=100 - -" The pop-up asking if you want to reload forces mouse usage :O -set autoread diff --git a/.vim/improved.vim b/.vim/improved.vim index 10a8dbe..da0e32c 100644 --- a/.vim/improved.vim +++ b/.vim/improved.vim @@ -8,13 +8,6 @@ set undolevels=1000 " Max # changes that can be undone set undoreload=10000 " Saves undofile on reload (:e) if < 10k LOC set backupdir=~/.vim/swp,. " Backup files in ~/.vim/swp set directory=~/.vim/swp,. " Swap files in ~/.vim/swp - -" Faster grepping! (use ripgrep if available for :grep and :FZF) -if executable('rg') - set grepprg=rg\ --vimgrep\ --no-heading - set grepformat=%f:%l:%c:%m,%f:%l:%m - let $FZF_DEFAULT_COMMAND = 'rg --files --hidden --glob "!.git/*"' -endif " }}} " PLUGIN RELATED SETTINGS {{{ @@ -37,6 +30,7 @@ let g:ale_fix_on_save = 1 " COLORSCHEME {{{ " Only gruv if you can handle it " NOTE: for initial check, check $TERM, not &term, as nvim has &term=nvim +set background=dark if (($TERM =~# '256color' && has("termguicolors")) || has('gui_running')) && \ filereadable(expand("~/.vim/pack/mine/start/gruvbox/colors/gruvbox.vim")) @@ -49,16 +43,10 @@ if (($TERM =~# '256color' && has("termguicolors")) || has('gui_running')) && let &t_8b = "\[48;2;%lu;%lu;%lum" endif - set background=dark - augroup CurLineToggle autocmd! autocmd InsertEnter,InsertLeave * set cul! augroup END -else - " Can't handle the gruv - set background=light - colorscheme vc endif " }}} -- libgit2 1.1.1