Compare commits

..

1 Commits

Author SHA1 Message Date
Josh Dick
68dca198f2 Fix terminal color consistency, remove redundant terminal colors (#338)
Some checks failed
Validate Templates / build (16.x) (push) Has been cancelled
2025-09-02 09:36:07 -04:00
2 changed files with 5 additions and 27 deletions

View File

@@ -9,7 +9,6 @@ if get(g:, 'onedark_termcolors', 256) == 16
let s:term_red = s:colors.red.cterm16
let s:term_green = s:colors.green.cterm16
let s:term_yellow = s:colors.yellow.cterm16
let s:term_dark_yellow = s:colors.dark_yellow.cterm16
let s:term_blue = s:colors.blue.cterm16
let s:term_purple = s:colors.purple.cterm16
let s:term_white = s:colors.white.cterm16
@@ -19,7 +18,6 @@ else
let s:term_red = s:colors.red.cterm
let s:term_green = s:colors.green.cterm
let s:term_yellow = s:colors.yellow.cterm
let s:term_dark_yellow = s:colors.dark_yellow.cterm
let s:term_blue = s:colors.blue.cterm
let s:term_purple = s:colors.purple.cterm
let s:term_white = s:colors.white.cterm
@@ -30,14 +28,13 @@ endif
let s:red = [ s:colors.red.gui, s:term_red ]
let s:green = [ s:colors.green.gui, s:term_green ]
let s:yellow = [ s:colors.yellow.gui, s:term_yellow ]
let s:dark_yellow = [ s:colors.dark_yellow.gui, s:term_dark_yellow ]
let s:blue = [ s:colors.blue.gui, s:term_blue ]
let s:purple = [ s:colors.purple.gui, s:term_purple ]
let s:white = [ s:colors.white.gui, s:term_white ]
let s:cursor_grey = [ s:colors.cursor_grey.gui, s:term_cursor_grey ]
let s:visual_grey = [ s:colors.visual_grey.gui, s:term_visual_grey ]
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}, 'command': {}}
let s:p = {'normal': {}, 'inactive': {}, 'insert': {}, 'replace': {}, 'visual': {}, 'tabline': {}}
let s:p.normal.left = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ]
let s:p.normal.right = [ [ s:cursor_grey, s:green ], [ s:white, s:visual_grey ] ]
let s:p.inactive.left = [ [ s:white, s:visual_grey ], [ s:white, s:visual_grey ] ]
@@ -56,8 +53,6 @@ let s:p.tabline.middle = [ [ s:white, s:cursor_grey ] ]
let s:p.tabline.right = [ [ s:white, s:visual_grey ] ]
let s:p.normal.error = [ [ s:cursor_grey, s:red ] ]
let s:p.normal.warning = [ [ s:cursor_grey, s:yellow ] ]
let s:p.command.left = [ [ s:cursor_grey, s:dark_yellow ], [ s:white, s:visual_grey ] ]
let s:p.command.right = [ [ s:cursor_grey, s:dark_yellow ], [ s:white, s:visual_grey ] ]
let g:lightline#colorscheme#onedark#palette = lightline#colorscheme#flatten(s:p)

View File

@@ -162,29 +162,12 @@ let s:vertsplit = s:colors.vertsplit
" Terminal Colors {{{
if has('nvim')
let g:terminal_color_0 = s:black.gui
let g:terminal_color_1 = s:red.gui
let g:terminal_color_2 = s:green.gui
let g:terminal_color_3 = s:yellow.gui
let g:terminal_color_4 = s:blue.gui
let g:terminal_color_5 = s:purple.gui
let g:terminal_color_6 = s:cyan.gui
let g:terminal_color_7 = s:comment_grey.gui
let g:terminal_color_8 = s:visual_grey.gui
let g:terminal_color_9 = s:red.gui
let g:terminal_color_10 = s:green.gui
let g:terminal_color_11 = s:yellow.gui
let g:terminal_color_12 = s:blue.gui
let g:terminal_color_13 = s:purple.gui
let g:terminal_color_14 = s:cyan.gui
let g:terminal_color_15 = s:white.gui
else
if !has('nvim')
let g:terminal_ansi_colors = [
\ s:black.gui, s:red.gui, s:green.gui, s:yellow.gui,
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui,
\ s:visual_grey.gui, s:red.gui, s:green.gui, s:yellow.gui,
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:white.gui,
\ s:visual_grey.gui, s:dark_red.gui, s:green.gui, s:dark_yellow.gui,
\ s:blue.gui, s:purple.gui, s:cyan.gui, s:comment_grey.gui
\]
endif