fix: make nvim colorscheme declaration more robust

some background color were `black`, which was already the color of the
    window background
gather highlight groups
This commit is contained in:
swytch 2020-05-24 00:34:14 +02:00
parent 196eaa667f
commit 2bf1ae32e3
2 changed files with 57 additions and 57 deletions

View File

@ -4,7 +4,7 @@
" Maintainer: David JULIEN <swy7ch@protonmail.com>
" Website: https://github.com/vim/vim/blob/master/src/syntax.c
" License: Vim License (see `:help license`)
" Last Updated: Fri 15 May 2020 03:37:00 PM CEST
" Last Updated: Sun 24 May 2020 12:29:55 AM CEST
" Generated by Colortemplate v2.0.0
@ -59,41 +59,40 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi CursorLineNr guifg=#f7a583 guibg=NONE guisp=NONE gui=bold cterm=bold
hi Pmenu guifg=#ebdbb2 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE
hi PmenuSel guifg=#1d2021 guibg=#89b594 guisp=NONE gui=bold cterm=bold
hi PmenuSbar guifg=#1d2021 guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE
hi PmenuThumb guifg=#ebdbb2 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi SpellBad guifg=#ea6962 guibg=NONE guisp=NONE gui=underline cterm=underline
hi SpellCap guifg=#7daea3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi SpellLocal guifg=#ace5d7 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi SpellRare guifg=#f7a583 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi TabLine guifg=#ebdbb2 guibg=#7c6f64 guisp=NONE gui=underline cterm=underline
hi Todo guifg=#1d2021 guibg=#f7a583 guisp=NONE gui=bold cterm=bold
hi ColorColumn guifg=NONE guibg=#b73935 guisp=NONE gui=NONE cterm=NONE
hi Conceal guifg=#7c6f64 guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE
hi DiffAdd guifg=#1d2021 guibg=#5a8471 guisp=NONE gui=NONE cterm=NONE
hi DiffChange guifg=#1d2021 guibg=#f7a583 guisp=NONE gui=NONE cterm=NONE
hi DiffDelete guifg=#1d2021 guibg=#b73935 guisp=NONE gui=bold cterm=bold
hi DiffText guifg=#1d2021 guibg=#ea6962 guisp=NONE gui=bold cterm=bold
hi Directory guifg=#d3869b guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi ErrorMsg guifg=#ffeca3 guibg=#b73935 guisp=NONE gui=bold cterm=bold
hi FoldColumn guifg=#f7a583 guibg=#458588 guisp=NONE gui=NONE cterm=NONE
hi Folded guifg=#f7a583 guibg=#458588 guisp=NONE gui=NONE cterm=NONE
hi IncSearch guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
hi LineNr guifg=#7c6f64 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi MatchParen guifg=NONE guibg=NONE guisp=NONE gui=reverse ctermfg=NONE ctermbg=NONE cterm=reverse
hi ErrorMsg guifg=#ffeca3 guibg=#b73935 guisp=NONE gui=bold cterm=bold
hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
hi MoreMsg guifg=#89b594 guibg=NONE guisp=NONE gui=bold cterm=bold
hi WarningMsg guifg=#ea6962 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi NonText guifg=#7daea3 guibg=NONE guisp=NONE gui=bold cterm=bold
hi PmenuSbar guifg=#1d2021 guibg=#7c6f64 guisp=NONE gui=NONE cterm=NONE
hi PmenuThumb guifg=#ebdbb2 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE
hi Question guifg=#89b594 guibg=NONE guisp=NONE gui=bold cterm=bold
hi Search guifg=#1d2021 guibg=#f7a583 guisp=NONE gui=NONE cterm=NONE
hi ColorColumn guifg=NONE guibg=#b73935 guisp=NONE gui=NONE cterm=NONE
hi FoldColumn guifg=#f7a583 guibg=#458588 guisp=NONE gui=NONE cterm=NONE
hi SignColumn guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
hi SpecialKey guifg=#89b594 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi TabLine guifg=#ebdbb2 guibg=#7c6f64 guisp=NONE gui=underline cterm=underline
hi TabLineFill guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
hi TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE cterm=bold
hi Title guifg=#f7a583 guibg=NONE guisp=NONE gui=bold cterm=bold
hi VertSplit guifg=#7c6f64 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE
hi VertSplit guifg=#7c6f64 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Visual guifg=#ffeca3 guibg=#b16286 guisp=NONE gui=NONE cterm=NONE
hi VisualNOS guifg=NONE guibg=NONE guisp=NONE gui=bold,underline ctermfg=NONE ctermbg=NONE cterm=bold,underline
hi WarningMsg guifg=#ea6962 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi WildMenu guifg=#1d2021 guibg=#89b594 guisp=NONE gui=bold cterm=bold
hi Comment guifg=#7c6f64 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Constant guifg=#d3869b guibg=NONE guisp=NONE gui=NONE cterm=NONE
@ -103,6 +102,7 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi PreProc guifg=#89b594 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Special guifg=#f7a583 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Statement guifg=#f7a583 guibg=NONE guisp=NONE gui=bold cterm=bold
hi Todo guifg=#1d2021 guibg=#f7a583 guisp=NONE gui=bold cterm=bold
hi Type guifg=#ffeca3 guibg=NONE guisp=NONE gui=bold cterm=bold
hi Underlined guifg=#458588 guibg=NONE guisp=NONE gui=underline cterm=underline
hi! link lCursor Cursor
@ -110,17 +110,17 @@ if (has('termguicolors') && &termguicolors) || has('gui_running')
hi ToolbarButton guifg=#1d2021 guibg=#7c6f64 guisp=NONE gui=bold cterm=bold
hi StatusLine guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE
hi StatusLineTerm guifg=#1d2021 guibg=#89b594 guisp=NONE gui=bold cterm=bold
hi StatusLineNC guifg=#7c6f64 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE
hi Buffer guifg=#89b594 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE
hi StatusLineNC guifg=#7c6f64 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Buffer guifg=#89b594 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi NormalMode guifg=#1d2021 guibg=#89b594 guisp=NONE gui=bold cterm=bold
hi VisualMode guifg=#1d2021 guibg=#d3869b guisp=NONE gui=bold cterm=bold
hi InsertMode guifg=#1d2021 guibg=#ace5d7 guisp=NONE gui=bold cterm=bold
hi ReplaceMode guifg=#1d2021 guibg=#ea6962 guisp=NONE gui=bold cterm=bold
hi CommandMode guifg=#ebdbb2 guibg=#1d2021 guisp=NONE gui=bold cterm=bold
hi CommandMode guifg=#ebdbb2 guibg=NONE guisp=NONE gui=bold cterm=bold
hi File guifg=#ebdbb2 guibg=#373737 guisp=NONE gui=NONE cterm=NONE
hi FileType guifg=#7cafa3 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE
hi FileType guifg=#7cafa3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Percent guifg=#7c6f64 guibg=NONE guisp=NONE gui=NONE cterm=NONE
hi Column guifg=#7cafa3 guibg=#1d2021 guisp=NONE gui=NONE cterm=NONE
hi Column guifg=#7cafa3 guibg=NONE guisp=NONE gui=NONE cterm=NONE
unlet s:t_Co
finish
endif
@ -134,41 +134,40 @@ if s:t_Co >= 256
hi CursorLineNr ctermfg=216 ctermbg=NONE cterm=NONE
hi Pmenu ctermfg=229 cterm=NONE
hi PmenuSel ctermbg=71 cterm=bold
hi PmenuSbar ctermbg=243 cterm=NONE
hi PmenuThumb ctermfg=229 ctermbg=NONE cterm=NONE
hi SpellBad ctermfg=203 ctermbg=NONE cterm=underline
hi SpellCap ctermfg=24 ctermbg=NONE cterm=NONE
hi SpellLocal ctermfg=81 ctermbg=NONE cterm=NONE
hi SpellRare ctermfg=216 ctermbg=NONE cterm=NONE
hi TabLine ctermfg=229 ctermbg=243 cterm=underline
hi Todo ctermbg=216 cterm=bold
hi ColorColumn ctermfg=NONE ctermbg=160 cterm=NONE
hi Conceal ctermfg=243 ctermbg=243 cterm=NONE
hi DiffAdd ctermbg=2 cterm=NONE
hi DiffChange ctermbg=216 cterm=NONE
hi DiffDelete ctermbg=160 cterm=NONE
hi DiffText ctermbg=203 cterm=bold
hi Directory ctermfg=181 ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=230 ctermbg=160 cterm=bold
hi FoldColumn ctermfg=216 ctermbg=24 cterm=NONE
hi Folded ctermfg=216 ctermbg=24 cterm=NONE
hi IncSearch ctermfg=NONE ctermbg=NONE cterm=reverse
hi LineNr ctermfg=243 ctermbg=NONE cterm=NONE
hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
hi ErrorMsg ctermfg=230 ctermbg=160 cterm=bold
hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
hi MoreMsg ctermfg=71 ctermbg=NONE cterm=NONE
hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE
hi NonText ctermfg=24 ctermbg=NONE cterm=NONE
hi PmenuSbar ctermbg=243 cterm=NONE
hi PmenuThumb ctermfg=229 cterm=NONE
hi Question ctermfg=71 ctermbg=NONE cterm=NONE
hi Search ctermbg=216 cterm=NONE
hi ColorColumn ctermfg=NONE ctermbg=160 cterm=NONE
hi FoldColumn ctermfg=216 ctermbg=24 cterm=NONE
hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
hi SpecialKey ctermfg=71 ctermbg=NONE cterm=NONE
hi TabLine ctermfg=229 ctermbg=243 cterm=underline
hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold
hi Title ctermfg=216 ctermbg=NONE cterm=NONE
hi VertSplit ctermfg=243 cterm=NONE
hi VertSplit ctermfg=243 ctermbg=NONE cterm=NONE
hi Visual ctermfg=230 ctermbg=138 cterm=NONE
hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
hi WarningMsg ctermfg=203 ctermbg=NONE cterm=NONE
hi WildMenu ctermbg=71 cterm=bold
hi Comment ctermfg=243 ctermbg=NONE cterm=NONE
hi Constant ctermfg=181 ctermbg=NONE cterm=NONE
@ -178,6 +177,7 @@ if s:t_Co >= 256
hi PreProc ctermfg=71 ctermbg=NONE cterm=NONE
hi Special ctermfg=216 ctermbg=NONE cterm=NONE
hi Statement ctermfg=216 ctermbg=NONE cterm=NONE
hi Todo ctermbg=216 cterm=bold
hi Type ctermfg=230 ctermbg=NONE cterm=NONE
hi Underlined ctermfg=24 ctermbg=NONE cterm=underline
hi! link lCursor Cursor
@ -185,17 +185,17 @@ if s:t_Co >= 256
hi ToolbarButton ctermbg=243 cterm=bold
hi StatusLine ctermfg=NONE ctermbg=NONE cterm=NONE
hi StatusLineTerm ctermbg=71 cterm=bold
hi StatusLineNC ctermfg=243 cterm=NONE
hi Buffer ctermfg=71 cterm=NONE
hi StatusLineNC ctermfg=243 ctermbg=NONE cterm=NONE
hi Buffer ctermfg=71 ctermbg=NONE cterm=NONE
hi NormalMode ctermbg=71 cterm=bold
hi VisualMode ctermbg=181 cterm=bold
hi InsertMode ctermbg=81 cterm=bold
hi ReplaceMode ctermbg=203 cterm=bold
hi CommandMode ctermfg=229 cterm=bold
hi CommandMode ctermfg=229 ctermbg=NONE cterm=bold
hi File ctermfg=229 ctermbg=243 cterm=NONE
hi FileType ctermfg=30 cterm=NONE
hi FileType ctermfg=30 ctermbg=NONE cterm=NONE
hi Percent ctermfg=243 ctermbg=NONE cterm=NONE
hi Column ctermfg=30 cterm=NONE
hi Column ctermfg=30 ctermbg=NONE cterm=NONE
unlet s:t_Co
finish
endif
@ -209,41 +209,40 @@ if s:t_Co >= 8
hi CursorLineNr ctermfg=LightRed ctermbg=NONE cterm=NONE
hi Pmenu ctermfg=LightYellow ctermbg=Black cterm=NONE
hi PmenuSel ctermfg=Black ctermbg=Green cterm=bold
hi PmenuSbar ctermfg=Black ctermbg=Grey cterm=NONE
hi PmenuThumb ctermfg=LightYellow ctermbg=NONE cterm=NONE
hi SpellBad ctermfg=Red ctermbg=NONE cterm=underline
hi SpellCap ctermfg=DarkCyan ctermbg=NONE cterm=NONE
hi SpellLocal ctermfg=LightBlue ctermbg=NONE cterm=NONE
hi SpellRare ctermfg=LightRed ctermbg=NONE cterm=NONE
hi TabLine ctermfg=LightYellow ctermbg=Grey cterm=underline
hi Todo ctermfg=Black ctermbg=LightRed cterm=bold
hi ColorColumn ctermfg=NONE ctermbg=DarkRed cterm=NONE
hi Conceal ctermfg=Grey ctermbg=Grey cterm=NONE
hi DiffAdd ctermfg=Black ctermbg=DarkGreen cterm=NONE
hi DiffChange ctermfg=Black ctermbg=LightRed cterm=NONE
hi DiffDelete ctermfg=Black ctermbg=DarkRed cterm=NONE
hi DiffText ctermfg=Black ctermbg=Red cterm=bold
hi Directory ctermfg=Magenta ctermbg=NONE cterm=NONE
hi ErrorMsg ctermfg=White ctermbg=DarkRed cterm=bold
hi FoldColumn ctermfg=LightRed ctermbg=DarkBlue cterm=NONE
hi Folded ctermfg=LightRed ctermbg=DarkBlue cterm=NONE
hi IncSearch ctermfg=NONE ctermbg=NONE cterm=reverse
hi LineNr ctermfg=Grey ctermbg=NONE cterm=NONE
hi MatchParen ctermfg=NONE ctermbg=NONE cterm=reverse
hi ErrorMsg ctermfg=White ctermbg=DarkRed cterm=bold
hi ModeMsg ctermfg=NONE ctermbg=NONE cterm=bold
hi MoreMsg ctermfg=Green ctermbg=NONE cterm=NONE
hi WarningMsg ctermfg=Red ctermbg=NONE cterm=NONE
hi NonText ctermfg=DarkCyan ctermbg=NONE cterm=NONE
hi PmenuSbar ctermfg=Black ctermbg=Grey cterm=NONE
hi PmenuThumb ctermfg=LightYellow ctermbg=Black cterm=NONE
hi Question ctermfg=Green ctermbg=NONE cterm=NONE
hi Search ctermfg=Black ctermbg=LightRed cterm=NONE
hi ColorColumn ctermfg=NONE ctermbg=DarkRed cterm=NONE
hi FoldColumn ctermfg=LightRed ctermbg=DarkBlue cterm=NONE
hi SignColumn ctermfg=NONE ctermbg=NONE cterm=NONE
hi SpecialKey ctermfg=Green ctermbg=NONE cterm=NONE
hi TabLine ctermfg=LightYellow ctermbg=Grey cterm=underline
hi TabLineFill ctermfg=NONE ctermbg=NONE cterm=NONE
hi TabLineSel ctermfg=NONE ctermbg=NONE cterm=bold
hi Title ctermfg=LightRed ctermbg=NONE cterm=NONE
hi VertSplit ctermfg=Grey ctermbg=Black cterm=NONE
hi VertSplit ctermfg=Grey ctermbg=NONE cterm=NONE
hi Visual ctermfg=White ctermbg=DarkMagenta cterm=NONE
hi VisualNOS ctermfg=NONE ctermbg=NONE cterm=bold,underline
hi WarningMsg ctermfg=Red ctermbg=NONE cterm=NONE
hi WildMenu ctermfg=Black ctermbg=Green cterm=bold
hi Comment ctermfg=Grey ctermbg=NONE cterm=NONE
hi Constant ctermfg=Magenta ctermbg=NONE cterm=NONE
@ -253,6 +252,7 @@ if s:t_Co >= 8
hi PreProc ctermfg=Green ctermbg=NONE cterm=NONE
hi Special ctermfg=LightRed ctermbg=NONE cterm=NONE
hi Statement ctermfg=LightRed ctermbg=NONE cterm=NONE
hi Todo ctermfg=Black ctermbg=LightRed cterm=bold
hi Type ctermfg=White ctermbg=NONE cterm=NONE
hi Underlined ctermfg=DarkBlue ctermbg=NONE cterm=underline
hi! link lCursor Cursor
@ -260,17 +260,17 @@ if s:t_Co >= 8
hi ToolbarButton ctermfg=Black ctermbg=Grey cterm=bold
hi StatusLine ctermfg=NONE ctermbg=NONE cterm=NONE
hi StatusLineTerm ctermfg=Black ctermbg=Green cterm=bold
hi StatusLineNC ctermfg=Grey ctermbg=Black cterm=NONE
hi Buffer ctermfg=Green ctermbg=Black cterm=NONE
hi StatusLineNC ctermfg=Grey ctermbg=NONE cterm=NONE
hi Buffer ctermfg=Green ctermbg=NONE cterm=NONE
hi NormalMode ctermfg=Black ctermbg=Green cterm=bold
hi VisualMode ctermfg=Black ctermbg=Magenta cterm=bold
hi InsertMode ctermfg=Black ctermbg=LightBlue cterm=bold
hi ReplaceMode ctermfg=Black ctermbg=Red cterm=bold
hi CommandMode ctermfg=LightYellow ctermbg=Black cterm=bold
hi CommandMode ctermfg=LightYellow ctermbg=NONE cterm=bold
hi File ctermfg=LightYellow ctermbg=Grey cterm=NONE
hi FileType ctermfg=DarkCyan ctermbg=Black cterm=NONE
hi FileType ctermfg=DarkCyan ctermbg=NONE cterm=NONE
hi Percent ctermfg=Grey ctermbg=NONE cterm=NONE
hi Column ctermfg=DarkCyan ctermbg=Black cterm=NONE
hi Column ctermfg=DarkCyan ctermbg=NONE cterm=NONE
unlet s:t_Co
finish
endif

View File

@ -83,41 +83,40 @@ CursorColumn none darkgrey
CursorLineNr orange none g=bold
Pmenu white black
PmenuSel black green bold
PmenuSbar black grey
PmenuThumb white none
SpellBad red none underline
SpellCap blue none
SpellLocal cyan none
SpellRare orange none
TabLine white grey underline
Todo black orange bold
ColorColumn none darkred
Conceal grey grey
DiffAdd black darkgreen
DiffChange black orange
DiffDelete black darkred g=bold
DiffText black red bold
Directory magenta none
ErrorMsg yellow darkred bold
FoldColumn orange darkblue
Folded orange darkblue
IncSearch none none reverse
LineNr grey none
MatchParen none none reverse
ErrorMsg yellow darkred bold
ModeMsg none none bold
MoreMsg green none g=bold
WarningMsg red none
NonText blue none g=bold
PmenuSbar black grey
PmenuThumb white black
Question green none g=bold
Search black orange
ColorColumn none darkred
FoldColumn orange darkblue
SignColumn none none
SpecialKey green none
TabLine white grey underline
TabLineFill none none
TabLineSel none none bold
Title orange none g=bold
VertSplit grey black
VertSplit grey none
Visual yellow darkmagenta
VisualNOS none none underline,bold
WarningMsg red none
WildMenu black green bold
# Other conventional group names (see `:help group-name`)
Comment grey none
@ -128,6 +127,7 @@ Ignore black none
PreProc green none
Special orange none
Statement orange none g=bold
Todo black orange bold
Type yellow none g=bold
Underlined darkblue none underline
# See `:help lCursor`
@ -140,14 +140,14 @@ ToolbarButton black grey bold
# Statusline
StatusLine none none
StatusLineTerm black green bold
StatusLineNC grey black
Buffer green black
StatusLineNC grey none
Buffer green none
NormalMode black green bold
VisualMode black magenta bold
InsertMode black cyan bold
ReplaceMode black red bold
CommandMode white black bold
CommandMode white none bold
File white darkgrey
FileType darkcyan black
FileType darkcyan none
Percent grey none
Column darkcyan black
Column darkcyan none