diff --git a/lua/darkbox.lua b/lua/darkbox.lua index 9409f0b..4825986 100644 --- a/lua/darkbox.lua +++ b/lua/darkbox.lua @@ -201,20 +201,15 @@ local function get_groups() DarkboxAquaBold = { fg = colors.aqua, bold = config.bold }, DarkboxOrange = { fg = colors.orange }, DarkboxOrangeBold = { fg = colors.orange, bold = config.bold }, - DarkboxRedSign = config.transparent_mode and { fg = colors.red, reverse = config.invert_signs } - or { fg = colors.red, bg = colors.background_1, reverse = config.invert_signs }, - DarkboxGreenSign = config.transparent_mode and { fg = colors.green, reverse = config.invert_signs } - or { fg = colors.green, bg = colors.background_1, reverse = config.invert_signs }, - DarkboxYellowSign = config.transparent_mode and { fg = colors.yellow, reverse = config.invert_signs } - or { fg = colors.yellow, bg = colors.background_1, reverse = config.invert_signs }, - DarkboxBlueSign = config.transparent_mode and { fg = colors.blue, reverse = config.invert_signs } - or { fg = colors.blue, bg = colors.background_1, reverse = config.invert_signs }, - DarkboxPurpleSign = config.transparent_mode and { fg = colors.purple, reverse = config.invert_signs } - or { fg = colors.purple, bg = colors.background_1, reverse = config.invert_signs }, - DarkboxAquaSign = config.transparent_mode and { fg = colors.aqua, reverse = config.invert_signs } - or { fg = colors.aqua, bg = colors.background_1, reverse = config.invert_signs }, - DarkboxOrangeSign = config.transparent_mode and { fg = colors.orange, reverse = config.invert_signs } - or { fg = colors.orange, bg = colors.background_1, reverse = config.invert_signs }, + -- Sign groups inherit the editor background; adding a gray block contradicts + -- the pure-black `background` and creates disjoint gutter chrome. + DarkboxRedSign = { fg = colors.red, bg = colors.background, reverse = config.invert_signs }, + DarkboxGreenSign = { fg = colors.green, bg = colors.background, reverse = config.invert_signs }, + DarkboxYellowSign = { fg = colors.yellow, bg = colors.background, reverse = config.invert_signs }, + DarkboxBlueSign = { fg = colors.blue, bg = colors.background, reverse = config.invert_signs }, + DarkboxPurpleSign = { fg = colors.purple, bg = colors.background, reverse = config.invert_signs }, + DarkboxAquaSign = { fg = colors.aqua, bg = colors.background, reverse = config.invert_signs }, + DarkboxOrangeSign = { fg = colors.orange, bg = colors.background, reverse = config.invert_signs }, DarkboxRedUnderline = { undercurl = config.undercurl, sp = colors.red }, DarkboxGreenUnderline = { undercurl = config.undercurl, sp = colors.green }, DarkboxYellowUnderline = { undercurl = config.undercurl, sp = colors.yellow }, @@ -245,12 +240,12 @@ local function get_groups() CurSearch = { link = "IncSearch" }, QuickFixLine = { link = "DarkboxPurple" }, Underlined = { fg = colors.blue, underline = config.underline }, - StatusLine = { fg = colors.background_2, bg = colors.foreground_1, reverse = config.inverse }, - StatusLineNC = { fg = colors.background_1, bg = colors.foreground_4, reverse = config.inverse }, + StatusLine = { fg = colors.foreground, bg = colors.background }, + StatusLineNC = { fg = colors.foreground_4, bg = colors.background }, WinBar = { fg = colors.foreground_4, bg = colors.background }, WinBarNC = { fg = colors.foreground_3, bg = colors.background_1 }, - WinSeparator = config.transparent_mode and { fg = colors.background_3, bg = nil } - or { fg = colors.background_3, bg = colors.background }, + WinSeparator = config.transparent_mode and { fg = colors.background_2, bg = nil } + or { fg = colors.background_2, bg = colors.background }, WildMenu = { fg = colors.blue, bg = colors.background_2, bold = config.bold }, Directory = { link = "DarkboxGreenBold" }, Title = { link = "DarkboxGreenBold" }, @@ -297,10 +292,12 @@ local function get_groups() StorageClass = { link = "DarkboxOrange" }, Structure = { link = "DarkboxAqua" }, Typedef = { link = "DarkboxYellow" }, - Pmenu = { fg = colors.foreground_1, bg = colors.background_2 }, - PmenuSel = { fg = colors.background_2, bg = colors.blue, bold = config.bold }, - PmenuSbar = { bg = colors.background_2 }, - PmenuThumb = { bg = colors.background_4 }, + Pmenu = { fg = colors.foreground, bg = colors.background }, + PmenuSel = { fg = colors.background, bg = colors.blue, bold = config.bold }, + PmenuSbar = { bg = colors.background }, + PmenuThumb = { bg = colors.background_2 }, + FloatBorder = { fg = colors.background_2, bg = colors.background }, + FloatTitle = { fg = colors.foreground, bg = colors.background, bold = config.bold }, DiffDelete = { bg = colors.dark_red }, DiffAdd = { bg = colors.dark_green }, DiffChange = { bg = colors.dark_aqua }, @@ -345,12 +342,12 @@ local function get_groups() GitSignsDelete = { fg = colors.red }, -- barbar.nvim - BufferCurrent = { fg = colors.foreground, bg = colors.background, bold = true }, - BufferCurrentIndex = { fg = colors.yellow, bg = colors.background, bold = true }, - BufferCurrentMod = { fg = colors.orange, bg = colors.background }, - BufferCurrentSign = { fg = colors.yellow, bg = colors.background }, - BufferCurrentIcon = { fg = colors.aqua, bg = colors.background }, - BufferCurrentTarget = { fg = colors.red, bg = colors.background, bold = true }, + BufferCurrent = { fg = colors.foreground, bg = colors.background, bold = true }, + BufferCurrentIndex = { fg = colors.foreground, bg = colors.background, bold = true }, + BufferCurrentMod = { fg = colors.orange, bg = colors.background }, + BufferCurrentSign = { fg = colors.yellow, bg = colors.background }, + BufferCurrentIcon = { link = "BufferCurrent" }, + BufferCurrentTarget = { fg = colors.red, bg = colors.background, bold = true }, BufferCurrentADDED = { fg = colors.green, bg = colors.background }, BufferCurrentCHANGED = { fg = colors.orange, bg = colors.background }, BufferCurrentDELETED = { fg = colors.red, bg = colors.background }, @@ -374,7 +371,7 @@ local function get_groups() BufferTabpages = { fg = colors.yellow, bg = colors.background, bold = true }, BufferTabpageFill = { fg = colors.foreground_4, bg = colors.background }, - BufferOffset = { fg = colors.foreground_3, bg = colors.background }, + BufferOffset = { fg = colors.foreground, bg = colors.background, bold = true }, BufferAlternate = { fg = colors.foreground_2, bg = colors.background }, BufferAlternateSign = { fg = colors.foreground_3, bg = colors.background }, BufferAlternateIndex = { fg = colors.foreground_3, bg = colors.background }, @@ -492,6 +489,49 @@ local function get_groups() CmpItemKindConstant = { link = "DarkboxOrange" }, CmpItemKindStruct = { link = "DarkboxYellow" }, CmpItemKindTypeParameter = { link = "DarkboxYellow" }, + + -- blink.cmp: mirror the nvim-cmp conventions so the completion UI is + -- themed without any plugin-side wiring. + BlinkCmpMenu = { link = "NormalFloat" }, + BlinkCmpMenuBorder = { link = "FloatBorder" }, + BlinkCmpMenuSelection = { link = "PmenuSel" }, + BlinkCmpDoc = { link = "NormalFloat" }, + BlinkCmpDocBorder = { link = "FloatBorder" }, + BlinkCmpSignatureHelp = { link = "NormalFloat" }, + BlinkCmpSignatureHelpBorder = { link = "FloatBorder" }, + BlinkCmpLabel = { link = "NormalFloat" }, + BlinkCmpLabelMatch = { link = "DarkboxGreenBold" }, + BlinkCmpLabelDetail = { link = "Comment" }, + BlinkCmpLabelDescription = { link = "Comment" }, + BlinkCmpLabelDeprecated = { fg = colors.foreground_4, strikethrough = true }, + BlinkCmpGhostText = { link = "Comment" }, + BlinkCmpKind = { link = "CmpItemKind" }, + BlinkCmpKindText = { link = "CmpItemKindText" }, + BlinkCmpKindMethod = { link = "CmpItemKindMethod" }, + BlinkCmpKindFunction = { link = "CmpItemKindFunction" }, + BlinkCmpKindConstructor = { link = "CmpItemKindConstructor" }, + BlinkCmpKindField = { link = "CmpItemKindField" }, + BlinkCmpKindVariable = { link = "CmpItemKindVariable" }, + BlinkCmpKindClass = { link = "CmpItemKindClass" }, + BlinkCmpKindInterface = { link = "CmpItemKindInterface" }, + BlinkCmpKindModule = { link = "CmpItemKindModule" }, + BlinkCmpKindProperty = { link = "CmpItemKindProperty" }, + BlinkCmpKindUnit = { link = "CmpItemKindUnit" }, + BlinkCmpKindValue = { link = "CmpItemKindValue" }, + BlinkCmpKindEnum = { link = "CmpItemKindEnum" }, + BlinkCmpKindKeyword = { link = "CmpItemKindKeyword" }, + BlinkCmpKindSnippet = { link = "CmpItemKindSnippet" }, + BlinkCmpKindColor = { link = "CmpItemKindColor" }, + BlinkCmpKindFile = { link = "CmpItemKindFile" }, + BlinkCmpKindReference = { link = "CmpItemKindReference" }, + BlinkCmpKindFolder = { link = "CmpItemKindFolder" }, + BlinkCmpKindEnumMember = { link = "CmpItemKindEnumMember" }, + BlinkCmpKindConstant = { link = "CmpItemKindConstant" }, + BlinkCmpKindStruct = { link = "CmpItemKindStruct" }, + BlinkCmpKindEvent = { link = "CmpItemKindEvent" }, + BlinkCmpKindOperator = { link = "CmpItemKindOperator" }, + BlinkCmpKindTypeParameter = { link = "CmpItemKindTypeParameter" }, + diffAdded = { link = "DiffAdd" }, diffRemoved = { link = "DiffDelete" }, diffChanged = { link = "DiffChange" },