From afdefb7dc3cd88a0b57b3e70b00a8c3161497466 Mon Sep 17 00:00:00 2001 From: Squibid Date: Mon, 14 Jul 2025 19:42:40 -0400 Subject: [PATCH] fix mellow theming --- lua/conf/plugins/mellow.lua | 64 +++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/lua/conf/plugins/mellow.lua b/lua/conf/plugins/mellow.lua index d28d4ad..fe799fa 100644 --- a/lua/conf/plugins/mellow.lua +++ b/lua/conf/plugins/mellow.lua @@ -5,38 +5,46 @@ return { "mellow-theme/mellow.nvim", vim.g.mellow_variant = "dark" local c = require("mellow.colors")[vim.g.mellow_variant] - vim.g.mellow_highlight_overrides = { - -- stop inactive windows from having a darker bg - ["NormalNC"] = { link = "Normal" }, + if vim.g.mellow_variant == "dark" then + vim.g.mellow_highlight_overrides = { + -- stop inactive windows from having a darker bg + ["NormalNC"] = { link = "Normal" }, - -- make splits look cleaner - ["WinSeparator"] = { link = "Normal" }, + -- revert change with statusline coloring + ["StatusLine"] = { fg = c.white, bg = c.gray01 }, + ["StatusLineNC"] = { fg = c.bg_dark }, - -- make floats darker - ["NormalFloat"] = { fg = c.fg, bg = "#111111" }, - ["FloatBorder"] = { link = "NormalFloat" }, + -- make splits look cleaner + ["WinSeparator"] = { fg = c.gray01 }, - -- make diagnostics have an undercurl - ["DiagnosticUnderlineError"] = { fg = c.red, undercurl = true }, - ["DiagnosticUnderlineWarn"] = { fg = c.yellow, undercurl = true }, - ["DiagnosticUnderlineInfo"] = { fg = c.blue, undercurl = true }, - ["DiagnosticUnderlineHint"] = { fg = c.cyan, undercurl = true }, + -- make floats darker + ["NormalFloat"] = { fg = c.fg, bg = "#111111" }, + ["FloatBorder"] = { link = "NormalFloat" }, - -- make blink actually look nice - ["BlinkCmpMenu"] = { link = "NormalFloat" }, - ["BlinkCmpMenuBorder"] = { link = "BlinkCmpMenu" }, - ["BlinkCmpMenuSelection"] = { bg = c.gray01 }, - ["BlinkCmpLabelDeprecated"] = { link = "CmpItemAbbrDeprecated" }, + -- make diagnostics have an undercurl + ["DiagnosticUnderlineError"] = { fg = c.red, undercurl = true }, + ["DiagnosticUnderlineWarn"] = { fg = c.yellow, undercurl = true }, + ["DiagnosticUnderlineInfo"] = { fg = c.blue, undercurl = true }, + ["DiagnosticUnderlineHint"] = { fg = c.cyan, undercurl = true }, + ["DiagnosticHint"] = { fg = c.cyan }, -- revert - -- telescope styling so I can see when coding outside (real) - ["TelescopeResultsNormal"] = { bg = c.bg_dark }, - ["TelescopeResultsBorder"] = { link = "TelescopeResultsNormal" }, - ["TelescopeResultsTitle"] = { - bg = core.color.copyhl("TelescopeResultsNormal").background, - fg = core.color.copyhl("TelescopeResultsNormal").background - }, - ["TelescopePreviewNormal"] = { link = "NormalFloat" }, - ["TelescopePreviewBorder"] = { link = "TelescopePreviewNormal" } - } + -- make blink actually look nice + ["BlinkCmpMenu"] = { link = "NormalFloat" }, + ["BlinkCmpMenuBorder"] = { link = "BlinkCmpMenu" }, + ["BlinkCmpMenuSelection"] = { bg = c.gray01 }, + ["BlinkCmpLabelDeprecated"] = { link = "CmpItemAbbrDeprecated" }, + ["BlinkCmpLabelMatch"] = { link = "NormalFloat" }, -- reverted + + -- telescope styling so I can see when coding outside (real) + ["TelescopeResultsNormal"] = { bg = c.bg_dark }, + ["TelescopeResultsBorder"] = { link = "TelescopeResultsNormal" }, + ["TelescopeResultsTitle"] = { + bg = core.color.copyhl("TelescopeResultsNormal").background, + fg = core.color.copyhl("TelescopeResultsNormal").background + }, + ["TelescopePreviewNormal"] = { link = "NormalFloat" }, + ["TelescopePreviewBorder"] = { link = "TelescopePreviewNormal" } + } + end end }