From 071d8b5555637b7b2d888c69471987c7fb967c91 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Sun, 6 Aug 2023 13:58:53 -0400 Subject: [PATCH] Fix/vim UI colors (#37) * fix: Define more colors for Vim UI elements * fix: Fix pmenusel color --- colors/witchhazel-hypercolor.vim | 74 ++++++++++++++++++++++++++------ colors/witchhazel.vim | 67 ++++++++++++++++++++++++----- 2 files changed, 118 insertions(+), 23 deletions(-) diff --git a/colors/witchhazel-hypercolor.vim b/colors/witchhazel-hypercolor.vim index 72780fa..dc68097 100644 --- a/colors/witchhazel-hypercolor.vim +++ b/colors/witchhazel-hypercolor.vim @@ -12,17 +12,17 @@ if version > 580 endif let s:lightgrey = "#BFBFBF" -let s:linen = "#F8F8F2" +let s:linen = "#F8F8F0" let s:mint = "#81FFBE" let s:pink = "#FFB8D1" let s:brick = "#DC7070" let s:clay = "#894E63" let s:rouge = "#960050" let s:turquoise = "#81EEFF" -let s:sunflower = "#FFF352" +let s:sunflower = "#FFF9A3" let s:lilac = "#DCC8FF" -let s:darklilac = "#C5A3FF" +let s:darklilac = "#AE81FF" let s:amethyst = "#131218" let s:purps = "#282634" let s:shadow = "#3B364E" @@ -44,15 +44,69 @@ fun X(group, fg, bg, attr) endfun "set t_Co=256 -let g:colors_name="witchhazel" +let g:colors_name="witchhazel-hypercolor" call X("Normal", s:linen, s:purps, "") +call X("CursorColumn", "", s:amethyst, "") +call X("Conceal", "", "", "") +call X("CursorIM", "", "", "") +call X("CursorLineNr", s:lightgrey, s:amethyst, "") +call X("Directory", s:turquoise, "", "") +call X("DiffAdd", s:mint, s:linen, "reverse") +call X("DiffDelete", s:rouge, s:linen, "reverse") +call X("DiffChange", s:rouge, s:linen, "reverse") +call X("DiffText", s:rouge, s:linen, "reverse") +hi link EndOfBuffer NonText +call X("ErrorMsg", s:linen, s:brick, "") +call X("FoldColumn", s:sunflower, s:purps, "") +call X("Folded", s:lightgrey, s:shadow, "") +call X("Ignore", s:lightgrey, "", "") +call X("IncSearch", s:sunflower, "", "reverse") +call X("InfoPopup", s:darklilac, s:shadow, "") +call X("LineNr", s:lightgrey, "", "") +call X("MatchParen", s:turquoise, s:purps, "") +call X("ModeMsg", s:mint, "", "") +call X("MoreMsg", s:mint, "", "") call X("NonText", s:lightgrey, "", "") +call X("NvimInternalError", s:rouge, s:rouge, "") +call X("PMenu", s:darklilac, s:shadow, "") +call X("PMenuSbar", s:darklilac, s:shadow, "") +call X("PMenuSel", s:linen, s:darklilac, "") +call X("PMenuThumb", s:darklilac, s:shadow, "") +call X("Question", s:mint, "", "") +call X("RedrawDebugClear", s:amethyst, s:sunflower, "") +call X("RedrawDebugComposed", s:amethyst, s:mint, "") +call X("RedrawDebugRecompose", s:amethyst, s:rouge, "") +call X("SignColumn", s:shadow, s:purps, "") +call X("SpecialKey", s:turquoise, "", "") +call X("SpellBad", s:brick, s:linen, "reverse") +call X("SpellCap", s:brick, s:linen, "reverse") +call X("SpellLocal", s:brick, s:linen, "reverse") +call X("SpellRare", s:brick, s:linen, "reverse") +call X("StatusLine", s:darklilac, s:shadow, "reverse") +call X("StatusLineNC", s:darklilac, s:shadow, "reverse,underline") +call X("StatusLineTerm", s:mint, "", "reverse") +call X("StatusLineTermNC", s:mint, "", "reverse") +call X("TabLine", s:lightgrey, s:shadow, "") +call X("TabLineFill", s:amethyst, "", "") +call X("TabLineSel", s:linen, s:darklilac, "") +call X("Title", s:rouge, "", "") +call X("ToolbarButton", s:darklilac, s:shadow, "") +call X("ToolbarLine", "", s:lightgrey, "") +call X("VertSplit", s:purps, s:shadow, "reverse") +call X("VisualNOS", s:lightgrey, "", "") +call X("WarningMsg", s:rouge, "", "") +call X("WildMenu", s:mint, s:lightgrey, "") call X("Character", s:other, "", "") call X("Number", s:darklilac, "", "") call X("String", s:turquoise, "", "italic") call X("Constant", s:other, "", "") +call X("PreProc", s:lilac, "", "") +call X("Include", s:lilac, "", "") +call X("Macro", s:lilac, "", "") +call X("PreCondit", s:lilac, "", "") + call X("Comment", s:lightgrey, "", "") call X("Function", s:lilac, "", "") call X("Structure", s:lilac, "", "") @@ -69,15 +123,9 @@ call X("Special", s:sunflower, "", "") call X("Cursor", "", s:linen, "") call X("CursorLine", "", s:amethyst, "") call X("ColorColumn", "", s:shadow, "") -call X("Search", s:linen, s:amethyst, "") -call X("Visual", s:purps, s:amethyst, "") +call X("Search", s:sunflower, s:shadow, "reverse") +call X("Visual", "", s:amethyst, "") call X("Todo", s:brick, s:purps, "bold") -call X("Error", s:rouge, s:midnight, "") +call X("Error", s:brick, s:linen, "reverse") call X("pythonSpaceError", "", s:clay, "") - -"hi def link pythonDecoratorName Define -"hi link Conditional Keyword -"hi link Repeat Keyword - -"hi link cType Keyword diff --git a/colors/witchhazel.vim b/colors/witchhazel.vim index 8431dc9..cff3613 100644 --- a/colors/witchhazel.vim +++ b/colors/witchhazel.vim @@ -45,13 +45,67 @@ endfun "set t_Co=256 let g:colors_name="witchhazel" call X("Normal", s:linen, s:purps, "") +call X("CursorColumn", "", s:amethyst, "") +call X("Conceal", "", "", "") +call X("CursorIM", "", "", "") +call X("CursorLineNr", s:lightgrey, s:amethyst, "") +call X("Directory", s:turquoise, "", "") +call X("DiffAdd", s:mint, s:linen, "reverse") +call X("DiffDelete", s:rouge, s:linen, "reverse") +call X("DiffChange", s:rouge, s:linen, "reverse") +call X("DiffText", s:rouge, s:linen, "reverse") +hi link EndOfBuffer NonText +call X("ErrorMsg", s:linen, s:brick, "") +call X("FoldColumn", s:sunflower, s:purps, "") +call X("Folded", s:lightgrey, s:shadow, "") +call X("Ignore", s:clay, "", "") +call X("IncSearch", s:sunflower, "", "reverse") +call X("InfoPopup", s:darklilac, s:shadow, "") +call X("LineNr", s:lightgrey, "", "") +call X("MatchParen", s:turquoise, s:purps, "") +call X("ModeMsg", s:mint, "", "") +call X("MoreMsg", s:mint, "", "") call X("NonText", s:lightgrey, "", "") +call X("NvimInternalError", s:rouge, s:rouge, "") +call X("PMenu", s:darklilac, s:shadow, "") +call X("PMenuSbar", s:darklilac, s:shadow, "") +call X("PMenuSel", s:linen, s:darklilac, "") +call X("PMenuThumb", s:darklilac, s:shadow, "") +call X("Question", s:mint, "", "") +call X("RedrawDebugClear", s:amethyst, s:sunflower, "") +call X("RedrawDebugComposed", s:amethyst, s:mint, "") +call X("RedrawDebugRecompose", s:amethyst, s:rouge, "") +call X("SignColumn", s:shadow, s:purps, "") +call X("SpecialKey", s:turquoise, "", "") +call X("SpellBad", s:brick, s:linen, "reverse") +call X("SpellCap", s:brick, s:linen, "reverse") +call X("SpellLocal", s:brick, s:linen, "reverse") +call X("SpellRare", s:brick, s:linen, "reverse") +call X("StatusLine", s:darklilac, s:shadow, "reverse") +call X("StatusLineNC", s:darklilac, s:shadow, "reverse,underline") +call X("StatusLineTerm", s:mint, "", "reverse") +call X("StatusLineTermNC", s:mint, "", "reverse") +call X("TabLine", s:lightgrey, s:shadow, "") +call X("TabLineFill", s:amethyst, "", "") +call X("TabLineSel", s:linen, s:darklilac, "") +call X("Title", s:rouge, "", "") +call X("ToolbarButton", s:darklilac, s:shadow, "") +call X("ToolbarLine", "", s:clay, "") +call X("VertSplit", s:purps, s:shadow, "reverse") +call X("VisualNOS", s:clay, "", "") +call X("WarningMsg", s:rouge, "", "") +call X("WildMenu", s:mint, s:clay, "") call X("Character", s:darklilac, "", "") call X("Number", s:darklilac, "", "") call X("String", s:turquoise, "", "") call X("Constant", s:darklilac, "", "") +call X("PreProc", s:lilac, "", "") +call X("Include", s:lilac, "", "") +call X("Macro", s:lilac, "", "") +call X("PreCondit", s:lilac, "", "") + call X("Comment", s:lightgrey, "", "") call X("Function", s:lilac, "", "") call X("Structure", s:lilac, "", "") @@ -68,16 +122,9 @@ call X("Special", s:sunflower, "", "") call X("Cursor", "", s:linen, "") call X("CursorLine", "", s:amethyst, "") call X("ColorColumn", "", s:shadow, "") -call X("Search", s:linen, s:amethyst, "") -call X("Visual", s:purps, s:amethyst, "") +call X("Search", s:sunflower, s:amethyst, "reverse") +call X("Visual", "", s:amethyst, "") call X("Todo", s:brick, s:purps, "bold") -call X("Error", s:rouge, s:midnight, "") +call X("Error", s:brick, s:linen, "reverse") call X("pythonSpaceError", "", s:clay, "") - -"hi def link pythonDecoratorName Define -"hi link Conditional Keyword -"hi link Repeat Keyword - -"hi link cType Keyword -