vim-monochrome

commit bb50522114cb3f35e32681981168242c2e8cd0d3
parent 795ea1ea4c6121710c42d5be066ceb8d80849080
Author: Jake Bauer <jbauer@paritybit.ca>
Date:   Fri, 26 Aug 2022 20:17:15 -0400

Fix issues with both colourschemes

Diffstat:
M
colors/monochrome-light.vim
 | 
16
++++++++--------
M
colors/monochrome.vim
 | 
20
++++++++++----------

2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/colors/monochrome-light.vim b/colors/monochrome-light.vim
@@ -20,9 +20,9 @@ let s:yellow     = ['#B26818', 3]
 let s:cyan       = ['#18B2B2', 6]
 let s:white      = ['#EEEEEE', 255]
 let s:accent     = ['#6C6C6C', 242]
-let s:cursorline = ['#E4E4E4', 254]
+let s:cursorline = ['#DADADA', 253]
 let s:comment    = ['#585858', 240]
-let s:faded      = ['#BCBCBC', 250]
+let s:faded      = ['#BCBCBC', 252]
 
 let s:default_fg = s:black
 let s:default_bg = s:white
@@ -50,7 +50,7 @@ function! s:hi(...)
 		call add(cmd, 'ctermfg='.fg[1])
 	endif
 
-	if bg != s:default_lst && bg != s:default_bg
+	if bg != s:default_lst
 		call add(cmd, 'guibg='.bg[0])
 		call add(cmd, 'ctermbg='.bg[1])
 	endif
@@ -66,14 +66,14 @@ endfunction
 
 
 " --- Vim interface ------------------------------------------------------------
-call s:hi('Normal')
+call s:hi('Normal', s:black, s:white, s:none)
 call s:hi('Cursor', s:white, s:black)
 call s:hi('CursorLine', s:black, s:cursorline, s:none)
 call s:hi('CursorLineNr', s:black, s:default_bg, s:bold)
-call s:hi('ColorColumn', s:accent, s:faded)
+call s:hi('ColorColumn', s:black, s:faded)
 call s:hi('Search', s:black, s:faded)
-call s:hi('Visual', s:white, s:accent)
-call s:hi('ErrorMsg', s:black, s:red)
+call s:hi('Visual', s:black, s:faded)
+call s:hi('ErrorMsg', s:red, s:default_bg)
 
 " Tildes at the bottom of a buffer, etc.
 call s:hi('NonText', s:faded)
@@ -83,7 +83,7 @@ call s:hi('FoldColumn', s:faded)
 call s:hi('Folded')
 
 " Line numbers gutter.
-call s:hi('LineNr', s:black)
+call s:hi('LineNr', s:black, s:faded)
 
 " Small arrow used for tabs.
 call s:hi('SpecialKey', s:accent, s:default_bg, s:bold)
diff --git a/colors/monochrome.vim b/colors/monochrome.vim
@@ -13,16 +13,16 @@ endif
 
 let g:colors_name = 'monochrome'
 
-let s:black      = ['#121212', 233]
+let s:black      = ['#080808', 0]
 let s:red        = ['#994444', 1]
 let s:green      = ['#449944', 2]
 let s:yellow     = ['#999444', 3]
 let s:cyan       = ['#449999', 6]
-let s:white      = ['#DDDDDD', 7]
+let s:white      = ['#FFFFFF', 15]
 let s:accent     = ['#5F5F5F', 59]
-let s:cursorline = ['#262626', 235]
+let s:cursorline = ['#4E4E4E', 239]
 let s:comment    = ['#6C6C6C', 242]
-let s:faded      = ['#A8A8A8', 248]
+let s:faded      = ['#444444', 238]
 
 let s:default_fg = s:white
 let s:default_bg = s:black
@@ -50,7 +50,7 @@ function! s:hi(...)
 		call add(cmd, 'ctermfg='.fg[1])
 	endif
 
-	if bg != s:default_lst && bg != s:default_bg
+	if bg != s:default_lst
 		call add(cmd, 'guibg='.bg[0])
 		call add(cmd, 'ctermbg='.bg[1])
 	endif
@@ -66,14 +66,14 @@ endfunction
 
 
 " --- Vim interface ------------------------------------------------------------
-call s:hi('Normal')
+call s:hi('Normal', s:white, s:black)
 call s:hi('Cursor', s:black, s:white)
-call s:hi('CursorLine', s:default_lst, s:cursorline, s:none)
+call s:hi('CursorLine', s:white, s:cursorline, s:none)
 call s:hi('CursorLineNr', s:white, s:default_bg, s:bold)
-call s:hi('ColorColumn', s:default_lst, s:cursorline)
+call s:hi('ColorColumn', s:white, s:faded)
 call s:hi('Search', s:white, s:accent)
 call s:hi('Visual', s:white, s:accent)
-call s:hi('ErrorMsg', s:white, s:red)
+call s:hi('ErrorMsg', s:red, s:default_bg)
 
 " Tildes at the bottom of a buffer, etc.
 call s:hi('NonText', s:faded)
@@ -83,7 +83,7 @@ call s:hi('FoldColumn', s:faded)
 call s:hi('Folded')
 
 " Line numbers gutter.
-call s:hi('LineNr', s:faded)
+call s:hi('LineNr', s:accent)
 
 " Small arrow used for tabs.
 call s:hi('SpecialKey', s:accent, s:default_bg, s:bold)