From 3cf33b0f15d626c8bc7b8039f06fdc618213e745 Mon Sep 17 00:00:00 2001 From: Webhooked Date: Thu, 8 May 2025 09:15:24 +0200 Subject: [PATCH] Transparent-mode corrections for SnacksPicker --- lua/kanso/highlights/editor.lua | 10 +++++----- lua/kanso/highlights/plugins.lua | 28 ++++++++++++++-------------- lua/kanso/highlights/syntax.lua | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lua/kanso/highlights/editor.lua b/lua/kanso/highlights/editor.lua index e6c2996..5012a9c 100644 --- a/lua/kanso/highlights/editor.lua +++ b/lua/kanso/highlights/editor.lua @@ -41,7 +41,7 @@ function M.setup(colors, config) -- ErrorMsg Error messages on the command line. ErrorMsg = { fg = theme.diag.error }, -- WinSeparator Separators between window splits. - WinSeparator = { fg = theme.ui.bg_m3, bg = config.dimInactive and theme.ui.bg_dim or "NONE" }, + WinSeparator = { fg = theme.ui.bg_m3, bg = config.dimInactive and theme.ui.bg_dim or theme.ui.none }, VertSplit = { link = "WinSeparator" }, -- Folded Line used for closed folds. Folded = { fg = theme.ui.special, bg = theme.ui.bg_p1 }, @@ -74,7 +74,7 @@ function M.setup(colors, config) -- NonText '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. NonText = { fg = theme.ui.nontext }, -- Normal Normal text. - Normal = { fg = theme.ui.fg, bg = not config.transparent and theme.ui.bg or "NONE" }, + Normal = { fg = theme.ui.fg, bg = config.transparent and theme.ui.none or theme.ui.bg }, -- NormalFloat Normal text in floating windows. NormalFloat = { fg = theme.ui.float.fg, bg = theme.ui.float.bg }, -- FloatBorder Border of floating windows. @@ -126,7 +126,7 @@ function M.setup(colors, config) -- TabLineFill Tab pages line, where there are no labels. TabLineFill = { bg = theme.ui.none }, -- TabLineSel Tab pages line, active tab page label. - TabLineSel = { fg = theme.ui.fg_dim, bg = not config.transparent and theme.ui.bg_p1 or "NONE", bold = true }, + TabLineSel = { fg = theme.ui.fg_dim, bg = not config.transparent and theme.ui.bg_p1 or theme.ui.none, bold = true }, -- Title Titles for output from ":set all", ":autocmd" etc. Title = { fg = theme.syn.fun, bold = true }, -- Visual Visual mode selection. @@ -140,9 +140,9 @@ function M.setup(colors, config) -- WildMenu Current match in 'wildmenu' completion. WildMenu = { link = "Pmenu" }, -- WinBar Window bar of current window. - WinBar = { fg = theme.ui.fg_dim, bg = "NONE" }, + WinBar = { fg = theme.ui.fg_dim, bg = theme.ui.none }, -- WinBarNC Window bar of not-current windows. - WinBarNC = { fg = theme.ui.fg_dim, bg = config.dimInactive and theme.ui.bg_dim or "NONE" }, + WinBarNC = { fg = theme.ui.fg_dim, bg = config.dimInactive and theme.ui.bg_dim or theme.ui.none }, -- SignColumnSB = { link = "SignColumn" }, -- NormalSB = { link = "Normal" }, diff --git a/lua/kanso/highlights/plugins.lua b/lua/kanso/highlights/plugins.lua index b6aaa8b..452d480 100644 --- a/lua/kanso/highlights/plugins.lua +++ b/lua/kanso/highlights/plugins.lua @@ -39,7 +39,7 @@ function M.setup(colors, config) TreesitterContext = { link = "Folded" }, TreesitterContextLineNumber = { fg = theme.ui.special, bg = theme.ui.none }, -- Telescope - TelescopeBorder = { fg = theme.ui.float.fg_border, bg = theme.ui.bg }, + TelescopeBorder = { fg = theme.ui.float.fg_border, bg = config.transparent and theme.ui.none or theme.ui.bg }, TelescopeTitle = { fg = theme.ui.special }, TelescopeSelection = { link = "CursorLine" }, TelescopeSelectionCaret = { link = "CursorLineNr" }, @@ -66,10 +66,10 @@ function M.setup(colors, config) NvimTreeWinSeparator = { link = "WinSeparator" }, NvimTreeWindowPicker = { bg = theme.ui.bg_m1, fg = theme.syn.special1, bold = true }, -- NeoTree - NeoTreeTabInactive = { fg = theme.ui.special, bg = config.transparent and "NONE" or theme.ui.bg }, - NeoTreeTabActive = { fg = theme.ui.fg_dim, bg = config.transparent and "NONE" or theme.ui.bg_p1, bold = true }, - NeoTreeTabSeparatorInactive = { fg = theme.ui.special, bg = config.transparent and "NONE" or theme.ui.bg }, - NeoTreeTabSeparatorActive = { fg = theme.ui.fg_dim, bg = config.transparent and "NONE" or theme.ui.bg_p1 }, + NeoTreeTabInactive = { fg = theme.ui.special, bg = config.transparent and theme.ui.none or theme.ui.bg }, + NeoTreeTabActive = { fg = theme.ui.fg_dim, bg = config.transparent and theme.ui.none or theme.ui.bg_p1, bold = true }, + NeoTreeTabSeparatorInactive = { fg = theme.ui.special, bg = config.transparent and theme.ui.none or theme.ui.bg }, + NeoTreeTabSeparatorActive = { fg = theme.ui.fg_dim, bg = config.transparent and theme.ui.none or theme.ui.bg_p1 }, NeoTreeRootName = { fg = theme.syn.identifier, bold = true }, NeoTreeModified = { link = "String" }, NeoTreeGitModified = { fg = theme.vcs.changed }, @@ -467,24 +467,24 @@ function M.setup(colors, config) NeotestUnknown = { fg = theme.syn.deprecated }, NeotestWatching = { fg = theme.vcs.changed, }, - SnacksPicker = { bg = theme.ui.bg }, - SnacksPickerTitle = { fg = theme.ui.fg, bg = theme.ui.bg }, + SnacksPicker = { bg = config.transparent and theme.ui.none or theme.ui.bg }, + SnacksPickerTitle = { fg = theme.ui.fg, bg = config.transparent and theme.ui.none or theme.ui.bg }, SnacksPickerBorder = { fg = theme.ui.none, bg = theme.ui.none }, - SnacksPickerNormal = { fg = theme.ui.fg, bg = theme.ui.bg }, + SnacksPickerNormal = { fg = theme.ui.fg, bg = config.transparent and theme.ui.none or theme.ui.bg }, SnacksPickerMatch = { fg = theme.ui.fg }, SnacksPickerCursor = { fg = theme.ui.bg, bg = theme.ui.bg }, SnacksPickerPrompt = { fg = theme.ui.fg }, SnacksPickerDim = { fg = theme.ui.fg_dim }, - SnacksInputIcon = { fg = theme.ui.fg, bg = theme.ui.bg }, + SnacksInputIcon = { fg = theme.ui.fg, bg = config.transparent and theme.ui.none or theme.ui.bg }, SnacksIndent = { fg = theme.ui.indent_line, nocombine = true }, SnacksIndentChunk = { fg = theme.ui.active_indent_line, nocombine = true }, SnacksIndentScope = { fg = theme.ui.active_indent_line, nocombine = true }, - SnacksPickerInputBorder = { fg = theme.ui.float.bg_border, bg = theme.ui.bg }, - SnacksPickerInputTitle = { fg = theme.ui.bg, bg = theme.ui.bg }, - SnacksPickerBoxTitle = { fg = theme.ui.bg, bg = theme.ui.bg }, + SnacksPickerInputBorder = { fg = theme.ui.float.bg_border, bg = config.transparent and theme.ui.none or theme.ui.bg }, + SnacksPickerInputTitle = { fg = theme.ui.bg, bg = config.transparent and theme.ui.none or theme.ui.bg }, + SnacksPickerBoxTitle = { fg = theme.ui.bg, bg = config.transparent and theme.ui.none or theme.ui.bg }, SnacksPickerSelected = { fg = theme.ui.bg }, - SnacksPickerPickWinCurrent = { fg = theme.ui.fg, bg = theme.ui.bg, bold = true }, - SnacksPickerPickWin = { fg = theme.ui.fg, bg = theme.ui.bg_search, bold = true }, + SnacksPickerPickWinCurrent = { fg = theme.ui.fg, bg = config.transparent and theme.ui.none or theme.ui.bg, bold = true }, + SnacksPickerPickWin = { fg = theme.ui.fg, bg = config.transparent and theme.ui.none or theme.ui.bg_search, bold = true }, BufferLineBackground = { fg = theme.ui.none, bg = theme.ui.none }, BufferLineBuffer = { fg = theme.ui.none, bg = theme.ui.none }, diff --git a/lua/kanso/highlights/syntax.lua b/lua/kanso/highlights/syntax.lua index 1788ee1..63052a7 100644 --- a/lua/kanso/highlights/syntax.lua +++ b/lua/kanso/highlights/syntax.lua @@ -10,7 +10,7 @@ function M.setup(colors, config) return { -- *Comment any comment Comment = vim.tbl_extend("force", { fg = theme.syn.comment }, config.disableItalics and {} or config - .commentStyle), + .commentStyle), -- *Constant any constant Constant = { fg = theme.syn.constant }, @@ -95,7 +95,7 @@ function M.setup(colors, config) -- markdownHeadingDelimiter = {}, markdownCode = { fg = theme.syn.string }, markdownCodeBlock = { fg = theme.syn.string }, - markdownEscape = { fg = "NONE" }, + markdownEscape = { fg = theme.ui.none }, -- markdownH1 = {}, -- markdownH2 = {}, -- markdownLinkText = {},