From 12d4c06713b2b6ca798a0d05029c198a633807dc Mon Sep 17 00:00:00 2001 From: Tony Duckles Date: Sat, 23 Dec 2017 09:23:10 -0600 Subject: [PATCH] .vimrc: Cleanup 'highlight' overrides The current colorscheme should set all the standard 'highlight' groups. No need to override them locally. - Remove all 'guifg'/'guibg' overrides, keep only terminal-type overrides. GUI sessions (e.g. gvim) should use 24-bit colors as defined in current `colorscheme`. - Remove 'StatusLine' highlights. Everything status-line is handled by `vim-airline`. - Only define override 'SpecialKeys' highlights if we're using a 16-color $TERM [because I don't like the default solarized color- scheme 'SpecialKeys' highlight colors]. - Remove 'Todo' highlight. The current `colorscheme` should define this, no need to override it. --- .vimrc | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.vimrc b/.vimrc index 4101794..5273608 100644 --- a/.vimrc +++ b/.vimrc @@ -88,21 +88,15 @@ endif " --------------------------------------------------------------------------- " always use terminal's default bg color -highlight Normal ctermbg=None +highlight Normal ctermbg=None " comments -highlight Comment ctermfg=DarkGrey guifg=#425257 +highlight Comment ctermfg=DarkGrey " visual block -highlight Visual term=reverse cterm=reverse ctermfg=DarkGreen ctermbg=White guifg=#4d830a guibg=#fdf6e3 -" statusline (active vs inactive) -if !exists(':AirlineTheme') - highlight StatusLine term=reverse cterm=reverse ctermfg=Black ctermbg=Grey guifg=#073642 guibg=#93A1A1 - highlight StatusLineNC term=reverse cterm=reverse ctermfg=Black ctermbg=DarkGrey guifg=#073642 guibg=#37555c - highlight User1 term=reverse cterm=reverse ctermfg=Black ctermbg=DarkGreen guifg=#4d830a guibg=#073642 +highlight Visual term=reverse cterm=reverse ctermfg=DarkGreen ctermbg=White +if &t_Co < 256 && !has("gui_running") + " unprintable chars (listchars) + highlight SpecialKey ctermfg=DarkGrey ctermbg=Black endif -" unprintable chars (listchars) -highlight SpecialKey ctermfg=DarkGrey ctermbg=Black guifg=#374549 guibg=#06313c -" to-do comments -highlight Todo ctermfg=White ctermbg=Red guifg=#f2f2f2 guibg=#dc322f " ---------------------------------------------------------------------------- " Backups -- 2.43.0