From 9bf20246176d4e1b24c1ed8d75dd9d3fef788734 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Sun, 31 Oct 2021 23:25:25 -0500 Subject: [PATCH] renames katppuccino1 & 2 --- lua/catppuccino/core/color_palette.lua | 4 +- .../core/integrations/bufferline.lua | 8 ++-- .../core/integrations/dashboard.lua | 2 +- .../core/integrations/gitsigns.lua | 6 +-- lua/catppuccino/core/integrations/hop.lua | 8 ++-- .../core/integrations/lightspeed.lua | 20 ++++----- .../core/integrations/lsp_saga.lua | 4 +- .../core/integrations/markdown.lua | 4 +- lua/catppuccino/core/integrations/neogit.lua | 4 +- .../core/integrations/nvimtree.lua | 2 +- .../core/integrations/telescope.lua | 4 +- .../core/integrations/treesitter.lua | 20 ++++----- .../core/integrations/ts_rainbow.lua | 14 +++--- .../core/integrations/which_key.lua | 2 +- lua/catppuccino/core/mapper.lua | 44 +++++++++---------- 15 files changed, 73 insertions(+), 73 deletions(-) diff --git a/lua/catppuccino/core/color_palette.lua b/lua/catppuccino/core/color_palette.lua index e6dc705..c42acdb 100644 --- a/lua/catppuccino/core/color_palette.lua +++ b/lua/catppuccino/core/color_palette.lua @@ -1,7 +1,7 @@ local color_palette = { katppuccino0 = "#F2F2F7", -- Ghost White - catppuccino2 = "#16131F", -- Xiketic - catppuccino3 = "#EA31B5", -- Fashion Fuchsia + katppuccino1 = "#16131F", -- Xiketic + katppuccino2 = "#EA31B5", -- Fashion Fuchsia catppuccino4 = "#AE9AD6", -- Blue Shell catppuccino5 = "#F0A8E4", -- Orchid Crayola catppuccino6 = "#E28D8D", -- New York Pink diff --git a/lua/catppuccino/core/integrations/bufferline.lua b/lua/catppuccino/core/integrations/bufferline.lua index c823ed8..eecd4ee 100644 --- a/lua/catppuccino/core/integrations/bufferline.lua +++ b/lua/catppuccino/core/integrations/bufferline.lua @@ -8,11 +8,11 @@ function M.get(cp) BufferLineFill = { bg = cp.catppuccino16 }, BufferLineBackground = { fg = cp.catppuccino13, bg = inactive_clr }, BufferLineBufferVisible = { fg = cp.catppuccino13, bg = inactive_clr }, - BufferLineBufferSelected = { fg = cp.katppuccino0, bg = cp.catppuccino2 }, - BufferLineTab = { fg = cp.catppuccino13, bg = cp.catppuccino2 }, + BufferLineBufferSelected = { fg = cp.katppuccino0, bg = cp.katppuccino1 }, + BufferLineTab = { fg = cp.catppuccino13, bg = cp.katppuccino1 }, BufferLineTabSelected = { fg = cp.catppuccino6, bg = cp.catppuccino10 }, BufferLineTabClose = { fg = cp.catppuccino6, bg = inactive_clr }, - BufferLineIndicatorSelected = { fg = cp.catppuccino2, bg = cp.catppuccino2 }, + BufferLineIndicatorSelected = { fg = cp.katppuccino1, bg = cp.katppuccino1 }, -- separators BufferLineSeparator = { fg = inactive_clr, bg = inactive_clr }, BufferLineSeparatorVisible = { fg = inactive_clr, bg = inactive_clr }, @@ -20,7 +20,7 @@ function M.get(cp) -- close buttons BufferLineCloseButton = { fg = cp.catppuccino13, bg = inactive_clr }, BufferLineCloseButtonVisible = { fg = cp.catppuccino13, bg = inactive_clr }, - BufferLineCloseButtonSelected = { fg = cp.catppuccino6, bg = cp.catppuccino2 }, + BufferLineCloseButtonSelected = { fg = cp.catppuccino6, bg = cp.katppuccino1 }, } end diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/catppuccino/core/integrations/dashboard.lua index d4651b6..91f8295 100644 --- a/lua/catppuccino/core/integrations/dashboard.lua +++ b/lua/catppuccino/core/integrations/dashboard.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - DashboardShortCut = { fg = cp.catppuccino3 }, + DashboardShortCut = { fg = cp.katppuccino2 }, DashboardHeader = { fg = cp.catppuccino9 }, DashboardCenter = { fg = cp.catppuccino8 }, DashboardFooter = { fg = cp.catppuccino7, style = "italic" }, diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua index e72c85e..1efbab2 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.catppuccino10, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Added line |diff.txt| - GitSignsChange = { fg = cp.catppuccino9, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| - GitSignsDelete = { fg = cp.catppuccino6, bg = cnf.transparency and cp.none or cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| + GitSignsAdd = { fg = cp.catppuccino10, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Added line |diff.txt| + GitSignsChange = { fg = cp.catppuccino9, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Changed line |diff.txt| + GitSignsDelete = { fg = cp.catppuccino6, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt| } end diff --git a/lua/catppuccino/core/integrations/hop.lua b/lua/catppuccino/core/integrations/hop.lua index c4e9697..902876f 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 = { 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 }, + HopNextKey = { bg = cp.katppuccino1, fg = cp.catppuccino7, style = "bold,underline" }, + HopNextKey1 = { bg = cp.katppuccino1, fg = cp.catppuccino10, style = "bold" }, + HopNextKey2 = { bg = cp.katppuccino1, fg = cp.catppuccino8, style = "bold,italic" }, + HopUnmatched = { bg = cp.katppuccino1, fg = cp.catppuccino12 }, } end diff --git a/lua/catppuccino/core/integrations/lightspeed.lua b/lua/catppuccino/core/integrations/lightspeed.lua index 04d9052..6f044c0 100644 --- a/lua/catppuccino/core/integrations/lightspeed.lua +++ b/lua/catppuccino/core/integrations/lightspeed.lua @@ -32,16 +32,16 @@ function M.get(cp) LightspeedOverlapped = {bg = cp.catppuccino13, 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.katppuccino0, style = "strikethrough"}, - LightspeedPendingOpArea = {bg = cp.catppuccino2, fg = cp.katppuccino0, style = "strikethrough"}, - LightspeedPendingChangeOpArea = {bg = cp.catppuccino2, fg = cp.katppuccino0, style = "strikethrough"}, - LightspeedCursor = {fg = cp.catppuccino2, bg = cp.catppuccino11}, + LightspeedShortcut = {bg = cp.katppuccino1, fg = cp.catppuccino7, style = "italic"}, + LightspeedShortcutOverlapped = {bg = cp.katppuccino1, fg = cp.catppuccino7, style = "bold"}, + LightspeedMaskedChar = {bg = cp.katppuccino1, fg = cp.catppuccino6, style = "undercurl"}, + LightspeedGreyWash = {bg = cp.katppuccino1, fg = cp.catppuccino12}, + LightspeedUnlabeledMatch = {bg = cp.katppuccino1, fg = cp.catppuccino6, style = "underline"}, + LightspeedOneCharMatch = {bg = cp.katppuccino1, fg = cp.catppuccino6, style = "underline"}, + LightspeedUniqueChar = {bg = cp.katppuccino1, fg = cp.katppuccino0, style = "strikethrough"}, + LightspeedPendingOpArea = {bg = cp.katppuccino1, fg = cp.katppuccino0, style = "strikethrough"}, + LightspeedPendingChangeOpArea = {bg = cp.katppuccino1, fg = cp.katppuccino0, style = "strikethrough"}, + LightspeedCursor = {fg = cp.katppuccino1, bg = cp.catppuccino11}, } end diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua index a7641ef..19a1be9 100644 --- a/lua/catppuccino/core/integrations/lsp_saga.lua +++ b/lua/catppuccino/core/integrations/lsp_saga.lua @@ -8,7 +8,7 @@ function M.get(cp) DiagnosticHint = { fg = cp.hint }, LspFloatWinNormal = { bg = cp.catppuccino14 }, LspFloatWinBorder = { fg = cp.catppuccino10 }, - LspSagaBorderTitle = { fg = cp.catppuccino3 }, + LspSagaBorderTitle = { fg = cp.katppuccino2 }, LspSagaHoverBorder = { fg = cp.catppuccino10 }, LspSagaRenameBorder = { fg = cp.catppuccino8 }, LspSagaDefPreviewBorder = { fg = cp.catppuccino8 }, @@ -21,7 +21,7 @@ function M.get(cp) DefinitionCount = { fg = cp.purple }, DefinitionIcon = { fg = cp.catppuccino10 }, ReferencesIcon = { fg = cp.catppuccino10 }, - TargetWord = { fg = cp.catppuccino3 }, + TargetWord = { fg = cp.katppuccino2 }, } end return M diff --git a/lua/catppuccino/core/integrations/markdown.lua b/lua/catppuccino/core/integrations/markdown.lua index bf88dae..c983974 100644 --- a/lua/catppuccino/core/integrations/markdown.lua +++ b/lua/catppuccino/core/integrations/markdown.lua @@ -3,8 +3,8 @@ local M = {} function M.get(cp) return { markdownHeadingDelimiter = { fg = cp.catppuccino7, style = "bold" }, - markdownCode = { fg = cp.catppuccino3 }, - markdownCodeBlock = { fg = cp.catppuccino3 }, + markdownCode = { fg = cp.katppuccino2 }, + markdownCodeBlock = { fg = cp.katppuccino2 }, markdownH1 = { fg = cp.catppuccino5, style = "bold" }, markdownH2 = { fg = cp.catppuccino10, style = "bold" }, markdownLinkText = { fg = cp.catppuccino10, style = "underline" }, diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua index ed94eea..64eee2d 100644 --- a/lua/catppuccino/core/integrations/neogit.lua +++ b/lua/catppuccino/core/integrations/neogit.lua @@ -7,8 +7,8 @@ function M.get(cp) NeogitHunkHeader = { bg = cp.catppuccino10, fg = cp.catppuccino11 }, NeogitHunkHeaderHighlight = { bg = cp.catppuccino13, fg = cp.catppuccino10 }, NeogitDiffContextHighlight = { bg = cp.catppuccino16, fg = cp.katppuccino0 }, - NeogitDiffDeleteHighlight = { fg = cp.catppuccino6, bg = cp.catppuccino2 }, - NeogitDiffAddHighlight = { fg = cp.catppuccino10, bg = cp.catppuccino2 }, + NeogitDiffDeleteHighlight = { fg = cp.catppuccino6, bg = cp.katppuccino1 }, + NeogitDiffAddHighlight = { fg = cp.catppuccino10, bg = cp.katppuccino1 }, } end diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua index 7a71dac..d4ce014 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -23,7 +23,7 @@ function M.get(cp) NvimTreeGitDirty = { fg = cp.catppuccino9 }, NvimTreeGitNew = { fg = cp.catppuccino10 }, NvimTreeGitDeleted = { fg = cp.catppuccino6 }, - NvimTreeSpecialFile = { fg = cp.catppuccino3 }, + NvimTreeSpecialFile = { fg = cp.katppuccino2 }, NvimTreeImageFile = { fg = cp.catppuccino11 }, NvimTreeOpenedFile = { fg = cp.catppuccino5 }, } diff --git a/lua/catppuccino/core/integrations/telescope.lua b/lua/catppuccino/core/integrations/telescope.lua index f40a53f..6e114ff 100644 --- a/lua/catppuccino/core/integrations/telescope.lua +++ b/lua/catppuccino/core/integrations/telescope.lua @@ -3,8 +3,8 @@ local M = {} function M.get(cp) return { TelescopeBorder = { fg = cp.catppuccino10 }, - TelescopeSelectionCaret = { fg = cp.catppuccino3 }, - TelescopeSelection = { fg = cp.catppuccino3, bg = cp.catppuccino16 }, + TelescopeSelectionCaret = { fg = cp.katppuccino2 }, + TelescopeSelection = { fg = cp.katppuccino2, bg = cp.catppuccino16 }, TelescopeMatching = { fg = cp.catppuccino10 }, } end diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index b42d2f6..4ba40ea 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -13,9 +13,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, bg = cp.catppuccino10 }, - TSWarning = { fg = cp.catppuccino2, bg = cp.catppuccino9 }, - TSDanger = { fg = cp.catppuccino2, bg = cp.catppuccino6 }, + TSNote = { fg = cp.katppuccino1, bg = cp.catppuccino10 }, + TSWarning = { fg = cp.katppuccino1, bg = cp.catppuccino9 }, + TSDanger = { fg = cp.katppuccino1, bg = cp.catppuccino6 }, 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 @@ -27,23 +27,23 @@ function M.get(cp) -- rustTSField = { fg = cp.catppuccino13 }, -- For fields. -- TSFloat = { }; -- For floats. TSFunction = { fg = cp.catppuccino10, style = cnf.styles.functions }, -- For function (calls and definitions). - TSFuncBuiltin = { fg = cp.catppuccino3 }, -- For builtin functions: `table.insert` in Lua. + TSFuncBuiltin = { fg = cp.katppuccino2 }, -- For builtin functions: `table.insert` in Lua. TSFuncMacro = { fg = cp.catppuccino6 }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp. TSInclude = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. TSKeyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories. TSKeywordFunction = { fg = cp.catppuccino4, style = cnf.styles.keywords }, -- For keywords used to define a fuction. - TSKeywordOperator = { fg = cp.catppuccino3, style = cnf.styles.keywords }, -- For `new` keyword operator + TSKeywordOperator = { fg = cp.katppuccino2, style = cnf.styles.keywords }, -- For `new` keyword operator TSLabel = { fg = cp.catppuccino10 }, -- For labels: `label:` in C and `:label:` in Lua. -- TSMethod = { }; -- For method calls and definitions. - TSNamespace = { fg = cp.catppuccino3 }, -- For identifiers referring to modules and namespaces. + TSNamespace = { fg = cp.katppuccino2 }, -- For identifiers referring to modules and namespaces. -- TSNone = { }; -- TODO: docs -- TSNumber = { }; -- For all numbers - TSOperator = { fg = cp.catppuccino3 }, -- For any operator: `+`, but also `->` and `*` in cp. + TSOperator = { fg = cp.katppuccino2 }, -- For any operator: `+`, but also `->` and `*` in cp. TSParameter = { fg = cp.catppuccino7 }, -- For parameters of a function. -- TSParameterReference= { }; -- For references to parameters of a function. TSProperty = { fg = cp.catppuccino6 }, -- Same as `TSField`. tomlTSProperty = { fg = cp.catppuccino10 }, -- Differentiates between string and properties - TSPunctDelimiter = { fg = cp.catppuccino3 }, -- For delimiters ie: `.` + TSPunctDelimiter = { fg = cp.katppuccino2 }, -- For delimiters ie: `.` TSPunctBracket = { fg = cp.catppuccino6 }, -- For brackets and parenthesis. TSPunctSpecial = { fg = cp.katppuccino0 }, -- For special punctutation that does not fall in the catagories before. TSRepeat = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to loops. @@ -52,13 +52,13 @@ function M.get(cp) TSStringEscape = { fg = cp.catppuccino5, style = cnf.styles.strings }, -- For escape characters within a string. -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. -- TSType = { }; -- For types. - TSTypeBuiltin = { fg = cp.catppuccino3, style = cnf.styles.keywords }, -- For builtin types. + TSTypeBuiltin = { fg = cp.katppuccino2, style = cnf.styles.keywords }, -- For builtin types. TSVariable = { style = cnf.styles.variables }, -- Any variable name that does not have another highlighcp. TSVariableBuiltin = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- Variable names that are defined by the languages, like `this` or `self`. -- TSTag = { }; -- Tags like html tag names. -- TSTagDelimiter = { }; -- Tag delimiter like `<` `>` `/` -- TSText = { }; -- For strings considecatppuccino6 text in a markup language. - TSTextReference = { fg = cp.catppuccino3 }, + TSTextReference = { fg = cp.katppuccino2 }, -- TSEmphasis = { }; -- For text to be represented with emphasis. -- TSUnderline = { }; -- For text to be represented with an underline. -- TSStrike = { }; -- For strikethrough texcp. diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua index 49ea497..a6732b9 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 = {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.katppuccino0}, + rainbowcol1 = {bg = cp.katppuccino1, fg = cp.catppuccino6}, + rainbowcol2 = {bg = cp.katppuccino1, fg = cp.catppuccino8}, + rainbowcol3 = {bg = cp.katppuccino1, fg = cp.catppuccino9}, + rainbowcol4 = {bg = cp.katppuccino1, fg = cp.catppuccino10}, + rainbowcol5 = {bg = cp.katppuccino1, fg = cp.catppuccino5}, + rainbowcol6 = {bg = cp.katppuccino1, fg = cp.katppuccino2}, + rainbowcol7 = {bg = cp.katppuccino1, fg = cp.katppuccino0}, } end diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua index 34b186e..32355f1 100644 --- a/lua/catppuccino/core/integrations/which_key.lua +++ b/lua/catppuccino/core/integrations/which_key.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - WhichKey = { fg = cp.catppuccino3 }, + WhichKey = { fg = cp.katppuccino2 }, WhichKeyGroup = { fg = cp.catppuccino10 }, WhichKeyDesc = { fg = cp.catppuccino5 }, WhichKeySeperator = { fg = cp.catppuccino12 }, diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index d08cfe8..fb8a12f 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -9,7 +9,7 @@ local function get_properties() background = "dark", } - if colors_util.assert_brightness(color_palette.catppuccino2) then + if colors_util.assert_brightness(color_palette.katppuccino1) then props["background"] = "light" end @@ -23,18 +23,18 @@ local function get_base() Comment = { fg = cp.catppuccino12, style = cnf.styles.comments }, -- just comments ColorColumn = { bg = cp.catppuccino16 }, -- used for the columns set with 'colorcolumn' Conceal = { fg = cp.black }, -- placeholder characters substituted for concealed text (see 'conceallevel') - 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| + Cursor = { fg = cp.katppuccino1, bg = cp.catppuccino11 }, -- character under the cursor + lCursor = { fg = cp.katppuccino1, bg = cp.catppuccino11 }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + CursorIM = { fg = cp.katppuccino1, bg = cp.catppuccino11 }, -- like Cursor, but used when in IME mode |CursorIM| CursorColumn = { bg = cp.catppuccino16 }, -- Screen-column at the cursor, when 'cursorcolumn' is secp. CursorLine = { bg = cp.catppuccino16 }, -- 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|. + EndOfBuffer = { fg = cp.katppuccino1 }, -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. ErrorMsg = { fg = cp.catppuccino6 }, -- error messages on the command line VertSplit = { fg = cp.catppuccino14 }, -- the column separating vertically split windows 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 + FoldColumn = { bg = cp.katppuccino1, fg = cp.catppuccino12 }, -- 'foldcolumn' + SignColumn = { bg = cnf.transparency and cp.none or cp.katppuccino1, fg = cp.catppuccino13 }, -- column where |signs| are displayed SignColumnSB = { bg = cp.catppuccino14, fg = cp.catppuccino13 }, -- column where |signs| are displayed Substitute = { bg = cp.catppuccino13, fg = cp.catppuccino5 }, -- |:substitute| replacement text highlighting LineNr = { fg = cp.catppuccino13 }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secp. @@ -45,8 +45,8 @@ local function get_base() 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.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 + Normal = { fg = cp.catppuccino11, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- normal text + NormalNC = { fg = cp.catppuccino11, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- normal text in non-current windows NormalSB = { fg = cp.fg, bg = cp.catppuccino14 }, -- normal text in non-current windows NormalFloat = { fg = cp.catppuccino11, bg = cp.catppuccino14 }, -- Normal text in floating windows. FloatBorder = { fg = cp.catppuccino10 }, @@ -88,13 +88,13 @@ local function get_base() Number = { fg = cp.catppuccino7 }, -- a number constant: 234, 0xff Float = { fg = cp.catppuccino7 }, -- a floating point constant: 2.3e10 Boolean = { fg = cp.catppuccino7 }, -- a boolean constant: TRUE, false - Identifier = { fg = cp.catppuccino3, style = cnf.styles.variables }, -- (prefercatppuccino6) any variable name + Identifier = { fg = cp.katppuccino2, style = cnf.styles.variables }, -- (prefercatppuccino6) any variable name Function = { fg = cp.catppuccino10, style = cnf.styles.functions }, -- function name (also: methods for classes) Statement = { fg = cp.catppuccino4 }, -- (prefercatppuccino6) any statement 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.catppuccino3 }, -- "sizeof", "+", "*", etcp. + Operator = { fg = cp.katppuccino2 }, -- "sizeof", "+", "*", etcp. Keyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- any other keyword -- Exception = { }, -- try, catch, throw @@ -122,21 +122,21 @@ local function get_base() -- Ignore = { }, -- (prefercatppuccino6) left blank, hidden |hl-Ignore| Error = { fg = cp.catppuccino6 }, -- (prefercatppuccino6) any erroneous construct - Todo = { bg = 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.katppuccino1, 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 = { bg = cp.terminal_black, fg = cp.catppuccino11 }, - mkdCodeDelimiter = { bg = cp.catppuccino2, fg = cp.catppuccino11 }, - mkdCodeStart = { fg = cp.catppuccino3, style = "bold" }, - mkdCodeEnd = { fg = cp.catppuccino3, style = "bold" }, + mkdCodeDelimiter = { bg = cp.katppuccino1, fg = cp.catppuccino11 }, + mkdCodeStart = { fg = cp.katppuccino2, style = "bold" }, + mkdCodeEnd = { fg = cp.katppuccino2, style = "bold" }, -- mkdLink = { fg = cp.catppuccino10, style = "underline" }, -- debugging debugPC = { bg = cp.catppuccino14 }, -- used for highlighting the current line in terminal-debug - debugBreakpoint = { bg = cp.catppuccino2, fg = cp.catppuccino12 }, -- used for breakpoint colors in terminal-debug + debugBreakpoint = { bg = cp.katppuccino1, fg = cp.catppuccino12 }, -- used for breakpoint colors in terminal-debug -- illuminate illuminatedWord = { bg = cp.catppuccino13 }, illuminatedCurWord = { bg = cp.catppuccino13 }, @@ -149,10 +149,10 @@ local function get_base() diffFile = { fg = cp.catppuccino10 }, diffLine = { fg = cp.catppuccino12 }, diffIndexLine = { fg = cp.catppuccino5 }, - DiffAdd = { fg = cp.catppuccino10, bg = cp.catppuccino2 }, -- diff mode: Added line |diff.txt| - DiffChange = { fg = cp.catppuccino9, bg = cp.catppuccino2 }, -- diff mode: Changed line |diff.txt| - DiffDelete = { fg = cp.catppuccino6, bg = cp.catppuccino2 }, -- diff mode: Deleted line |diff.txt| - DiffText = { fg = cp.catppuccino10, bg = cp.catppuccino2 }, -- diff mode: Changed text within a changed line |diff.txt| + DiffAdd = { fg = cp.catppuccino10, bg = cp.katppuccino1 }, -- diff mode: Added line |diff.txt| + DiffChange = { fg = cp.catppuccino9, bg = cp.katppuccino1 }, -- diff mode: Changed line |diff.txt| + DiffDelete = { fg = cp.catppuccino6, bg = cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt| + DiffText = { fg = cp.catppuccino10, bg = cp.katppuccino1 }, -- diff mode: Changed text within a changed line |diff.txt| -- NeoVim healthError = { fg = cp.catppuccino6 }, healthSuccess = { fg = cp.catppuccino8 }, @@ -209,8 +209,8 @@ local function get_terminal() g.terminal_color_0 = cp.katppuccino0 g.terminal_color_1 = cp.catppuccino1 - g.terminal_color_2 = cp.catppuccino2 - g.terminal_color_3 = cp.catppuccino3 + g.terminal_color_2 = cp.katppuccino2 + g.terminal_color_3 = cp.katppuccino2 g.terminal_color_4 = cp.catppuccino4 g.terminal_color_5 = cp.catppuccino5 g.terminal_color_6 = cp.catppuccino6