From f64ce782b24e57a10f43b65a3f033c5d4b6d142e Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Fri, 29 Oct 2021 15:41:14 -0500 Subject: [PATCH] fix: broken fg and bg --- lua/catppuccino/core/color_palette.lua | 1 + lua/catppuccino/core/integrations/barbar.lua | 34 +++--- .../core/integrations/bufferline.lua | 28 ++--- lua/catppuccino/core/integrations/cmp.lua | 6 +- .../core/integrations/gitsigns.lua | 6 +- lua/catppuccino/core/integrations/hop.lua | 8 +- .../core/integrations/lightspeed.lua | 28 ++--- .../core/integrations/lsp_saga.lua | 2 +- .../core/integrations/lsp_trouble.lua | 6 +- .../core/integrations/native_lsp.lua | 6 +- lua/catppuccino/core/integrations/neogit.lua | 10 +- .../core/integrations/nvimtree.lua | 8 +- .../core/integrations/telescope.lua | 2 +- .../core/integrations/treesitter.lua | 6 +- .../core/integrations/ts_rainbow.lua | 14 +-- .../core/integrations/vim_sneak.lua | 4 +- .../core/integrations/which_key.lua | 2 +- lua/catppuccino/core/mapper.lua | 100 +++++++++--------- 18 files changed, 136 insertions(+), 135 deletions(-) diff --git a/lua/catppuccino/core/color_palette.lua b/lua/catppuccino/core/color_palette.lua index 1379e1d..45b0821 100644 --- a/lua/catppuccino/core/color_palette.lua +++ b/lua/catppuccino/core/color_palette.lua @@ -12,6 +12,7 @@ local color_palette = { catppuccino10 = "#7EA1C8", -- Cerulean Frost catppuccino11 = "#A7B6DC", -- Wild Blue Yonder catppuccino12 = "#63718B", -- Queen Blue + catppuccino } return color_palette diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/catppuccino/core/integrations/barbar.lua index 919c34a..f94c9d1 100644 --- a/lua/catppuccino/core/integrations/barbar.lua +++ b/lua/catppuccino/core/integrations/barbar.lua @@ -4,23 +4,23 @@ local M = {} function M.get(cp) return { - BufferCurrent = { catppuccino2 = cp.fg_gutter, fg = cp.fg }, - BufferCurrentIndex = { catppuccino2 = cp.fg_gutter, fg = cp.info }, - BufferCurrentMod = { catppuccino2 = cp.fg_gutter, fg = cp.warning }, - BufferCurrentSign = { catppuccino2 = cp.fg_gutter, fg = cp.info }, - BufferCurrentTarget = { catppuccino2 = cp.fg_gutter, fg = cp.catppuccino6 }, - BufferVisible = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.fg }, - BufferVisibleIndex = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.info }, - BufferVisibleMod = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.warning }, - BufferVisibleSign = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.info }, - BufferVisibleTarget = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.catppuccino6 }, - BufferInactive = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.catppuccino12 }, - BufferInactiveIndex = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.catppuccino12 }, - BufferInactiveMod = { catppuccino2 = cp.catppuccino2_statusline, fg = util.darken(cp.warning, 0.7) }, - BufferInactiveSign = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.border_highlight }, - BufferInactiveTarget = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.catppuccino6 }, - BufferTabpages = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.none }, - BufferTabpage = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.border_highlight }, + BufferCurrent = { bg = cp.catppuccino13, fg = cp.catppuccino11 }, + BufferCurrentIndex = { bg = cp.catppuccino13, fg = cp.info }, + BufferCurrentMod = { bg = cp.catppuccino13, fg = cp.warning }, + BufferCurrentSign = { bg = cp.catppuccino13, fg = cp.info }, + BufferCurrentTarget = { bg = cp.catppuccino13, fg = cp.catppuccino6 }, + BufferVisible = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino11 }, + BufferVisibleIndex = { bg = cp.catppuccino2_statusline, fg = cp.info }, + BufferVisibleMod = { bg = cp.catppuccino2_statusline, fg = cp.warning }, + BufferVisibleSign = { bg = cp.catppuccino2_statusline, fg = cp.info }, + BufferVisibleTarget = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino6 }, + BufferInactive = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino12 }, + BufferInactiveIndex = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino12 }, + BufferInactiveMod = { bg = cp.catppuccino2_statusline, fg = util.darken(cp.warning, 0.7) }, + BufferInactiveSign = { bg = cp.catppuccino2_statusline, fg = cp.border_highlight }, + BufferInactiveTarget = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino6 }, + BufferTabpages = { bg = cp.catppuccino2_statusline, fg = cp.none }, + BufferTabpage = { bg = cp.catppuccino2_statusline, fg = cp.border_highlight }, } end diff --git a/lua/catppuccino/core/integrations/bufferline.lua b/lua/catppuccino/core/integrations/bufferline.lua index b062e6e..36b9dcd 100644 --- a/lua/catppuccino/core/integrations/bufferline.lua +++ b/lua/catppuccino/core/integrations/bufferline.lua @@ -6,22 +6,22 @@ function M.get(cp) local inactive_clr = util.darken("#000000", 0.56) return { - BufferLineFill = { catppuccino2 = util.brighten(cp.catppuccino2, 0.05) }, - BufferLineBackground = { fg = cp.catppuccino1, catppuccino2 = inactive_clr }, - BufferLineBufferVisible = { fg = cp.catppuccino1, catppuccino2 = inactive_clr }, - BufferLineBufferSelected = { fg = cp.fg, catppuccino2 = cp.catppuccino2 }, - BufferLineTab = { fg = cp.catppuccino1, catppuccino2 = cp.catppuccino2 }, - BufferLineTabSelected = { fg = cp.catppuccino6, catppuccino2 = cp.catppuccino10 }, - BufferLineTabClose = { fg = cp.catppuccino6, catppuccino2 = inactive_clr }, - BufferLineIndicatorSelected = { fg = cp.catppuccino2, catppuccino2 = cp.catppuccino2 }, + BufferLineFill = { bg = util.brighten(cp.catppuccino2, 0.05) }, + BufferLineBackground = { fg = cp.catppuccino1, bg = inactive_clr }, + BufferLineBufferVisible = { fg = cp.catppuccino1, bg = inactive_clr }, + BufferLineBufferSelected = { fg = cp.catppuccino11, bg = cp.catppuccino2 }, + BufferLineTab = { fg = cp.catppuccino1, bg = cp.catppuccino2 }, + BufferLineTabSelected = { fg = cp.catppuccino6, bg = cp.catppuccino10 }, + BufferLineTabClose = { fg = cp.catppuccino6, bg = inactive_clr }, + BufferLineIndicatorSelected = { fg = cp.catppuccino2, bg = cp.catppuccino2 }, -- separators - BufferLineSeparator = { fg = inactive_clr, catppuccino2 = inactive_clr }, - BufferLineSeparatorVisible = { fg = inactive_clr, catppuccino2 = inactive_clr }, - BufferLineSeparatorSelected = { fg = inactive_clr, catppuccino2 = inactive_clr }, + BufferLineSeparator = { fg = inactive_clr, bg = inactive_clr }, + BufferLineSeparatorVisible = { fg = inactive_clr, bg = inactive_clr }, + BufferLineSeparatorSelected = { fg = inactive_clr, bg = inactive_clr }, -- close buttons - BufferLineCloseButton = { fg = cp.catppuccino1, catppuccino2 = inactive_clr }, - BufferLineCloseButtonVisible = { fg = cp.catppuccino1, catppuccino2 = inactive_clr }, - BufferLineCloseButtonSelected = { fg = cp.catppuccino6, catppuccino2 = cp.catppuccino2 }, + BufferLineCloseButton = { fg = cp.catppuccino1, bg = inactive_clr }, + BufferLineCloseButtonVisible = { fg = cp.catppuccino1, bg = inactive_clr }, + BufferLineCloseButtonSelected = { fg = cp.catppuccino6, bg = cp.catppuccino2 }, } end diff --git a/lua/catppuccino/core/integrations/cmp.lua b/lua/catppuccino/core/integrations/cmp.lua index 7802b28..8c1f1c7 100644 --- a/lua/catppuccino/core/integrations/cmp.lua +++ b/lua/catppuccino/core/integrations/cmp.lua @@ -5,10 +5,10 @@ function M.get(cp) return { CmpItemAbbr = { fg = util.darken(cp.catppuccino0, 0.56) }, CmpItemAbbrDeprecated = { fg = util.darken(cp.catppuccino0, 0.56), stlye = "strikethrough" }, - CmpItemAbbrMatch = { fg = cp.fg, style = "bold" }, - CmpItemAbbrMatchFuzzy = { fg = cp.fg, style = "bold" }, + CmpItemAbbrMatch = { fg = cp.catppuccino11, style = "bold" }, + CmpItemAbbrMatchFuzzy = { fg = cp.catppuccino11, style = "bold" }, CmpItemKind = { fg = cp.catppuccino10 }, - CmpItemMenu = { fg = cp.fg }, + CmpItemMenu = { fg = cp.catppuccino11 }, } end diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua index 605a22f..cd31431 100644 --- a/lua/catppuccino/core/integrations/gitsigns.lua +++ b/lua/catppuccino/core/integrations/gitsigns.lua @@ -2,9 +2,9 @@ local M = {} function M.get(cp) return { - GitSignsAdd = { fg = cp.diff.add, catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = cp.diff.change, catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| - GitSignsDelete = { fg = cp.diff.remove, catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| + GitSignsAdd = { fg = cp.diff.add, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = cp.diff.change, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = cp.diff.remove, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| } end diff --git a/lua/catppuccino/core/integrations/hop.lua b/lua/catppuccino/core/integrations/hop.lua index 9676bd8..c4e9697 100644 --- a/lua/catppuccino/core/integrations/hop.lua +++ b/lua/catppuccino/core/integrations/hop.lua @@ -2,10 +2,10 @@ local M = {} function M.get(cp) return { - HopNextKey = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino7, style = "bold,underline" }, - HopNextKey1 = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino10, style = "bold" }, - HopNextKey2 = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino8, style = "bold,italic" }, - HopUnmatched = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino12 }, + HopNextKey = { bg = cp.catppuccino2, fg = cp.catppuccino7, style = "bold,underline" }, + HopNextKey1 = { bg = cp.catppuccino2, fg = cp.catppuccino10, style = "bold" }, + HopNextKey2 = { bg = cp.catppuccino2, fg = cp.catppuccino8, style = "bold,italic" }, + HopUnmatched = { bg = cp.catppuccino2, fg = cp.catppuccino12 }, } end diff --git a/lua/catppuccino/core/integrations/lightspeed.lua b/lua/catppuccino/core/integrations/lightspeed.lua index 6e38001..f628b83 100644 --- a/lua/catppuccino/core/integrations/lightspeed.lua +++ b/lua/catppuccino/core/integrations/lightspeed.lua @@ -28,20 +28,20 @@ function M.get(cp) end return { - LightspeedLabel = {catppuccino2 = cp.catppuccino2_search, fg = cp.fg}, - LightspeedOverlapped = {catppuccino2 = cp.catppuccino2_visual, fg = cp.fg}, - LightspeedLabelDistant = {catppuccino2 = cp.catppuccino4, fg = cp.fg}, - LightspeedLabelDistantOverlapped = {catppuccino2 = cp.catppuccino4, fg = cp.fg}, - LightspeedShortcut = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino7, style = "italic"}, - LightspeedShortcutOverlapped = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino7, style = "bold"}, - LightspeedMaskedChar = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino6, style = "undercurl"}, - LightspeedGreyWash = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino12}, - LightspeedUnlabeledMatch = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino6, style = "underline"}, - LightspeedOneCharMatch = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino6, style = "underline"}, - LightspeedUniqueChar = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino0, style = "strikethrough"}, - LightspeedPendingOpArea = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino0, style = "strikethrough"}, - LightspeedPendingChangeOpArea = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino0, style = "strikethrough"}, - LightspeedCursor = {fg = cp.catppuccino2, catppuccino2 = cp.fg}, + LightspeedLabel = {bg = cp.catppuccino2_search, fg = cp.catppuccino11}, + LightspeedOverlapped = {bg = cp.catppuccino2_visual, fg = cp.catppuccino11}, + LightspeedLabelDistant = {bg = cp.catppuccino4, fg = cp.catppuccino11}, + LightspeedLabelDistantOverlapped = {bg = cp.catppuccino4, fg = cp.catppuccino11}, + LightspeedShortcut = {bg = cp.catppuccino2, fg = cp.catppuccino7, style = "italic"}, + LightspeedShortcutOverlapped = {bg = cp.catppuccino2, fg = cp.catppuccino7, style = "bold"}, + LightspeedMaskedChar = {bg = cp.catppuccino2, fg = cp.catppuccino6, style = "undercurl"}, + LightspeedGreyWash = {bg = cp.catppuccino2, fg = cp.catppuccino12}, + LightspeedUnlabeledMatch = {bg = cp.catppuccino2, fg = cp.catppuccino6, style = "underline"}, + LightspeedOneCharMatch = {bg = cp.catppuccino2, fg = cp.catppuccino6, style = "underline"}, + LightspeedUniqueChar = {bg = cp.catppuccino2, fg = cp.catppuccino0, style = "strikethrough"}, + LightspeedPendingOpArea = {bg = cp.catppuccino2, fg = cp.catppuccino0, style = "strikethrough"}, + LightspeedPendingChangeOpArea = {bg = cp.catppuccino2, fg = cp.catppuccino0, style = "strikethrough"}, + LightspeedCursor = {fg = cp.catppuccino2, bg = cp.catppuccino11}, } end diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua index 7041c08..c3b7db0 100644 --- a/lua/catppuccino/core/integrations/lsp_saga.lua +++ b/lua/catppuccino/core/integrations/lsp_saga.lua @@ -6,7 +6,7 @@ function M.get(cp) DiagnosticWarning = { fg = cp.warning }, DiagnosticInformation = { fg = cp.info }, DiagnosticHint = { fg = cp.hint }, - LspFloatWinNormal = { catppuccino2 = cp.catppuccino2_float }, + LspFloatWinNormal = { bg = cp.catppuccino2_float }, LspFloatWinBorder = { fg = cp.border_highlight }, LspSagaBorderTitle = { fg = cp.catppuccino3 }, LspSagaHoverBorder = { fg = cp.catppuccino10 }, diff --git a/lua/catppuccino/core/integrations/lsp_trouble.lua b/lua/catppuccino/core/integrations/lsp_trouble.lua index b2f0f4d..560593f 100644 --- a/lua/catppuccino/core/integrations/lsp_trouble.lua +++ b/lua/catppuccino/core/integrations/lsp_trouble.lua @@ -2,9 +2,9 @@ local M = {} function M.get(cp) return { - LspTroubleText = { fg = cp.fg_alt }, - LspTroubleCount = { fg = cp.catppuccino5, catppuccino2 = cp.fg_gutter }, - LspTroubleNormal = { fg = cp.fg_sidebar, catppuccino2 = cp.catppuccino2_sidebar }, + LspTroubleText = { fg = cp.catppuccino11_alt }, + LspTroubleCount = { fg = cp.catppuccino5, bg = cp.catppuccino13 }, + LspTroubleNormal = { fg = cp.catppuccino11_sidebar, bg = cp.catppuccino2_sidebar }, } end diff --git a/lua/catppuccino/core/integrations/native_lsp.lua b/lua/catppuccino/core/integrations/native_lsp.lua index a1da0a9..f59efaa 100644 --- a/lua/catppuccino/core/integrations/native_lsp.lua +++ b/lua/catppuccino/core/integrations/native_lsp.lua @@ -9,9 +9,9 @@ function M.get(cp) -- These groups are for the native LSP cliencp. Some other LSP clients may -- use these groups, or use their own. Consult your LSP client's -- documentation. - LspReferenceText = { catppuccino2 = cp.fg_gutter }, -- used for highlighting "text" references - LspReferenceRead = { catppuccino2 = cp.fg_gutter }, -- used for highlighting "read" references - LspReferenceWrite = { catppuccino2 = cp.fg_gutter }, -- used for highlighting "write" references + LspReferenceText = { bg = cp.catppuccino13 }, -- used for highlighting "text" references + LspReferenceRead = { bg = cp.catppuccino13 }, -- used for highlighting "read" references + LspReferenceWrite = { bg = cp.catppuccino13 }, -- used for highlighting "write" references -- hightlight diagnostics in numberline DiagnosticError = { fg = cp.error }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default DiagnosticWarn = { fg = cp.warning }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua index 75cfc05..69b2980 100644 --- a/lua/catppuccino/core/integrations/neogit.lua +++ b/lua/catppuccino/core/integrations/neogit.lua @@ -5,11 +5,11 @@ function M.get(cp) return { NeogitBranch = { fg = cp.catppuccino5 }, NeogitRemote = { fg = cp.catppuccino5 }, - NeogitHunkHeader = { catppuccino2 = cp.catppuccino2_highlight, fg = cp.fg }, - NeogitHunkHeaderHighlight = { catppuccino2 = cp.fg_gutter, fg = cp.catppuccino10 }, - NeogitDiffContextHighlight = { catppuccino2 = util.darken(cp.fg_gutter, 0.5), fg = cp.fg_alt }, - NeogitDiffDeleteHighlight = { fg = cp.diff.delete, catppuccino2 = cp.catppuccino2 }, - NeogitDiffAddHighlight = { fg = cp.diff.add, catppuccino2 = cp.catppuccino2 }, + NeogitHunkHeader = { bg = cp.catppuccino2_highlight, fg = cp.catppuccino11 }, + NeogitHunkHeaderHighlight = { bg = cp.catppuccino13, fg = cp.catppuccino10 }, + NeogitDiffContextHighlight = { bg = util.darken(cp.catppuccino13, 0.5), fg = cp.catppuccino11_alt }, + NeogitDiffDeleteHighlight = { fg = cp.diff.delete, bg = cp.catppuccino2 }, + NeogitDiffAddHighlight = { fg = cp.diff.add, bg = cp.catppuccino2 }, } end diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua index 8efc64e..bb8f67b 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -12,19 +12,19 @@ function M.get(cp) return { NvimTreeFolderName = { fg = cp.catppuccino10 }, NvimTreeFolderIcon = { fg = cp.catppuccino10 }, - NvimTreeNormal = { fg = cp.fg, catppuccino2 = cp.catppuccino2_sidebar }, + NvimTreeNormal = { fg = cp.catppuccino11, bg = cp.catppuccino2_sidebar }, NvimTreeOpenedFolderName = { fg = cp.catppuccino10 }, NvimTreeEmptyFolderName = { fg = cp.catppuccino10 }, NvimTreeIndentMarker = { fg = cp.catppuccino12 }, - NvimTreeVertSplit = { fg = cp.black, catppuccino2 = cp.black }, + NvimTreeVertSplit = { fg = cp.black, bg = cp.black }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, NvimTreeSymlink = { fg = cp.catppuccino5 }, - NvimTreeStatuslineNc = { fg = cp.black, catppuccino2 = cp.black }, + NvimTreeStatuslineNc = { fg = cp.black, bg = cp.black }, NvimTreeGitDirty = { fg = cp.diff.change }, NvimTreeGitNew = { fg = cp.diff.add }, NvimTreeGitDeleted = { fg = cp.diff.delete }, NvimTreeSpecialFile = { fg = cp.catppuccino3 }, - NvimTreeImageFile = { fg = cp.fg_sidebar }, + NvimTreeImageFile = { fg = cp.catppuccino11_sidebar }, NvimTreeOpenedFile = { fg = cp.catppuccino5 }, } end diff --git a/lua/catppuccino/core/integrations/telescope.lua b/lua/catppuccino/core/integrations/telescope.lua index 26f4d1d..411261c 100644 --- a/lua/catppuccino/core/integrations/telescope.lua +++ b/lua/catppuccino/core/integrations/telescope.lua @@ -4,7 +4,7 @@ function M.get(cp) return { TelescopeBorder = { fg = cp.border_highlight }, TelescopeSelectionCaret = { fg = cp.catppuccino3 }, - TelescopeSelection = { fg = cp.catppuccino3, catppuccino2 = cp.catppuccino2_highlight }, + TelescopeSelection = { fg = cp.catppuccino3, bg = cp.catppuccino2_highlight }, TelescopeMatching = { fg = cp.catppuccino10 }, } end diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index 23e5209..9d15c9f 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -14,9 +14,9 @@ function M.get(cp) TSBoolean = { fg = cp.catppuccino7, style = cnf.styles.keywords }, -- For booleans. -- TSCharacter = { }; -- For characters. -- TScatppuccino12 = { }; -- For catppuccino12 blocks. - TSNote = { fg = cp.catppuccino2, catppuccino2 = cp.info }, - TSWarning = { fg = cp.catppuccino2, catppuccino2 = cp.warning }, - TSDanger = { fg = cp.catppuccino2, catppuccino2 = cp.error }, + TSNote = { fg = cp.catppuccino2, bg = cp.info }, + TSWarning = { fg = cp.catppuccino2, bg = cp.warning }, + TSDanger = { fg = cp.catppuccino2, bg = cp.error }, TSConstructor = { fg = cp.catppuccino5 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. TSConditional = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to conditionnals. TSConstant = { fg = cp.catppuccino7 }, -- For constants diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua index 614cb0c..ca66282 100644 --- a/lua/catppuccino/core/integrations/ts_rainbow.lua +++ b/lua/catppuccino/core/integrations/ts_rainbow.lua @@ -2,13 +2,13 @@ local M = {} function M.get(cp) return { - rainbowcol1 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino6}, - rainbowcol2 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino8}, - rainbowcol3 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino9}, - rainbowcol4 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino10}, - rainbowcol5 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino5}, - rainbowcol6 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino3}, - rainbowcol7 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino0}, + rainbowcol1 = {bg = cp.catppuccino2, fg = cp.catppuccino6}, + rainbowcol2 = {bg = cp.catppuccino2, fg = cp.catppuccino8}, + rainbowcol3 = {bg = cp.catppuccino2, fg = cp.catppuccino9}, + rainbowcol4 = {bg = cp.catppuccino2, fg = cp.catppuccino10}, + rainbowcol5 = {bg = cp.catppuccino2, fg = cp.catppuccino5}, + rainbowcol6 = {bg = cp.catppuccino2, fg = cp.catppuccino3}, + rainbowcol7 = {bg = cp.catppuccino2, fg = cp.catppuccino0}, } end diff --git a/lua/catppuccino/core/integrations/vim_sneak.lua b/lua/catppuccino/core/integrations/vim_sneak.lua index e5747ee..4eb1660 100644 --- a/lua/catppuccino/core/integrations/vim_sneak.lua +++ b/lua/catppuccino/core/integrations/vim_sneak.lua @@ -2,8 +2,8 @@ local M = {} function M.get(cp) return { - Sneak = { fg = cp.catppuccino2_highlight, catppuccino2 = cp.catppuccino5 }, - SneakScope = { catppuccino2 = cp.catppuccino2_visual }, + Sneak = { fg = cp.catppuccino2_highlight, bg = cp.catppuccino5 }, + SneakScope = { bg = cp.catppuccino2_visual }, } end diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua index 5d83d45..ffaa4a8 100644 --- a/lua/catppuccino/core/integrations/which_key.lua +++ b/lua/catppuccino/core/integrations/which_key.lua @@ -7,7 +7,7 @@ function M.get(cp) WhichKeyDesc = { fg = cp.catppuccino5 }, WhichKeySeperator = { fg = cp.catppuccino12 }, WhichKeySeparator = { fg = cp.catppuccino12 }, - WhichKeyFloat = { catppuccino2 = cp.catppuccino2_sidebar }, + WhichKeyFloat = { bg = cp.catppuccino2_sidebar }, WhichKeyValue = { fg = cp.catppuccino12 }, } end diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index b4cfa50..bb973a6 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -10,7 +10,7 @@ local function get_properties() background = "dark", } - if colors_util.assertightness(color_palette.catppuccino2) then + if colors_util.assertightness(color_palette.bg) then props["background"] = "light" end @@ -21,60 +21,60 @@ local function get_base() local cp = color_palette return { - catppuccino12 = { fg = cp.catppuccino12, style = cnf.styles.catppuccino12s }, -- any catppuccino12 - ColorColumn = { catppuccino2 = cp.catppuccino2_visual }, -- used for the columns set with 'colorcolumn' + Comment = { fg = cp.catppuccino12, style = cnf.styles.comments }, -- just comments + ColorColumn = { bg = cp.catppuccino2_visual }, -- used for the columns set with 'colorcolumn' Conceal = { fg = cp.black }, -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor = { fg = cp.catppuccino2, catppuccino2 = cp.fg }, -- character under the cursor - lCursor = { fg = cp.catppuccino2, catppuccino2 = cp.fg }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - CursorIM = { fg = cp.catppuccino2, catppuccino2 = cp.fg }, -- like Cursor, but used when in IME mode |CursorIM| - CursorColumn = { catppuccino2 = cp.catppuccino2_highlight }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. - CursorLine = { catppuccino2 = cp.catppuccino2_highlight }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. + Cursor = { fg = cp.catppuccino2, bg = cp.catppuccino11 }, -- character under the cursor + lCursor = { fg = cp.catppuccino2, bg = cp.catppuccino11 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { fg = cp.catppuccino2, bg = cp.catppuccino11 }, -- like Cursor, but used when in IME mode |CursorIM| + CursorColumn = { bg = cp.catppuccino2_highlight }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. + CursorLine = { bg = cp.catppuccino2_highlight }, -- Screen-line at the cursor, when 'cursorline' is secp. Low-priority if foreground (ctermfg OR guifg) is not secp. Directory = { fg = cp.catppuccino10 }, -- directory names (and other special names in listings) EndOfBuffer = { fg = cp.catppuccino2 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. ErrorMsg = { fg = cp.error }, -- error messages on the command line VertSplit = { fg = cp.border }, -- the column separating vertically split windows - Folded = { fg = cp.catppuccino10, catppuccino2 = cp.fg_gutter }, -- line used for closed folds - FoldColumn = { catppuccino2 = cp.catppuccino2, fg = cp.catppuccino12 }, -- 'foldcolumn' - SignColumn = { catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2, fg = cp.fg_gutter }, -- column where |signs| are displayed - SignColumnSB = { catppuccino2 = cp.catppuccino2_sidebar, fg = cp.fg_gutter }, -- column where |signs| are displayed - Substitute = { catppuccino2 = cp.catppuccino6, fg = cp.black }, -- |:substitute| replacement text highlighting - LineNr = { fg = cp.fg_gutter }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. - CursorLineNr = { fg = cp.fg_alt }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. + Folded = { fg = cp.catppuccino10, bg = cp.catppuccino13 }, -- line used for closed folds + FoldColumn = { bg = cp.catppuccino2, fg = cp.catppuccino12 }, -- 'foldcolumn' + SignColumn = { bg = cnf.transparency and cp.none or cp.catppuccino2, fg = cp.catppuccino13 }, -- column where |signs| are displayed + SignColumnSB = { bg = cp.catppuccino2_sidebar, fg = cp.catppuccino13 }, -- column where |signs| are displayed + Substitute = { bg = cp.catppuccino6, fg = cp.black }, -- |:substitute| replacement text highlighting + LineNr = { fg = cp.catppuccino13 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. + CursorLineNr = { fg = cp.catppuccino11_alt }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline. MatchParen = { fg = cp.catppuccino7, style = "bold" }, -- The character under the cursor or just before it, if it is a paicatppuccino6 bracket, and its match. |pi_paren.txt| - ModeMsg = { fg = cp.fg_alt, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") + ModeMsg = { fg = cp.catppuccino11_alt, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") MsgArea = { fg = cp.catppuccino0 }, -- Area for messages and cmdline MsgSeparator = {}, -- Separator for scrolled messages, `msgsep` flag of 'display' MoreMsg = { fg = cp.catppuccino10 }, -- |more-prompt| NonText = { fg = cp.catppuccino12 }, -- '@' 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|. - Normal = { fg = cp.fg, catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text - NormalNC = { fg = cp.fg, catppuccino2 = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text in non-current windows - NormalSB = { fg = cp.fg_sidebar, catppuccino2 = cp.catppuccino2_sidebar }, -- normal text in non-current windows - NormalFloat = { fg = cp.fg, catppuccino2 = cp.catppuccino2_float }, -- Normal text in floating windows. + Normal = { fg = cp.catppuccino11, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text + NormalNC = { fg = cp.catppuccino11, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- normal text in non-current windows + NormalSB = { fg = cp.catppuccino11_sidebar, bg = cp.catppuccino2_sidebar }, -- normal text in non-current windows + NormalFloat = { fg = cp.catppuccino11, bg = cp.catppuccino2_float }, -- Normal text in floating windows. FloatBorder = { fg = cp.border_highlight }, - Pmenu = { catppuccino2 = cp.catppuccino2_popup, fg = cp.fg }, -- Popup menu: normal item. - PmenuSel = { fg = cp.catppuccino3, catppuccino2 = util.darken(cp.fg_gutter, 0.8) }, -- Popup menu: selected item. - PmenuSbar = { catppuccino2 = util.lighten(cp.catppuccino2_popup, 0.95) }, -- Popup menu: scrollbar. - PmenuThumb = { catppuccino2 = cp.fg_gutter }, -- Popup menu: Thumb of the scrollbar. + Pmenu = { bg = cp.catppuccino2_popup, fg = cp.catppuccino11 }, -- Popup menu: normal item. + PmenuSel = { fg = cp.catppuccino3, bg = util.darken(cp.catppuccino13, 0.8) }, -- Popup menu: selected item. + PmenuSbar = { bg = util.lighten(cp.catppuccino2_popup, 0.95) }, -- Popup menu: scrollbar. + PmenuThumb = { bg = cp.catppuccino13 }, -- Popup menu: Thumb of the scrollbar. Question = { fg = cp.catppuccino10 }, -- |hit-enter| prompt and yes/no questions - QuickFixLine = { catppuccino2 = cp.catppuccino2_visual, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. - Search = { catppuccino2 = cp.catppuccino2_search, fg = cp.fg }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp. - IncSearch = { catppuccino2 = cp.catppuccino3, fg = cp.black }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" - SpecialKey = { fg = cp.fg }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| + QuickFixLine = { bg = cp.catppuccino2_visual, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. + Search = { bg = cp.catppuccino2_search, fg = cp.catppuccino11 }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp. + IncSearch = { bg = cp.catppuccino3, fg = cp.black }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + SpecialKey = { fg = cp.catppuccino11 }, -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| SpellBad = { sp = cp.error, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. SpellCap = { sp = cp.warning, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal = { sp = cp.info, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare = { sp = cp.hint, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine = { fg = cp.fg_sidebar, catppuccino2 = cp.catppuccino2_statusline }, -- status line of current window - StatusLineNC = { fg = cp.fg_gutter, catppuccino2 = cp.catppuccino2_statusline }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. - TabLine = { catppuccino2 = cp.catppuccino2_statusline, fg = cp.fg_gutter }, -- tab pages line, not active tab page label - TabLineFill = { catppuccino2 = cp.black }, -- tab pages line, where there are no labels - TabLineSel = { fg = cp.fg_alt, catppuccino2 = cp.fg_gutter }, -- tab pages line, active tab page label + StatusLine = { fg = cp.catppuccino11_sidebar, bg = cp.catppuccino2_statusline }, -- status line of current window + StatusLineNC = { fg = cp.catppuccino13, bg = cp.catppuccino2_statusline }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + TabLine = { bg = cp.catppuccino2_statusline, fg = cp.catppuccino13 }, -- tab pages line, not active tab page label + TabLineFill = { bg = cp.black }, -- tab pages line, where there are no labels + TabLineSel = { fg = cp.catppuccino11_alt, bg = cp.catppuccino13 }, -- tab pages line, active tab page label Title = { fg = cp.catppuccino10, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcp. - Visual = { catppuccino2 = cp.catppuccino2_visual }, -- Visual mode selection - VisualNOS = { catppuccino2 = cp.catppuccino2_visual }, -- Visual mode selection when vim is "Not Owning the Selection". + Visual = { bg = cp.catppuccino2_visual }, -- Visual mode selection + VisualNOS = { bg = cp.catppuccino2_visual }, -- Visual mode selection when vim is "Not Owning the Selection". WarningMsg = { fg = cp.warning }, -- warning messages - Whitespace = { fg = cp.fg_gutter }, -- "nbsp", "space", "tab" and "trail" in 'listchars' - WildMenu = { catppuccino2 = cp.catppuccino2_visual }, -- current match in 'wildmenu' completion + Whitespace = { fg = cp.catppuccino13 }, -- "nbsp", "space", "tab" and "trail" in 'listchars' + WildMenu = { bg = cp.catppuccino2_visual }, -- current match in 'wildmenu' completion -- These groups are not listed as default vim groups, -- but they are defacto standard group names for syntax highlighting. -- catppuccino12ed out groups should chain up to their "prefercatppuccino6" group by @@ -95,7 +95,7 @@ local function get_base() Conditional = { fg = cp.catppuccino6 }, -- if, then, else, endif, switch, etcp. Repeat = { fg = cp.catppuccino6 }, -- for, do, while, etcp. Label = { fg = cp.catppuccino4 }, -- case, default, etcp. - Operator = { fg = cp.fg_alt }, -- "sizeof", "+", "*", etcp. + Operator = { fg = cp.catppuccino11_alt }, -- "sizeof", "+", "*", etcp. Keyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- any other keyword -- Exception = { }, -- try, catch, throw @@ -123,24 +123,24 @@ local function get_base() -- Ignore = { }, -- (prefercatppuccino6) left blank, hidden |hl-Ignore| Error = { fg = cp.error }, -- (prefercatppuccino6) any erroneous construct - Todo = { catppuccino2 = cp.catppuccino9, fg = cp.catppuccino2, style = "bold" }, -- (prefercatppuccino6) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Todo = { bg = cp.catppuccino9, fg = cp.catppuccino2, style = "bold" }, -- (prefercatppuccino6) anything that needs extra attention; mostly the keywords TODO FIXME and XXX qfLineNr = { fg = cp.catppuccino9 }, qfFileName = { fg = cp.catppuccino10 }, htmlH1 = { fg = cp.catppuccino5, style = "bold" }, htmlH2 = { fg = cp.catppuccino10, style = "bold" }, -- mkdHeading = { fg = cp.catppuccino7, style = "bold" }, - -- mkdCode = { catppuccino2 = cp.terminal_black, fg = cp.fg }, - mkdCodeDelimiter = { catppuccino2 = cp.terminal_black, fg = cp.fg }, + -- mkdCode = { bg = cp.terminal_black, fg = cp.catppuccino11 }, + mkdCodeDelimiter = { bg = cp.terminal_black, fg = cp.catppuccino11 }, mkdCodeStart = { fg = cp.catppuccino3, style = "bold" }, mkdCodeEnd = { fg = cp.catppuccino3, style = "bold" }, -- mkdLink = { fg = cp.catppuccino10, style = "underline" }, -- debugging - debugPC = { catppuccino2 = cp.catppuccino2_sidebar }, -- used for highlighting the current line in terminal-debug - debugBreakpoint = { catppuccino2 = util.darken(cp.info, 0.1), fg = cp.info }, -- used for breakpoint colors in terminal-debug + debugPC = { bg = cp.catppuccino2_sidebar }, -- used for highlighting the current line in terminal-debug + debugBreakpoint = { bg = util.darken(cp.info, 0.1), fg = cp.info }, -- used for breakpoint colors in terminal-debug -- illuminate - illuminatedWord = { catppuccino2 = cp.fg_gutter }, - illuminatedCurWord = { catppuccino2 = cp.fg_gutter }, + illuminatedWord = { bg = cp.catppuccino13 }, + illuminatedCurWord = { bg = cp.catppuccino13 }, -- diff diffAdded = { fg = cp.diff.add }, diffRemoved = { fg = cp.diff.delete }, @@ -150,10 +150,10 @@ local function get_base() diffFile = { fg = cp.catppuccino10 }, diffLine = { fg = cp.catppuccino12 }, diffIndexLine = { fg = cp.catppuccino5 }, - DiffAdd = { fg = cp.diff.add, catppuccino2 = cp.catppuccino2 }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = cp.diff.change, catppuccino2 = cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| - DiffDelete = { fg = cp.diff.delete, catppuccino2 = cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| - DiffText = { fg = cp.diff.text, catppuccino2 = cp.catppuccino2 }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd = { fg = cp.diff.add, bg = cp.catppuccino2 }, -- diff mode: Added line |diff.txt| + DiffChange = { fg = cp.diff.change, bg = cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| + DiffDelete = { fg = cp.diff.delete, bg = cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| + DiffText = { fg = cp.diff.text, bg = cp.catppuccino2 }, -- diff mode: Changed text within a changed line |diff.txt| -- NeoVim healthError = { fg = cp.error }, healthSuccess = { fg = cp.catppuccino8 }, @@ -166,7 +166,7 @@ local function get_base() GlyphPalette3 = { fg = cp.catppuccino9 }, GlyphPalette4 = { fg = cp.catppuccino10 }, GlyphPalette6 = { fg = cp.catppuccino8 }, - GlyphPalette7 = { fg = cp.fg }, + GlyphPalette7 = { fg = cp.catppuccino11 }, GlyphPalette9 = { fg = cp.catppuccino6 }, } end