commit 6f879932ab1a53019ad06db66748345dddfb4973
parent 4397d87106ee20511545c5438acfbc6ed8e9a459
Author: Alex Balgavy <a.balgavy@gmail.com>
Date: Thu, 9 Apr 2020 16:38:33 +0200
vim: colorscheme change for statusbars
Former-commit-id: 9da764e4ef19f9206179ee7ae9c860492dee2cc5
Diffstat:
2 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/vim/colors/jokull.schemer b/vim/colors/jokull.schemer
@@ -14,46 +14,58 @@ palette:
justyellow #FFFF00,
softred #ff949b,
darkergreen #009051,
+ midgreen #99FF77,
orange #ff9900.
-" group fg_color, bg_color attribute
-Normal text, bg
-Cursorline NONE, gray
-String darkergreen. italic
-Identifier #112d4e
-Function #0096ff. bold
-Statement #0050a0
-Include #2696bf. bold
-Type darkblue
-Search NONE, lightgreen
-Incsearch NONE, #b7d1b0. bold
-Folded #236dff, gray
-Tablinefill NONE, gray
-Tablinesel NONE, offwhite
-Wildmenu darkblue, offwhite. bold
-Linenr #9b9b4c, NONE
-Preproc NONE
-Vertsplit NONE
-Todo justblue, justyellow
-Nontext #81A1C1
-StatusLine NONE, #7abecd
-Statuslinenc NONE, lightblue
-Visual NONE, #a8caff
-Title #225555. bold
-Matchparen lightgreen, lightblue
-QfFileName #0076ff
-Delimiter #5f5f00
-Comment #5f5f5f. italic
-ErrorMsg text, softred. bold
-Cursorlinenr orange, NONE. bold
-SpecialKey justblue, NONE. bold
-Constant orange, NONE
+" group fg_color, bg_color. attribute
+Normal text, bg
+Cursorline NONE, gray
+String darkergreen. italic
+Identifier #112d4e
+Function #0096ff. bold
+Statement #0050a0
+Include #2696bf. bold
+Type darkblue
+Search NONE, lightgreen
+Incsearch NONE, #b7d1b0. bold
+Folded #236dff, gray
+Tablinefill NONE, gray
+Tablinesel NONE, offwhite
+Wildmenu darkblue, offwhite. bold
+Linenr #9b9b4c, NONE
+Preproc NONE
+Vertsplit NONE
+Todo justblue, justyellow
+Nontext #81A1C1
+StatusLine NONE, #4aaecd
+Statuslinenc NONE, lightblue
+StatusLineTermNC NONE, midgreen
+StatusLineTerm NONE, darkergreen
+Visual NONE, #a8caff
+Title #225555. bold
+Matchparen lightgreen, lightblue
+QfFileName #0076ff
+Delimiter #5f5f00
+Comment #5f5f5f. italic
+ErrorMsg text, softred. bold
+Cursorlinenr orange, NONE. bold
+SpecialKey justblue, NONE. bold
+Constant orange, NONE.
+Diffadd NONE, #a5ffa5
+Diffdelete NONE, #ffa5a5
+Diffchange text, #c0beff
+Diftext NONE, #a0aeff. bold
+GitGutterAdd #007822, bg
+GitGutterChange #8e830e, bg
+GitGutterDelete #6e032e, bg
+GitGutterChangeDelete #80537e, bg
+
" link group1,group2,... target group
link tabline tablinefill
link repeat,conditional,operator statement
link define,macro,precondit include
-link debug,special,specialchar,specialcomment,tag,number delimiter
+link debug,special,specialchar,specialcomment,tag,number delimiter
link label,storageclass,typedef structure
link character constant
link signcolumn linenr
@@ -66,12 +78,3 @@ link markdowncode,mkdlink,vimwikilink type
link pmenu statuslinenc
link pmenusel statusline
link error errormsg
-
-Diffadd NONE, #a5ffa5
-Diffdelete NONE, #ffa5a5
-Diffchange text, #c0beff
-Diftext NONE, #a0aeff. bold
-GitGutterAdd #007822, bg
-GitGutterChange #8e830e, bg
-GitGutterDelete #6e032e, bg
-GitGutterChangeDelete #80537e, bg
diff --git a/vim/colors/jokull.vim b/vim/colors/jokull.vim
@@ -26,8 +26,10 @@ 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
-hi StatusLine guifg=NONE guibg=#7abecd ctermfg=NONE ctermbg=110 cterm=NONE gui=NONE
+hi StatusLine guifg=NONE guibg=#4aaecd ctermfg=NONE ctermbg=74 cterm=NONE gui=NONE
hi Statuslinenc guifg=NONE guibg=#a8dbfd ctermfg=NONE ctermbg=153 cterm=NONE gui=NONE
+hi StatusLineTermNC guifg=NONE guibg=#99FF77 ctermfg=NONE ctermbg=120 cterm=NONE gui=NONE
+hi StatusLineTerm guifg=NONE guibg=#009051 ctermfg=NONE ctermbg=29 cterm=NONE gui=NONE
hi Visual guifg=NONE guibg=#a8caff ctermfg=NONE ctermbg=153 cterm=NONE gui=NONE
hi Title guifg=#225555 guibg=NONE ctermfg=23 ctermbg=NONE cterm=bold gui=bold
hi Matchparen guifg=#d7f1e0 guibg=#a8dbfd ctermfg=194 ctermbg=153 cterm=NONE gui=NONE
@@ -81,7 +83,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', 'visual', 'title', 'matchparen', 'qffilename', 'delimiter', 'comment', 'errormsg', 'cursorlinenr', 'specialkey', 'constant', 'diffadd', 'diffdelete', 'diffchange', 'diftext', 'gitgutteradd', 'gitgutterchange', 'gitgutterdelete', 'gitgutterchangedelete']
+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', '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')")
