From: Huck Boles <huck@huck.website>
Date: Mon, 11 Mar 2024 20:06:50 +0000 (-0700)
Subject: removed: c_term colors in color scheme function
X-Git-Url: https://git.huck.website/?a=commitdiff_plain;h=40a19b3f5cecc1c5cdaf81363b929055f65f3940;p=nvim.git

removed: c_term colors in color scheme function
---

diff --git a/lua/huck/theme.lua b/lua/huck/theme.lua
index 10d4265..2783928 100644
--- a/lua/huck/theme.lua
+++ b/lua/huck/theme.lua
@@ -21,22 +21,6 @@ local dark_magenta      = "#8542ff"
 local dark_cyan         = "#42717b"
 local dark_white        = "#f7f0dd"
 
-local c_black           = "0"
-local c_red             = "1"
-local c_green           = "2"
-local c_yellow          = "3"
-local c_blue            = "4"
-local c_magenta         = "5"
-local c_cyan            = "6"
-local c_white           = "7"
-local c_grey            = "8"
-local c_dark_red        = "9"
-local c_dark_green      = "10"
-local c_dark_yellow     = "11"
-local c_dark_blue       = "12"
-local c_dark_magenta    = "13"
-local c_dark_cyan       = "14"
-
 vim.g.terminal_color_0  = black
 vim.g.terminal_color_1  = red
 vim.g.terminal_color_2  = green
@@ -58,243 +42,258 @@ local bold              = "bold"
 local italic            = "italic"
 local underline         = "underline"
 
-local function highlight(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+local function highlight(group, guifg, guibg, attr, guisp)
     local parts = { group }
     if guifg then table.insert(parts, "guifg=" .. guifg) end
     if guibg then table.insert(parts, "guibg=" .. guibg) end
-    if ctermfg then table.insert(parts, "ctermfg=" .. ctermfg) end
-    if ctermbg then table.insert(parts, "ctermbg=" .. ctermbg) end
-    if attr then
-        table.insert(parts, "gui=" .. attr)
-        table.insert(parts, "cterm=" .. attr)
-    end
+    if attr then table.insert(parts, "gui=" .. attr) end
     if guisp then table.insert(parts, "guisp=" .. guisp) end
     vim.api.nvim_command('highlight ' .. table.concat(parts, ' '))
 end
 
--- highlight(group, guifg, guibg, ctermfg, ctermbg, attr, guisp)
+-- highlight(group, guifg, guibg, attr, guisp)
 
 -- attributes
-highlight("Bold", nil, nil, nil, nil, bold, nil)
-highlight("Italic", nil, nil, nil, nil, italic, nil)
-highlight("Underline", nil, nil, nil, nil, underline, nil)
+highlight("Bold", nil, nil, bold, nil)
+highlight("Italic", nil, nil, italic, nil)
+highlight("Underline", nil, nil, underline, nil)
 
 -- editor
-highlight("Normal", white, black, c_white, nil, nil, nil)
-highlight("EndOfBuffer", black, black, c_black, c_black, nil, nil)
-highlight("LineNr", yellow, black, c_yellow, c_black, nil, nil)
-highlight("CursorLineNr", red, black, c_red, c_black, bold, nil)
-highlight("MatchParen", nil, grey, nil, c_grey, bold, nil)
-highlight("SpecialKey", cyan, nil, c_cyan, nil, nil, nil)
-highlight("NonText", cyan, black, c_cyan, c_black, nil, nil)
-highlight("Search", nil, green, nil, c_green, nil, nil)
-highlight("Visual", nil, dark_grey, nil, c_grey, nil, nil)
-highlight("Folded", blue, dark_grey, c_blue, c_grey, nil, nil)
-highlight("FoldColumn", blue, dark_grey, c_blue, c_grey, nil, nil)
+highlight("Normal", white, black, nil, nil)
+highlight("EndOfBuffer", black, black, nil, nil)
+highlight("LineNr", yellow, black, nil, nil)
+highlight("CursorLineNr", red, black, bold, nil)
+highlight("MatchParen", nil, grey, bold, nil)
+highlight("SpecialKey", cyan, nil, nil, nil)
+highlight("NonText", cyan, black, nil, nil)
+highlight("Search", black, green, nil, nil)
+highlight("CurSearch", black, yellow, nil, nil)
+highlight("Visual", nil, dark_grey, nil, nil)
+highlight("Folded", blue, dark_grey, nil, nil)
+highlight("FoldColumn", blue, dark_grey, nil, nil)
 
 -- ui
-highlight("WildMenu", grey, black, c_grey, c_black, nil, nil)
-highlight("Title", green, black, c_green, c_black, bold, nil)
-highlight("ToolBarLine", dark_grey, black, c_grey, c_black, nil, nil)
-highlight("Pmenu", white, black, nil, c_black, nil, nil)
-highlight("PmenuSbar", white, black, nil, c_black, nil, nil)
-highlight("PmenuThumb", grey, black, nil, c_black, nil, nil)
-highlight("PmenuSel", green, black, c_green, c_black, nil, nil)
-highlight("VertSplit", dark_grey, black, c_grey, nil, nil)
-highlight("FloatBorder", dark_grey, black, c_grey, c_black, nil, nil)
-highlight("TabLine", black, grey, c_black, c_grey, nil, nil)
-highlight("TabLineFill", grey, black, c_grey, c_black, nil, nil)
-highlight("TablineSel", grey, black, c_grey, c_white, bold, nil)
-highlight("StatusLineNC", grey, black, c_grey, nil, bold, nil)
-highlight("StatusLine", white, black, c_grey, c_white, bold, nil)
-highlight("SignColumn", blue, black, c_blue, c_black, nil, nil)
-highlight("ColorColumn", black, dark_yellow, c_black, c_dark_yellow, nil, nil)
-highlight("Directory", blue, nil, c_blue, nil, bold, nil)
-highlight("Conceal", grey, black, c_grey, c_black, nil, nil)
-highlight("CursorLine", white, grey, c_white, c_grey, nil, nil)
+highlight("WildMenu", grey, black, nil, nil)
+highlight("Title", green, black, bold, nil)
+highlight("ToolBarLine", black, dark_grey, nil, nil)
+highlight("Pmenu", white, black, nil, nil)
+highlight("PmenuSbar", white, black, nil, nil)
+highlight("PmenuThumb", grey, black, nil, nil)
+highlight("PmenuSel", green, black, nil, nil)
+highlight("VertSplit", dark_grey, black, nil)
+highlight("FloatBorder", dark_grey, black, nil, nil)
+highlight("TabLine", black, grey, nil, nil)
+highlight("TabLineFill", grey, black, nil, nil)
+highlight("TablineSel", grey, black, bold, nil)
+highlight("StatusLineNC", grey, black, bold, nil)
+highlight("StatusLine", white, black, bold, nil)
+highlight("SignColumn", blue, black, nil, nil)
+highlight("ColorColumn", black, dark_yellow, nil, nil)
+highlight("Directory", blue, nil, bold, nil)
+highlight("Conceal", grey, black, nil, nil)
+highlight("CursorLine", white, grey, nil, nil)
+highlight("WinBar", nil, black, nil, nil)
+highlight("WinBarNC", nil, black, nil, nil)
+highlight("QuickFixLine", cyan, nil, nil, nil)
+highlight("MsgArea", nil, black, nil, nil)
+
+-- floating windows
+highlight("NormalFloat", white, black, nil, nil)
+highlight("FloatShadow", nil, dark_grey, nil, nil)
+highlight("FloatShadowThrough", nil, dark_grey, nil, nil)
 
 -- spelling
-highlight("SpellBad", red, black, c_red, c_black, underline, red)
-highlight("SpellCap", cyan, black, c_cyan, c_black, underline, cyan)
-highlight("SpellRare", green, black, c_green, c_black, underline, green)
-highlight("SpellLocal", magenta, black, c_magenta, c_black, underline, magenta)
+highlight("SpellBad", red, black, underline, red)
+highlight("SpellCap", cyan, black, underline, cyan)
+highlight("SpellRare", green, black, underline, green)
+highlight("SpellLocal", magenta, black, underline, magenta)
 
 -- messages
-highlight("Question", green, black, c_green, c_black, nil, nil)
-highlight("Error", black, red, c_black, c_red, nil, nil)
-highlight("ErrorMsg", red, black, c_red, c_black, underline, nil)
-highlight("WarningMsg", yellow, black, c_yellow, c_black, underline, nil)
-highlight("Todo", black, dark_yellow, c_black, c_dark_yellow, bold, nil)
-highlight("MoreMsg", green, black, c_green, c_black, bold, nil)
-highlight("NvimInternalError", black, dark_red, c_black, c_dark_red, nil, nil)
+highlight("Question", green, black, nil, nil)
+highlight("Error", black, red, nil, nil)
+highlight("ErrorMsg", red, black, underline, nil)
+highlight("WarningMsg", yellow, black, underline, nil)
+highlight("Todo", black, dark_yellow, bold, nil)
+highlight("MoreMsg", green, black, bold, nil)
+highlight("ModeMsg", green, black, bold, nil)
+highlight("NvimInternalError", black, dark_red, nil, nil)
 
 -- lsp
-highlight("DiagnosticError", dark_red, black, c_dark_red, c_black, nil, nil)
-highlight("DiagnosticWarn", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("DiagnosticInfo", dark_blue, black, c_dark_blue, c_black, nil, nil)
-highlight("DiagnosticHint", grey, black, c_grey, c_black, nil, nil)
-highlight("DiagnosticUnderlineError", nil, nil, nil, nil, underline, dark_red)
-highlight("DiagnosticUnderlineWarn", nil, nil, nil, nil, underline, dark_yellow)
-highlight("DiagnosticUnderlineInfo", nil, nil, nil, nil, underline, dark_blue)
-highlight("DiagnosticUnderlineHint", nil, nil, nil, nil, underline, grey)
+highlight("DiagnosticError", dark_red, black, nil, nil)
+highlight("DiagnosticWarn", dark_yellow, black, nil, nil)
+highlight("DiagnosticInfo", dark_blue, black, nil, nil)
+highlight("DiagnosticHint", grey, black, nil, nil)
+highlight("DiagnosticOk", dark_green, black, nil, nil)
+highlight("DiagnosticUnderlineError", nil, nil, underline, dark_red)
+highlight("DiagnosticUnderlineWarn", nil, nil, underline, dark_yellow)
+highlight("DiagnosticUnderlineInfo", nil, nil, underline, dark_blue)
+highlight("DiagnosticUnderlineHint", nil, nil, underline, grey)
 
 -- completion
-highlight("CmpItemAbbrMatch", dark_blue, "NONE", c_dark_blue, "NONE", nil, nil)
-highlight("CmpItemAbbrMatchFuzzy", blue, "NONE", c_blue, "NONE", nil, nil)
-highlight("CmpItemKindVariable", green, "NONE", c_green, "NONE", nil, nil)
-highlight("CmpItemKindInterface", dark_cyan, "NONE", c_dark_cyan, "NONE", nil, nil)
-highlight("CmpItemKindText", cyan, "NONE", c_cyan, "NONE", nil, nil)
-highlight("CmpItemKindFunction", magenta, "NONE", c_magenta, "NONE", nil, nil)
-highlight("CmpItemKindMethod", magenta, "NONE", c_magenta, "NONE", nil, nil)
-highlight("CmpItemKindKeyword", dark_yellow, "NONE", c_dark_yellow, "NONE", nil, nil)
-highlight("CmpItemKindProperty", dark_yellow, "NONE", c_dark_yellow, "NONE", nil, nil)
-highlight("CmpItemKindUnit", dark_yellow, "NONE", c_dark_yellow, "NONE", nil, nil)
+highlight("CmpItemAbbrMatch", dark_blue, "NONE", nil, nil)
+highlight("CmpItemAbbrMatchFuzzy", blue, "NONE", nil, nil)
+highlight("CmpItemKindVariable", green, "NONE", nil, nil)
+highlight("CmpItemKindInterface", dark_cyan, "NONE", nil, nil)
+highlight("CmpItemKindText", cyan, "NONE", nil, nil)
+highlight("CmpItemKindFunction", magenta, "NONE", nil, nil)
+highlight("CmpItemKindMethod", magenta, "NONE", nil, nil)
+highlight("CmpItemKindKeyword", dark_yellow, "NONE", nil, nil)
+highlight("CmpItemKindProperty", dark_yellow, "NONE", nil, nil)
+highlight("CmpItemKindUnit", dark_yellow, "NONE", nil, nil)
 
 -- indent lines
-highlight("IndentBlanklineChar", dark_grey, nil, c_grey, nil, "NONE", nil)
-highlight("IndentBlanklineSpaceChar", dark_grey, nil, c_grey, nil, "NONE", nil)
-highlight("IndentBlanklineSpaceCharBlankline", dark_grey, nil, c_grey, nil, "NONE", nil)
+highlight("IndentBlanklineChar", dark_grey, nil, "NONE", nil)
+highlight("IndentBlanklineSpaceChar", dark_grey, nil, "NONE", nil)
+highlight("IndentBlanklineSpaceCharBlankline", dark_grey, nil, "NONE", nil)
 
 -- syntax highlighting
-highlight("Comment", grey, black, c_grey, c_black, italic, nil)
-
-highlight("Constant", white, black, c_cyan, c_black, "bold,italic", nil)
-highlight("String", white, black, c_white, c_black, italic, nil)
-highlight("Number", white, black, c_white, c_black, bold, nil)
-highlight("Float", white, black, c_white, c_black, bold, nil)
-highlight("Character", white, black, c_white, c_black, bold, nil)
-highlight("Boolean", magenta, black, c_magenta, c_black, bold, nil)
-
-highlight("Function", dark_blue, black, c_dark_blue, c_black, bold, nil)
-highlight("Identifier", blue, black, c_blue, c_black, nil, nil)
-highlight("@variable", blue, black, c_blue, c_black, nil, nil)
-highlight("@module", blue, black, c_blue, c_black, bold, nil)
-
-highlight("Conditional", dark_green, black, c_dark_green, c_black, "italic,bold", nil)
-highlight("Repeat", dark_green, black, c_dark_green, c_black, "italic,bold", nil)
-
-highlight("Label", dark_green, black, c_dark_green, c_black, nil, nil)
-highlight("Statement", dark_green, black, c_dark_green, c_black, nil, nil)
-highlight("Operator", dark_green, black, c_dark_green, c_black, bold, nil)
-highlight("Keyword", dark_green, black, c_dark_green, c_black, bold, nil)
-
-highlight("PreProc", yellow, black, c_yellow, c_black, bold, nil)
-highlight("Include", yellow, black, c_yellow, c_black, bold, nil)
-highlight("Define", yellow, black, c_yellow, c_black, bold, nil)
-highlight("Macro", dark_yellow, black, c_dark_yellow, c_black, bold, nil)
-highlight("PreCondit", yellow, black, c_yellow, c_black, bold, nil)
-
-highlight("Type", blue, black, c_blue, c_black, bold, nil)
-highlight("Structure", blue, black, c_blue, c_black, bold, nil)
-highlight("StorageClass", green, black, c_green, c_black, bold, nil)
-highlight("TypeDef", green, black, c_green, c_black, bold, nil)
-
-highlight("Special", dark_yellow, black, c_dark_yellow, c_black, bold, nil)
-highlight("SpecialChar", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("Delimiter", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("SpecialComment", yellow, black, c_yellow, c_black, italic, nil)
-highlight("Debug", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
+highlight("Comment", grey, black, italic, nil)
+
+highlight("Constant", white, black, "bold,italic", nil)
+highlight("String", white, black, italic, nil)
+highlight("Number", white, black, bold, nil)
+highlight("Float", white, black, bold, nil)
+highlight("Character", white, black, bold, nil)
+highlight("Boolean", magenta, black, bold, nil)
+highlight("Function", dark_blue, black, bold, nil)
+highlight("Identifier", blue, black, nil, nil)
+
+highlight("@character.special", white, black, bold, nil)
+highlight("@variable", blue, black, nil, nil)
+highlight("@variable.builtin", blue, black, nil, nil)
+highlight("@module", blue, black, bold, nil)
+highlight("@module.builtin", blue, black, bold, nil)
+highlight("@type.builtin", blue, black, bold, nil)
+highlight("@function.builtin", dark_blue, black, bold, nil)
+
+highlight("Conditional", dark_green, black, "italic,bold", nil)
+highlight("Repeat", dark_green, black, "italic,bold", nil)
+
+highlight("Label", dark_green, black, nil, nil)
+highlight("Statement", dark_green, black, nil, nil)
+highlight("Operator", dark_green, black, bold, nil)
+highlight("Keyword", dark_green, black, bold, nil)
+
+highlight("PreProc", yellow, black, bold, nil)
+highlight("Include", yellow, black, bold, nil)
+highlight("Define", yellow, black, bold, nil)
+highlight("Macro", dark_yellow, black, bold, nil)
+highlight("PreCondit", yellow, black, bold, nil)
+
+highlight("Type", blue, black, bold, nil)
+highlight("Structure", blue, black, bold, nil)
+highlight("StorageClass", green, black, bold, nil)
+highlight("TypeDef", green, black, bold, nil)
+
+highlight("Special", dark_yellow, black, bold, nil)
+highlight("SpecialChar", dark_yellow, black, nil, nil)
+highlight("Delimiter", dark_yellow, black, nil, nil)
+highlight("SpecialComment", yellow, black, italic, nil)
+highlight("Debug", dark_yellow, black, nil, nil)
 
 -- diff
-highlight("DiffAdd", black, green, c_black, c_green, nil, nil)
-highlight("DiffText", black, cyan, c_black, c_cyan, nil, nil)
-highlight("DiffDelete", black, red, c_black, c_red, nil, nil)
-highlight("DiffChange", black, magenta, c_black, c_magenta, nil, nil)
+highlight("Added", black, green, nil, nil)
+highlight("Removed", black, red, nil, nil)
+highlight("Changed", black, magenta, nil, nil)
+highlight("DiffAdd", black, green, nil, nil)
+highlight("DiffText", black, cyan, nil, nil)
+highlight("DiffDelete", black, red, nil, nil)
+highlight("DiffChange", black, magenta, nil, nil)
 
 -- redraw
-highlight("RedrawDebugNormal", black, white, c_black, c_white, nil, nil)
-highlight("RedrawDebugClear", black, dark_yellow, c_black, c_dark_yellow, nil, nil)
-highlight("RedrawDebugComposed", black, green, c_black, c_green, nil, nil)
-highlight("RedrawDebugRecompose", black, red, c_black, c_red, nil, nil)
+highlight("RedrawDebugNormal", black, white, nil, nil)
+highlight("RedrawDebugClear", black, dark_yellow, nil, nil)
+highlight("RedrawDebugComposed", black, green, nil, nil)
+highlight("RedrawDebugRecompose", black, red, nil, nil)
 
 -- lazy.nvim
-highlight("LazyButton", white, black, c_white, c_black, nil, nil)
-highlight("LazyButtonActive", white, black, c_white, c_black, bold, nil)
-highlight("LazyH1", white, black, c_white, c_black, bold, nil)
+highlight("LazyButton", white, black, nil, nil)
+highlight("LazyButtonActive", white, black, bold, nil)
+highlight("LazyH1", white, black, bold, nil)
 
 -- completion
-highlight("CmpItemAbbrDefault", white, black, c_white, c_black, nil, nil)
-highlight("CmpItemMenuDefault", white, black, c_white, c_black, nil, nil)
-highlight("CmpItemAbbrDeprecatedDefault", white, black, c_white, c_black, nil, nil)
-highlight("CmpItemAbbrMatchDefault", dark_blue, black, c_white, c_dark_blue, nil, nil)
-highlight("CmpItemAbbrMatchFuzzyDefault", blue, black, c_white, c_blue, nil, nil)
-highlight("CmpItemKindDefault", cyan, black, c_white, c_cyan, nil, nil)
+highlight("CmpItemAbbrDefault", white, black, nil, nil)
+highlight("CmpItemMenuDefault", white, black, nil, nil)
+highlight("CmpItemAbbrDeprecatedDefault", white, black, nil, nil)
+highlight("CmpItemAbbrMatchDefault", dark_blue, black, nil, nil)
+highlight("CmpItemAbbrMatchFuzzyDefault", blue, black, nil, nil)
+highlight("CmpItemKindDefault", cyan, black, nil, nil)
 
 -- lualine
-highlight("lualine_a_visual", black, yellow, c_black, c_yellow, nil, nil)
-highlight("lualine_b_visual", yellow, black, c_yellow, c_black, nil, nil)
-highlight("lualine_c_visual", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_a_replace", black, magenta, c_black, c_magenta, nil, nil)
-highlight("lualine_b_replace", magenta, black, c_magenta, c_black, nil, nil)
-highlight("lualine_c_replace", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_a_normal", white, black, c_white, c_black, nil, nil)
-highlight("lualine_b_normal", white, black, c_white, c_black, nil, nil)
-highlight("lualine_c_normal", white, black, c_white, c_black, nil, nil)
-highlight("lualine_a_command", black, blue, c_black, c_blue, nil, nil)
-highlight("lualine_b_command", blue, black, c_blue, c_black, nil, nil)
-highlight("lualine_c_command", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_a_insert", black, green, c_black, c_green, nil, nil)
-highlight("lualine_b_insert", green, black, c_green, c_black, nil, nil)
-highlight("lualine_c_insert", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_a_terminal", black, cyan, c_black, c_cyan, nil, nil)
-highlight("lualine_b_terminal", cyan, black, c_cyan, c_black, nil, nil)
-highlight("lualine_c_terminal", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_a_inactive", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_b_inactive", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_c_inactive", grey, black, c_grey, c_black, nil, nil)
-
-highlight("lualine_y_diagnostics_error_normal", red, black, c_red, c_black, nil, nil)
-highlight("lualine_y_diagnostics_warn_normal", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("lualine_y_diagnostics_info_normal", blue, black, c_blue, c_black, nil, nil)
-highlight("lualine_y_diagnostics_hint_normal", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_c_diff_added_normal", green, black, c_green, c_black, nil, nil)
-highlight("lualine_c_diff_modified_normal", yellow, black, c_yellow, c_black, nil, nil)
-highlight("lualine_c_diff_removed_normal", blue, black, c_blue, c_black, nil, nil)
-
-highlight("lualine_y_diagnostics_error_insert", red, black, c_red, c_black, nil, nil)
-highlight("lualine_y_diagnostics_warn_insert", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("lualine_y_diagnostics_info_insert", blue, black, c_blue, c_black, nil, nil)
-highlight("lualine_y_diagnostics_hint_insert", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_c_diff_added_insert", green, black, c_green, c_black, nil, nil)
-highlight("lualine_c_diff_modified_insert", yellow, black, c_yellow, c_black, nil, nil)
-highlight("lualine_c_diff_removed_insert", blue, black, c_blue, c_black, nil, nil)
-
-highlight("lualine_y_diagnostics_error_visual", red, black, c_red, c_black, nil, nil)
-highlight("lualine_y_diagnostics_warn_visual", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("lualine_y_diagnostics_info_visual", blue, black, c_blue, c_black, nil, nil)
-highlight("lualine_y_diagnostics_hint_visual", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_c_diff_added_visual", green, black, c_green, c_black, nil, nil)
-highlight("lualine_c_diff_modified_visual", yellow, black, c_yellow, c_black, nil, nil)
-highlight("lualine_c_diff_removed_visual", blue, black, c_blue, c_black, nil, nil)
-
-highlight("lualine_y_diagnostics_error_replace", red, black, c_red, c_black, nil, nil)
-highlight("lualine_y_diagnostics_warn_replace", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("lualine_y_diagnostics_info_replace", blue, black, c_blue, c_black, nil, nil)
-highlight("lualine_y_diagnostics_hint_replace", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_c_diff_added_replace", green, black, c_green, c_black, nil, nil)
-highlight("lualine_c_diff_modified_replace", yellow, black, c_yellow, c_black, nil, nil)
-highlight("lualine_c_diff_removed_replace", blue, black, c_blue, c_black, nil, nil)
-
-highlight("lualine_y_diagnostics_error_command", red, black, c_red, c_black, nil, nil)
-highlight("lualine_y_diagnostics_warn_command", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("lualine_y_diagnostics_info_command", blue, black, c_blue, c_black, nil, nil)
-highlight("lualine_y_diagnostics_hint_command", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_c_diff_added_command", green, black, c_green, c_black, nil, nil)
-highlight("lualine_c_diff_modified_command", yellow, black, c_yellow, c_black, nil, nil)
-highlight("lualine_c_diff_removed_command", blue, black, c_blue, c_black, nil, nil)
-
-highlight("lualine_y_diagnostics_error_terminal", red, black, c_red, c_black, nil, nil)
-highlight("lualine_y_diagnostics_warn_terminal", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("lualine_y_diagnostics_info_terminal", blue, black, c_blue, c_black, nil, nil)
-highlight("lualine_y_diagnostics_hint_terminal", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_c_diff_added_terminal", green, black, c_green, c_black, nil, nil)
-highlight("lualine_c_diff_modified_terminal", yellow, black, c_yellow, c_black, nil, nil)
-highlight("lualine_c_diff_removed_terminal", blue, black, c_blue, c_black, nil, nil)
-
-highlight("lualine_y_diagnostics_error_inactive", red, black, c_red, c_black, nil, nil)
-highlight("lualine_y_diagnostics_warn_inactive", dark_yellow, black, c_dark_yellow, c_black, nil, nil)
-highlight("lualine_y_diagnostics_info_inactive", blue, black, c_blue, c_black, nil, nil)
-highlight("lualine_y_diagnostics_hint_inactive", grey, black, c_grey, c_black, nil, nil)
-highlight("lualine_c_diff_added_inactive", green, black, c_green, c_black, nil, nil)
-highlight("lualine_c_diff_modified_inactive", yellow, black, c_yellow, c_black, nil, nil)
-highlight("lualine_c_diff_removed_inactive", blue, black, c_blue, c_black, nil, nil)
+highlight("lualine_a_visual", black, yellow, nil, nil)
+highlight("lualine_b_visual", yellow, black, nil, nil)
+highlight("lualine_c_visual", grey, black, nil, nil)
+highlight("lualine_a_replace", black, magenta, nil, nil)
+highlight("lualine_b_replace", magenta, black, nil, nil)
+highlight("lualine_c_replace", grey, black, nil, nil)
+highlight("lualine_a_normal", white, black, nil, nil)
+highlight("lualine_b_normal", white, black, nil, nil)
+highlight("lualine_c_normal", white, black, nil, nil)
+highlight("lualine_a_command", black, blue, nil, nil)
+highlight("lualine_b_command", blue, black, nil, nil)
+highlight("lualine_c_command", grey, black, nil, nil)
+highlight("lualine_a_insert", black, green, nil, nil)
+highlight("lualine_b_insert", green, black, nil, nil)
+highlight("lualine_c_insert", grey, black, nil, nil)
+highlight("lualine_a_terminal", black, cyan, nil, nil)
+highlight("lualine_b_terminal", cyan, black, nil, nil)
+highlight("lualine_c_terminal", grey, black, nil, nil)
+highlight("lualine_a_inactive", grey, black, nil, nil)
+highlight("lualine_b_inactive", grey, black, nil, nil)
+highlight("lualine_c_inactive", grey, black, nil, nil)
+
+highlight("lualine_y_diagnostics_error_normal", red, black, nil, nil)
+highlight("lualine_y_diagnostics_warn_normal", dark_yellow, black, nil, nil)
+highlight("lualine_y_diagnostics_info_normal", blue, black, nil, nil)
+highlight("lualine_y_diagnostics_hint_normal", grey, black, nil, nil)
+highlight("lualine_c_diff_added_normal", green, black, nil, nil)
+highlight("lualine_c_diff_modified_normal", yellow, black, nil, nil)
+highlight("lualine_c_diff_removed_normal", blue, black, nil, nil)
+
+highlight("lualine_y_diagnostics_error_insert", red, black, nil, nil)
+highlight("lualine_y_diagnostics_warn_insert", dark_yellow, black, nil, nil)
+highlight("lualine_y_diagnostics_info_insert", blue, black, nil, nil)
+highlight("lualine_y_diagnostics_hint_insert", grey, black, nil, nil)
+highlight("lualine_c_diff_added_insert", green, black, nil, nil)
+highlight("lualine_c_diff_modified_insert", yellow, black, nil, nil)
+highlight("lualine_c_diff_removed_insert", blue, black, nil, nil)
+
+highlight("lualine_y_diagnostics_error_visual", red, black, nil, nil)
+highlight("lualine_y_diagnostics_warn_visual", dark_yellow, black, nil, nil)
+highlight("lualine_y_diagnostics_info_visual", blue, black, nil, nil)
+highlight("lualine_y_diagnostics_hint_visual", grey, black, nil, nil)
+highlight("lualine_c_diff_added_visual", green, black, nil, nil)
+highlight("lualine_c_diff_modified_visual", yellow, black, nil, nil)
+highlight("lualine_c_diff_removed_visual", blue, black, nil, nil)
+
+highlight("lualine_y_diagnostics_error_replace", red, black, nil, nil)
+highlight("lualine_y_diagnostics_warn_replace", dark_yellow, black, nil, nil)
+highlight("lualine_y_diagnostics_info_replace", blue, black, nil, nil)
+highlight("lualine_y_diagnostics_hint_replace", grey, black, nil, nil)
+highlight("lualine_c_diff_added_replace", green, black, nil, nil)
+highlight("lualine_c_diff_modified_replace", yellow, black, nil, nil)
+highlight("lualine_c_diff_removed_replace", blue, black, nil, nil)
+
+highlight("lualine_y_diagnostics_error_command", red, black, nil, nil)
+highlight("lualine_y_diagnostics_warn_command", dark_yellow, black, nil, nil)
+highlight("lualine_y_diagnostics_info_command", blue, black, nil, nil)
+highlight("lualine_y_diagnostics_hint_command", grey, black, nil, nil)
+highlight("lualine_c_diff_added_command", green, black, nil, nil)
+highlight("lualine_c_diff_modified_command", yellow, black, nil, nil)
+highlight("lualine_c_diff_removed_command", blue, black, nil, nil)
+
+highlight("lualine_y_diagnostics_error_terminal", red, black, nil, nil)
+highlight("lualine_y_diagnostics_warn_terminal", dark_yellow, black, nil, nil)
+highlight("lualine_y_diagnostics_info_terminal", blue, black, nil, nil)
+highlight("lualine_y_diagnostics_hint_terminal", grey, black, nil, nil)
+highlight("lualine_c_diff_added_terminal", green, black, nil, nil)
+highlight("lualine_c_diff_modified_terminal", yellow, black, nil, nil)
+highlight("lualine_c_diff_removed_terminal", blue, black, nil, nil)
+
+highlight("lualine_y_diagnostics_error_inactive", red, black, nil, nil)
+highlight("lualine_y_diagnostics_warn_inactive", dark_yellow, black, nil, nil)
+highlight("lualine_y_diagnostics_info_inactive", blue, black, nil, nil)
+highlight("lualine_y_diagnostics_hint_inactive", grey, black, nil, nil)
+highlight("lualine_c_diff_added_inactive", green, black, nil, nil)
+highlight("lualine_c_diff_modified_inactive", yellow, black, nil, nil)
+highlight("lualine_c_diff_removed_inactive", blue, black, nil, nil)
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index af3c66b..93ba93e 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -103,11 +103,11 @@ return {
                 vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
             end
 
-            local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
+            local floating_preview = vim.lsp.util.open_floating_preview
             function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
                 opts = opts or {}
                 opts.border = opts.border or border
-                return orig_util_open_floating_preview(contents, syntax, opts, ...)
+                return floating_preview(contents, syntax, opts, ...)
             end
 
             -- auto format code on save