commit 282cf6405a68c65aa5d2091644674865ad382288
parent 5a8845f2c085f2fb75369db35a0f5982f3d5dce6
Author: Alex Balgavy <a.balgavy@gmail.com>
Date: Tue, 12 May 2020 15:22:16 +0200
vim: colorschemes
Former-commit-id: 483031d14fde01c9907c704c1c33d01cdc924665
Diffstat:
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/vim/colors/jokull.schemer b/vim/colors/jokull.schemer
@@ -66,7 +66,6 @@ Tablinefill NONE, lightgrey
Tablinesel NONE, offwhite
Wildmenu ddarkblue, offwhite. bold
Linenr olive, NONE
-Preproc NONE
Vertsplit NONE
Todo justblue, justyellow
Nontext bluegrey
@@ -99,7 +98,7 @@ GitGutterChangeDelete offlightred, bg
" link group1,group2,... target group
link tabline tablinefill
link repeat,conditional,operator statement
-link define,macro,precondit include
+link define,macro,precondit,preproc include
link debug,special,specialchar,specialcomment,tag,number delimiter
link label,storageclass,typedef structure
link character constant
diff --git a/vim/colors/jokull.vim b/vim/colors/jokull.vim
@@ -22,7 +22,6 @@ hi Tablinefill guifg=NONE guibg=#d0d0d0 ctermfg=NONE ctermbg=252 cterm=NONE gui=
hi Tablinesel guifg=NONE guibg=#e5e5e5 ctermfg=NONE ctermbg=7 cterm=NONE gui=NONE
hi Wildmenu guifg=#005f87 guibg=#e5e5e5 ctermfg=24 ctermbg=7 cterm=bold gui=bold
hi Linenr guifg=#9b9b4c guibg=NONE ctermfg=101 ctermbg=NONE cterm=NONE gui=NONE
-hi Preproc guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE cterm=NONE gui=NONE
hi Vertsplit guifg=NONE guibg=NONE ctermfg=NONE ctermbg=NONE cterm=NONE gui=NONE
hi Todo guifg=#0000FF guibg=#FFFF00 ctermfg=21 ctermbg=11 cterm=NONE gui=NONE
hi Nontext guifg=#81A1C1 guibg=NONE ctermfg=109 ctermbg=NONE cterm=NONE gui=NONE
@@ -53,6 +52,7 @@ hi GitGutterChangeDelete guifg=#80537e guibg=#e4e4e4 ctermfg=96 ctermbg=254 cter
" Link definitions
hi! link precondit include
hi! link tag delimiter
+hi! link spellbad todo
hi! link spellocal string
hi! link conditional statement
hi! link markdowncode type
@@ -66,7 +66,7 @@ hi! link spellrare string
hi! link netrwMarkFile incsearch
hi! link markdownUrl string
hi! link error errormsg
-hi! link spellbad todo
+hi! link preproc include
hi! link number delimiter
hi! link define include
hi! link typedef structure
@@ -85,7 +85,7 @@ hi! link operator statement
hi! link vimwikilink type
hi! link specialchar delimiter
" Code to clear any groups that are not defined
-let s:DefinedColors=['precondit', 'tag', 'spellocal', 'conditional', 'markdowncode', 'netrwdir', 'netrwexe', 'tabline', 'mkdlink', 'signcolumn', 'spellcap', 'spellrare', 'netrwmarkfile', 'markdownurl', 'error', 'spellbad', 'number', 'define', 'typedef', 'storageclass', 'specialcomment', 'pmenu', 'macro', 'pmenusel', 'modemsg', 'character', 'repeat', 'debug', 'special', 'label', 'operator', 'vimwikilink', 'specialchar', 'normal', 'cursorline', 'string', 'identifier', 'function', 'statement', 'include', 'type', 'search', 'incsearch', 'folded', 'tablinefill', 'tablinesel', 'wildmenu', 'linenr', 'preproc', 'vertsplit', 'todo', 'nontext', 'statusline', 'statuslinenc', 'statuslinetermnc', 'statuslineterm', 'statuslinefile', 'statuslinenormmode', 'visual', 'title', 'matchparen', 'qffilename', 'delimiter', 'comment', 'errormsg', 'cursorlinenr', 'specialkey', 'constant', 'diffadd', 'diffdelete', 'diffchange', 'diftext', 'gitgutteradd', 'gitgutterchange', 'gitgutterdelete', 'gitgutterchangedelete']
+let s:DefinedColors=['precondit', 'tag', 'spellbad', 'spellocal', 'conditional', 'markdowncode', 'netrwdir', 'netrwexe', 'tabline', 'mkdlink', 'signcolumn', 'spellcap', 'spellrare', 'netrwmarkfile', 'markdownurl', 'error', 'preproc', 'number', 'define', 'typedef', 'storageclass', 'specialcomment', 'pmenu', 'macro', 'pmenusel', 'modemsg', 'character', 'repeat', 'debug', 'special', 'label', 'operator', 'vimwikilink', 'specialchar', 'normal', 'cursorline', 'string', 'identifier', 'function', 'statement', 'include', 'type', 'search', 'incsearch', 'folded', 'tablinefill', 'tablinesel', 'wildmenu', 'linenr', 'vertsplit', 'todo', 'nontext', 'statusline', 'statuslinenc', 'statuslinetermnc', 'statuslineterm', 'statuslinefile', 'statuslinenormmode', 'visual', 'title', 'matchparen', 'qffilename', 'delimiter', 'comment', 'errormsg', 'cursorlinenr', 'specialkey', 'constant', 'diffadd', 'diffdelete', 'diffchange', 'diftext', 'gitgutteradd', 'gitgutterchange', 'gitgutterdelete', 'gitgutterchangedelete']
function! s:ClearUndefinedColors(colors)
let undefined_groups = filter(a:colors->keys()->map('tolower(v:val)'), 'index(s:DefinedColors, tolower(v:val)) < 0')
call map(undefined_groups, "execute('highlight' . ' ' . v:val . ' ' . 'NONE')")
diff --git a/vim/colors/junipero.schemer b/vim/colors/junipero.schemer
@@ -44,7 +44,8 @@ ModeMsg #00AACC, NONE. NONE
MoreMsg #2e8b57, NONE. NONE
NonText #382920, bg. NONE
Normal text, bg
-StatusLineNormMode #ff8f00
+StatusLineFile #ff8f00
+StatusLineNormMode #666fff
Number #339aff, NONE. NONE
Operator #e8cdc0, bg. NONE
Pmenu #bdbdbd, #915623. NONE
diff --git a/vim/colors/junipero.vim b/vim/colors/junipero.vim
@@ -38,7 +38,8 @@ hi ModeMsg guifg=#00AACC guibg=NONE ctermfg=38 ctermbg=NONE cterm=NONE gui=NONE
hi MoreMsg guifg=#2e8b57 guibg=NONE ctermfg=29 ctermbg=NONE cterm=NONE gui=NONE
hi NonText guifg=#382920 guibg=#11121A ctermfg=1 ctermbg=0 cterm=NONE gui=NONE
hi Normal guifg=#969696 guibg=#11121A ctermfg=246 ctermbg=0 cterm=NONE gui=NONE
-hi StatusLineNormMode guifg=#ff8f00 guibg=NONE ctermfg=208 ctermbg=NONE cterm=NONE gui=NONE
+hi StatusLineFile guifg=#ff8f00 guibg=NONE ctermfg=208 ctermbg=NONE cterm=NONE gui=NONE
+hi StatusLineNormMode guifg=#666fff guibg=NONE ctermfg=12 ctermbg=NONE cterm=NONE gui=NONE
hi Number guifg=#339aff guibg=NONE ctermfg=12 ctermbg=NONE cterm=NONE gui=NONE
hi Operator guifg=#e8cdc0 guibg=#11121A ctermfg=187 ctermbg=0 cterm=NONE gui=NONE
hi Pmenu guifg=#bdbdbd guibg=#915623 ctermfg=250 ctermbg=94 cterm=NONE gui=NONE
@@ -97,7 +98,7 @@ hi! link SpellBad Todo
hi! link netrwDir LineNr
hi! link SpecialChar Delimiter
" Code to clear any groups that are not defined
-let s:DefinedColors=['precondit', 'tag', 'define', 'mkdlink', 'typedef', 'spellocal', 'vimwikilink', 'signcolumn', 'macro', 'tabline', 'character', 'debug', 'spellcap', 'special', 'tablinefill', 'spellrare', 'label', 'statuslinenc', 'adabegin', 'storageclass', 'specialcomment', 'netrwexe', 'adaend', 'conid', 'spellbad', 'netrwdir', 'specialchar', 'boolean', 'comment', 'conditional', 'constant', 'cursor', 'cursorlinenr', 'cursorline', 'delimiter', 'diffadd', 'diffchange', 'diffdelete', 'difftext', 'directory', 'error', 'errormsg', 'exception', 'float', 'foldcolumn', 'folded', 'function', 'identifier', 'ignore', 'incsearch', 'include', 'keyword', 'linenr', 'matchparen', 'modemsg', 'moremsg', 'nontext', 'normal', 'statuslinenormmode', 'number', 'operator', 'pmenu', 'pmenusbar', 'pmenusel', 'pmenuthumb', 'preproc', 'question', 'repeat', 'search', 'specialkey', 'statement', 'statusline', 'string', 'structure', 'tablinesel', 'title', 'todo', 'type', 'underlined', 'vertsplit', 'visual', 'visualnos', 'warningmsg', 'wildmenu', 'gitgutteradd', 'gitgutterchange', 'gitgutterdelete', 'gitgutterchangedelete']
+let s:DefinedColors=['precondit', 'tag', 'define', 'mkdlink', 'typedef', 'spellocal', 'vimwikilink', 'signcolumn', 'macro', 'tabline', 'character', 'debug', 'spellcap', 'special', 'tablinefill', 'spellrare', 'label', 'statuslinenc', 'adabegin', 'storageclass', 'specialcomment', 'netrwexe', 'adaend', 'conid', 'spellbad', 'netrwdir', 'specialchar', 'boolean', 'comment', 'conditional', 'constant', 'cursor', 'cursorlinenr', 'cursorline', 'delimiter', 'diffadd', 'diffchange', 'diffdelete', 'difftext', 'directory', 'error', 'errormsg', 'exception', 'float', 'foldcolumn', 'folded', 'function', 'identifier', 'ignore', 'incsearch', 'include', 'keyword', 'linenr', 'matchparen', 'modemsg', 'moremsg', 'nontext', 'normal', 'statuslinefile', 'statuslinenormmode', 'number', 'operator', 'pmenu', 'pmenusbar', 'pmenusel', 'pmenuthumb', 'preproc', 'question', 'repeat', 'search', 'specialkey', 'statement', 'statusline', 'string', 'structure', 'tablinesel', 'title', 'todo', 'type', 'underlined', 'vertsplit', 'visual', 'visualnos', 'warningmsg', 'wildmenu', 'gitgutteradd', 'gitgutterchange', 'gitgutterdelete', 'gitgutterchangedelete']
function! s:ClearUndefinedColors(colors)
let undefined_groups = filter(a:colors->keys()->map('tolower(v:val)'), 'index(s:DefinedColors, tolower(v:val)) < 0')
call map(undefined_groups, "execute('highlight' . ' ' . v:val . ' ' . 'NONE')")
