From eafffd4c1f681e90aa1bbb2c81046a485346b0d8 Mon Sep 17 00:00:00 2001 From: siduck Date: Sat, 2 Mar 2024 20:29:22 +0530 Subject: [PATCH] update some hlgroups for stl --- lua/base46/integrations/cmp.lua | 7 +------ lua/base46/integrations/statusline/default.lua | 11 +++-------- lua/base46/integrations/statusline/minimal.lua | 16 +++++++--------- lua/base46/integrations/statusline/vscode.lua | 2 +- .../integrations/statusline/vscode_colored.lua | 18 ++---------------- 5 files changed, 14 insertions(+), 40 deletions(-) diff --git a/lua/base46/integrations/cmp.lua b/lua/base46/integrations/cmp.lua index f03bcab..a5b73c6 100644 --- a/lua/base46/integrations/cmp.lua +++ b/lua/base46/integrations/cmp.lua @@ -51,7 +51,7 @@ local cmp_ui = require("nvconfig").ui.cmp local styles = { default = { - CmpBorder = { fg = colors[cmp_ui.border_color] }, + CmpBorder = { fg = colors.grey_fg }, }, atom = { @@ -117,9 +117,4 @@ end highlights = vim.tbl_deep_extend("force", highlights, styles[cmp_ui.style] or {}) highlights = vim.tbl_deep_extend("force", highlights, item_kinds) -if cmp_ui.selected_item_bg == "simple" then - highlights.CmpSel = - { fg = colors.white, bg = (highlights.CmpPmenu.bg == colors.black2 and colors.grey or colors.one_bg3), bold = true } -end - return highlights diff --git a/lua/base46/integrations/statusline/default.lua b/lua/base46/integrations/statusline/default.lua index 2422501..3e5f902 100644 --- a/lua/base46/integrations/statusline/default.lua +++ b/lua/base46/integrations/statusline/default.lua @@ -18,21 +18,16 @@ local M = { bold = true, }, - St_LspStatus = { + St_Lsp = { fg = colors.nord_blue, bg = statusline_bg, }, - St_LspProgress = { + St_LspMsg = { fg = colors.green, bg = statusline_bg, }, - St_LspStatus_Icon = { - fg = colors.black, - bg = colors.nord_blue, - }, - St_EmptySpace = { fg = colors.grey, bg = colors.lightbg, @@ -43,7 +38,7 @@ local M = { bg = statusline_bg, }, - St_file_info = { + St_file = { bg = colors.lightbg, fg = colors.white, }, diff --git a/lua/base46/integrations/statusline/minimal.lua b/lua/base46/integrations/statusline/minimal.lua index f7e51ae..59d30f7 100644 --- a/lua/base46/integrations/statusline/minimal.lua +++ b/lua/base46/integrations/statusline/minimal.lua @@ -36,14 +36,12 @@ local M = { bg = "none", }, - St_LspProgress = { + St_LspMsg = { fg = colors.green, - bg = "none", }, - St_LspStatus_Icon = { - fg = colors.black, - bg = colors.nord_blue, + St_Lsp = { + fg = colors.green, }, St_EmptySpace = { @@ -55,7 +53,7 @@ local M = { fg = colors.black, }, - St_file_info = { + St_file = { fg = colors.white, bg = "none", }, @@ -72,9 +70,9 @@ local M = { } local function genModes_hl(modename, col) - M["St_" .. modename .. "Mode"] = { fg = colors.black, bg = colors[col], bold = true } - M["St_" .. modename .. "ModeSep"] = { fg = colors[col], bg = colors.black, bold = true } - M["St_" .. modename .. "modeText"] = { fg = colors[col], bg = colors.one_bg, bold = true } + M["St_" .. modename .. "Mode"] = { fg = colors.black, bg = colors[col] } + M["St_" .. modename .. "ModeSep"] = { fg = colors[col], bg = colors.black } + M["St_" .. modename .. "modeText"] = { fg = colors[col], bg = colors.one_bg } end genModes_hl("Normal", "blue") diff --git a/lua/base46/integrations/statusline/vscode.lua b/lua/base46/integrations/statusline/vscode.lua index 85c7dbe..a28ee4c 100644 --- a/lua/base46/integrations/statusline/vscode.lua +++ b/lua/base46/integrations/statusline/vscode.lua @@ -19,7 +19,7 @@ local M = { St_Mode = { fg = light_grey, - bg = colors.one_bg3, + bg = colors.one_bg2, }, StText = { diff --git a/lua/base46/integrations/statusline/vscode_colored.lua b/lua/base46/integrations/statusline/vscode_colored.lua index 20ebd68..91b68cd 100644 --- a/lua/base46/integrations/statusline/vscode_colored.lua +++ b/lua/base46/integrations/statusline/vscode_colored.lua @@ -26,33 +26,24 @@ local M = { St_lspError = { fg = colors.red, bg = statusline_bg, - bold = true, }, St_lspWarning = { fg = colors.yellow, bg = statusline_bg, - bold = true, }, St_LspHints = { fg = colors.purple, bg = statusline_bg, - bold = true, }, - St_LspInfo = { + St_Lsp = { fg = colors.green, bg = statusline_bg, - bold = true, }, - St_LspStatus = { - fg = colors.green, - bg = statusline_bg, - }, - - St_LspProgress = { + St_LspMsg = { fg = colors.red, bg = statusline_bg, }, @@ -62,11 +53,6 @@ local M = { bg = colors.one_bg3, }, - St_encode = { - fg = colors.orange, - bg = statusline_bg, - }, - St_ft = { fg = colors.blue, bg = statusline_bg,