dotfiles

commit 741a76c092aabc552d78374af74f1f575a904916
parent ed0cf4a876c899f8c32643716ae3274e9f9bcc9f
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Thu, 12 Mar 2020 18:25:46 +0100

vim: colorscheme updates

Former-commit-id: 458637e6ace76d36701a4c36a4393d2a6cbba0a5
Diffstat:
M
vim/colors/jokull.schemer
 | 
12
+++++++++---
M
vim/colors/jokull.vim
 | 
8
++++++--

2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/vim/colors/jokull.schemer b/vim/colors/jokull.schemer
@@ -12,12 +12,13 @@ palette:
   offwhite #e5e5e5,
   justblue #0000FF,
   justyellow #FFFF00,
-  softred #ff949b.
+  softred #ff949b,
+  darkergreen #009051.
 
 " group       fg_color, bg_color         attribute
 Normal         text, bg
 Cursorline     NONE, gray
-String         #009051.                  italic
+String         darkergreen.              italic
 Identifier     #112d4e
 Function       #0096ff.                  bold
 Statement      #0050a0
@@ -43,12 +44,13 @@ QfFileName     #0076ff
 Delimiter      #5f5f00
 Comment        #5f5f5f.                  italic
 ErrorMsg       text, softred.            bold
+Cursorlinenr   #ff9900, NONE.            bold
 
 " link    group1,group2,...                                                 target group
 link     tabline                                                            tablinefill
 link     repeat,conditional,operator                                        statement
 link     define,macro,precondit                                             include
-link     debug,special,specialchar,specialcomment,tag,cursorlinenr,number   delimiter
+link     debug,special,specialchar,specialcomment,tag,number   delimiter
 link     label,storageclass,typedef                                         structure
 link     character                                                          constant
 link     signcolumn                                                         linenr
@@ -66,3 +68,7 @@ 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
@@ -35,10 +35,15 @@ hi QfFileName guifg=#0076ff guibg=NONE ctermfg=33 ctermbg=NONE cterm=NONE gui=NO
 hi Delimiter guifg=#5f5f00 guibg=NONE ctermfg=58 ctermbg=NONE cterm=NONE gui=NONE
 hi Comment guifg=#5f5f5f guibg=NONE ctermfg=59 ctermbg=NONE cterm=italic gui=italic
 hi ErrorMsg guifg=#2c2625 guibg=#ff949b ctermfg=0 ctermbg=210 cterm=bold gui=bold
+hi Cursorlinenr guifg=#ff9900 guibg=NONE ctermfg=208 ctermbg=NONE cterm=bold gui=bold
 hi Diffadd guifg=NONE guibg=#a5ffa5 ctermfg=NONE ctermbg=157 cterm=NONE gui=NONE
 hi Diffdelete guifg=NONE guibg=#ffa5a5 ctermfg=NONE ctermbg=217 cterm=NONE gui=NONE
 hi Diffchange guifg=#2c2625 guibg=#c0beff ctermfg=0 ctermbg=147 cterm=NONE gui=NONE
 hi Diftext guifg=NONE guibg=#a0aeff ctermfg=NONE ctermbg=147 cterm=bold gui=bold
+hi GitGutterAdd guifg=#007822 guibg=#e4e4e4 ctermfg=28 ctermbg=254 cterm=NONE gui=NONE
+hi GitGutterChange guifg=#8e830e guibg=#e4e4e4 ctermfg=100 ctermbg=254 cterm=NONE gui=NONE
+hi GitGutterDelete guifg=#6e032e guibg=#e4e4e4 ctermfg=52 ctermbg=254 cterm=NONE gui=NONE
+hi GitGutterChangeDelete guifg=#80537e guibg=#e4e4e4 ctermfg=96 ctermbg=254 cterm=NONE gui=NONE
 " Link definitions
 hi! link precondit include
 hi! link tag delimiter
@@ -67,7 +72,6 @@ hi! link pmenusel statusline
 hi! link modemsg string
 hi! link character constant
 hi! link repeat statement
-hi! link cursorlinenr delimiter
 hi! link debug delimiter
 hi! link special delimiter
 hi! link label structure
@@ -75,7 +79,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', 'cursorlinenr', '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', 'diffadd', 'diffdelete', 'diffchange', 'diftext']
+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', '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')")