From 9acafdc196b7f678012759a98c7c772bd38c084c Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 1 Nov 2021 10:20:28 -0500 Subject: [PATCH] renamed catppuccino6 -> katppuccino5 --- lua/catppuccino/core/color_palette.lua | 2 +- lua/catppuccino/core/integrations/barbar.lua | 6 +-- .../core/integrations/bufferline.lua | 6 +-- .../core/integrations/gitgutter.lua | 2 +- .../core/integrations/gitsigns.lua | 2 +- .../core/integrations/indent_blankline.lua | 4 +- .../core/integrations/lightspeed.lua | 20 ++++----- .../core/integrations/lsp_saga.lua | 4 +- .../core/integrations/native_lsp.lua | 10 ++--- lua/catppuccino/core/integrations/neogit.lua | 2 +- .../core/integrations/nvimtree.lua | 2 +- .../core/integrations/treesitter.lua | 18 ++++---- .../core/integrations/ts_rainbow.lua | 2 +- lua/catppuccino/core/mapper.lua | 44 +++++++++---------- 14 files changed, 62 insertions(+), 62 deletions(-) diff --git a/lua/catppuccino/core/color_palette.lua b/lua/catppuccino/core/color_palette.lua index 477e03d..18a6521 100644 --- a/lua/catppuccino/core/color_palette.lua +++ b/lua/catppuccino/core/color_palette.lua @@ -4,7 +4,7 @@ local color_palette = { katppuccino2 = "#EA31B5", -- Fashion Fuchsia katppuccino3 = "#AE9AD6", -- Blue Shell katppuccino4 = "#F0A8E4", -- Orchid Crayola - catppuccino6 = "#E28D8D", -- New York Pink + katppuccino5 = "#E28D8D", -- New York Pink catppuccino7 = "#E7A988", -- Tumbleweed catppuccino8 = "#ADD692", -- Granny Smith Apple catppuccino9 = "#E3DAA3", -- Megium Champagne diff --git a/lua/catppuccino/core/integrations/barbar.lua b/lua/catppuccino/core/integrations/barbar.lua index d1b190f..1db7957 100644 --- a/lua/catppuccino/core/integrations/barbar.lua +++ b/lua/catppuccino/core/integrations/barbar.lua @@ -6,17 +6,17 @@ function M.get(cp) BufferCurrentIndex = { bg = cp.catppuccino13, fg = cp.catppuccino10 }, BufferCurrentMod = { bg = cp.catppuccino13, fg = cp.catppuccino9 }, BufferCurrentSign = { bg = cp.catppuccino13, fg = cp.catppuccino10 }, - BufferCurrentTarget = { bg = cp.catppuccino13, fg = cp.catppuccino6 }, + BufferCurrentTarget = { bg = cp.catppuccino13, fg = cp.katppuccino5 }, BufferVisible = { bg = cp.catppuccino15, fg = cp.catppuccino11 }, BufferVisibleIndex = { bg = cp.catppuccino15, fg = cp.catppuccino10 }, BufferVisibleMod = { bg = cp.catppuccino15, fg = cp.catppuccino9 }, BufferVisibleSign = { bg = cp.catppuccino15, fg = cp.catppuccino10 }, - BufferVisibleTarget = { bg = cp.catppuccino15, fg = cp.catppuccino6 }, + BufferVisibleTarget = { bg = cp.catppuccino15, fg = cp.katppuccino5 }, BufferInactive = { bg = cp.catppuccino15, fg = cp.catppuccino12 }, BufferInactiveIndex = { bg = cp.catppuccino15, fg = cp.catppuccino12 }, BufferInactiveMod = { bg = cp.catppuccino15, fg = cp.catppuccino9 }, BufferInactiveSign = { bg = cp.catppuccino15, fg = cp.catppuccino10 }, - BufferInactiveTarget = { bg = cp.catppuccino15, fg = cp.catppuccino6 }, + BufferInactiveTarget = { bg = cp.catppuccino15, fg = cp.katppuccino5 }, BufferTabpages = { bg = cp.catppuccino15, fg = cp.none }, BufferTabpage = { bg = cp.catppuccino15, fg = cp.catppuccino10 }, } diff --git a/lua/catppuccino/core/integrations/bufferline.lua b/lua/catppuccino/core/integrations/bufferline.lua index eecd4ee..b2de6fd 100644 --- a/lua/catppuccino/core/integrations/bufferline.lua +++ b/lua/catppuccino/core/integrations/bufferline.lua @@ -10,8 +10,8 @@ function M.get(cp) BufferLineBufferVisible = { fg = cp.catppuccino13, bg = inactive_clr }, 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 }, + BufferLineTabSelected = { fg = cp.katppuccino5, bg = cp.catppuccino10 }, + BufferLineTabClose = { fg = cp.katppuccino5, bg = inactive_clr }, BufferLineIndicatorSelected = { fg = cp.katppuccino1, bg = cp.katppuccino1 }, -- separators BufferLineSeparator = { 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.katppuccino1 }, + BufferLineCloseButtonSelected = { fg = cp.katppuccino5, bg = cp.katppuccino1 }, } end diff --git a/lua/catppuccino/core/integrations/gitgutter.lua b/lua/catppuccino/core/integrations/gitgutter.lua index 8771107..8903c3c 100644 --- a/lua/catppuccino/core/integrations/gitgutter.lua +++ b/lua/catppuccino/core/integrations/gitgutter.lua @@ -4,7 +4,7 @@ function M.get(cp) return { GitGutterAdd = { fg = cp.catppuccino10 }, GitGutterChange = { fg = cp.catppuccino9 }, - GitGutterDelete = { fg = cp.catppuccino6 }, + GitGutterDelete = { fg = cp.katppuccino5 }, } end return M diff --git a/lua/catppuccino/core/integrations/gitsigns.lua b/lua/catppuccino/core/integrations/gitsigns.lua index 1efbab2..20a1b3c 100644 --- a/lua/catppuccino/core/integrations/gitsigns.lua +++ b/lua/catppuccino/core/integrations/gitsigns.lua @@ -4,7 +4,7 @@ function M.get(cp) return { 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| + GitSignsDelete = { fg = cp.katppuccino5, bg = cnf.transparency and cp.none or cp.katppuccino1 }, -- diff mode: Deleted line |diff.txt| } end diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua index 1d2bd31..bda5c74 100644 --- a/lua/catppuccino/core/integrations/indent_blankline.lua +++ b/lua/catppuccino/core/integrations/indent_blankline.lua @@ -6,9 +6,9 @@ function M.get(cp) IndentBlanklineChar = { fg = cp.catppuccino13 }, } - if cnf.integrations.indent_blankline.colocatppuccino6_indent_levels then + if cnf.integrations.indent_blankline.colokatppuccino5_indent_levels then hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.catppuccino9} - hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.catppuccino6} + hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.katppuccino5} hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.catppuccino8} hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.catppuccino7} hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.catppuccino10} diff --git a/lua/catppuccino/core/integrations/lightspeed.lua b/lua/catppuccino/core/integrations/lightspeed.lua index c1bd2bf..0507d55 100644 --- a/lua/catppuccino/core/integrations/lightspeed.lua +++ b/lua/catppuccino/core/integrations/lightspeed.lua @@ -1,18 +1,18 @@ local M = {} -local is_prepacatppuccino6 +local is_prepakatppuccino5 -local function set_prepacatppuccino6(val) - is_prepacatppuccino6 = val +local function set_prepakatppuccino5(val) + is_prepakatppuccino5 = val end -local function get_prepacatppuccino6() - return is_prepacatppuccino6 +local function get_prepakatppuccino5() + return is_prepakatppuccino5 end function M.get(cp) - if not get_prepacatppuccino6() then + if not get_prepakatppuccino5() then local catppuccino = require("catppuccino") if catppuccino.after_loading ~= nil then catppuccino.after_loading = function () @@ -24,7 +24,7 @@ function M.get(cp) require'lightspeed'.init_highlight() end end - set_prepacatppuccino6(true) + set_prepakatppuccino5(true) end return { @@ -34,10 +34,10 @@ function M.get(cp) LightspeedLabelDistantOverlapped = {bg = cp.katppuccino3, fg = 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"}, + LightspeedMaskedChar = {bg = cp.katppuccino1, fg = cp.katppuccino5, 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"}, + LightspeedUnlabeledMatch = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "underline"}, + LightspeedOneCharMatch = {bg = cp.katppuccino1, fg = cp.katppuccino5, 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"}, diff --git a/lua/catppuccino/core/integrations/lsp_saga.lua b/lua/catppuccino/core/integrations/lsp_saga.lua index 19a1be9..8ce6a7f 100644 --- a/lua/catppuccino/core/integrations/lsp_saga.lua +++ b/lua/catppuccino/core/integrations/lsp_saga.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - DiagnosticError = { fg = cp.catppuccino6 }, + DiagnosticError = { fg = cp.katppuccino5 }, DiagnosticWarning = { fg = cp.catppuccino9 }, DiagnosticInformation = { fg = cp.catppuccino10 }, DiagnosticHint = { fg = cp.hint }, @@ -16,7 +16,7 @@ function M.get(cp) LspSagaFinderSelection = { fg = cp.catppuccino13 }, LspSagaCodeActionTitle = { fg = cp.catppuccino101 }, LspSagaCodeActionContent = { fg = cp.purple }, - LspSagaSignatureHelpBorder = { fg = cp.catppuccino6 }, + LspSagaSignatureHelpBorder = { fg = cp.katppuccino5 }, ReferencesCount = { fg = cp.purple }, DefinitionCount = { fg = cp.purple }, DefinitionIcon = { fg = cp.catppuccino10 }, diff --git a/lua/catppuccino/core/integrations/native_lsp.lua b/lua/catppuccino/core/integrations/native_lsp.lua index ab1c687..7cfd1a2 100644 --- a/lua/catppuccino/core/integrations/native_lsp.lua +++ b/lua/catppuccino/core/integrations/native_lsp.lua @@ -13,12 +13,12 @@ function M.get(cp) 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.catppuccino6 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default + DiagnosticError = { fg = cp.katppuccino5 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default DiagnosticWarn = { fg = cp.catppuccino9 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default DiagnosticInfo = { fg = cp.catppuccino10 }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default DiagnosticHint = { fg = cp.hint }, -- Used as the base highlight group. Other Diagnostic highlights link to this by default - LspDiagnosticsDefaultError = { fg = cp.catppuccino6 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + LspDiagnosticsDefaultError = { fg = cp.katppuccino5 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultWarning = { fg = cp.catppuccino9 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultInformation = { fg = cp.catppuccino10 }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) LspDiagnosticsDefaultHint = { fg = cp.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) @@ -28,15 +28,15 @@ function M.get(cp) -- LspDiagnosticsFloatingInformation = { }, -- Used to color "Information" diagnostic messages in diagnostics float -- LspDiagnosticsFloatingHint = { }, -- Used to color "Hint" diagnostic messages in diagnostics float - LspDiagnosticsError = { fg = cp.catppuccino6 }, + LspDiagnosticsError = { fg = cp.katppuccino5 }, LspDiagnosticsWarning = { fg = cp.catppuccino9 }, LspDiagnosticsInformation = { fg = cp.catppuccino10 }, LspDiagnosticsHint = { fg = cp.hint }, - LspDiagnosticsVirtualTextError = { fg = cp.catppuccino6, style = virtual_text.errors }, -- Used for "Error" diagnostic virtual text + LspDiagnosticsVirtualTextError = { fg = cp.katppuccino5, style = virtual_text.errors }, -- Used for "Error" diagnostic virtual text LspDiagnosticsVirtualTextWarning = { fg = cp.catppuccino9, style = virtual_text.warnings }, -- Used for "Warning" diagnostic virtual text LspDiagnosticsVirtualTextInformation = { fg = cp.catppuccino10, style = virtual_text.warnings }, -- Used for "Information" diagnostic virtual text LspDiagnosticsVirtualTextHint = { fg = cp.hint, style = virtual_text.hints }, -- Used for "Hint" diagnostic virtual text - LspDiagnosticsUnderlineError = { style = underlines.errors, sp = cp.catppuccino6 }, -- Used to underline "Error" diagnostics + LspDiagnosticsUnderlineError = { style = underlines.errors, sp = cp.katppuccino5 }, -- Used to underline "Error" diagnostics LspDiagnosticsUnderlineWarning = { style = underlines.warnings, sp = cp.catppuccino9 }, -- Used to underline "Warning" diagnostics LspDiagnosticsUnderlineInformation = { style = underlines.information, sp = cp.catppuccino10 }, -- Used to underline "Information" diagnostics LspDiagnosticsUnderlineHint = { style = underlines.hints, sp = cp.hint }, -- Used to underline "Hint" diagnostics diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua index 4f78ff8..73456fd 100644 --- a/lua/catppuccino/core/integrations/neogit.lua +++ b/lua/catppuccino/core/integrations/neogit.lua @@ -7,7 +7,7 @@ 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.katppuccino1 }, + NeogitDiffDeleteHighlight = { fg = cp.katppuccino5, 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 ba8cf2a..7ff6cf4 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -22,7 +22,7 @@ function M.get(cp) NvimTreeStatuslineNc = { fg = cp.black, bg = cp.black }, NvimTreeGitDirty = { fg = cp.catppuccino9 }, NvimTreeGitNew = { fg = cp.catppuccino10 }, - NvimTreeGitDeleted = { fg = cp.catppuccino6 }, + NvimTreeGitDeleted = { fg = cp.katppuccino5 }, NvimTreeSpecialFile = { fg = cp.katppuccino2 }, NvimTreeImageFile = { fg = cp.catppuccino11 }, NvimTreeOpenedFile = { fg = cp.katppuccino4 }, diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index 19dfaf3..f071b0c 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -15,20 +15,20 @@ function M.get(cp) -- TScatppuccino12 = { }; -- For catppuccino12 blocks. TSNote = { fg = cp.katppuccino1, bg = cp.catppuccino10 }, TSWarning = { fg = cp.katppuccino1, bg = cp.catppuccino9 }, - TSDanger = { fg = cp.katppuccino1, bg = cp.catppuccino6 }, + TSDanger = { fg = cp.katppuccino1, bg = cp.katppuccino5 }, TSConstructor = { fg = cp.katppuccino4 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. - TSConditional = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to conditionnals. + TSConditional = { fg = cp.katppuccino5, style = cnf.styles.keywords }, -- For keywords related to conditionnals. TSConstant = { fg = cp.catppuccino7 }, -- For constants TSConstBuiltin = { fg = cp.catppuccino7, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua. -- TSConstMacro = { }; -- For constants that are defined by macros: `NULL` in cp. -- TSError = { }; -- For syntax/parser errors. TSException = { fg = cp.katppuccino3, style = cnf.styles.keywords }, -- For exception related keywords. - TSField = { fg = cp.catppuccino6 }, -- For fields. + TSField = { fg = cp.katppuccino5 }, -- For fields. -- 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.katppuccino2 }, -- For builtin functions: `table.insert` in Lua. - TSFuncMacro = { fg = cp.catppuccino6 }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp. + TSFuncMacro = { fg = cp.katppuccino5 }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp. TSInclude = { fg = cp.katppuccino4, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. TSKeyword = { fg = cp.katppuccino4, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories. TSKeywordFunction = { fg = cp.katppuccino3, style = cnf.styles.keywords }, -- For keywords used to define a fuction. @@ -41,12 +41,12 @@ function M.get(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`. + TSProperty = { fg = cp.katppuccino5 }, -- Same as `TSField`. tomlTSProperty = { fg = cp.catppuccino10 }, -- Differentiates between string and properties TSPunctDelimiter = { fg = cp.katppuccino2 }, -- For delimiters ie: `.` - TSPunctBracket = { fg = cp.catppuccino6 }, -- For brackets and parenthesis. + TSPunctBracket = { fg = cp.katppuccino5 }, -- 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. + TSRepeat = { fg = cp.katppuccino5, style = cnf.styles.keywords }, -- For keywords related to loops. -- TSString = { }; -- For strings. TSStringRegex = { fg = cp.catppuccino10, style = cnf.styles.strings }, -- For regexes. TSStringEscape = { fg = cp.katppuccino4, style = cnf.styles.strings }, -- For escape characters within a string. @@ -54,10 +54,10 @@ function M.get(cp) -- TSType = { }; -- For 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`. + TSVariableBuiltin = { fg = cp.katppuccino5, 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. + -- TSText = { }; -- For strings considekatppuccino5 text in a markup language. TSTextReference = { fg = cp.katppuccino2 }, -- TSEmphasis = { }; -- For text to be represented with emphasis. -- TSUnderline = { }; -- For text to be represented with an underline. diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua index 5bb16c2..3b51037 100644 --- a/lua/catppuccino/core/integrations/ts_rainbow.lua +++ b/lua/catppuccino/core/integrations/ts_rainbow.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - rainbowcol1 = {bg = cp.katppuccino1, fg = cp.catppuccino6}, + rainbowcol1 = {bg = cp.katppuccino1, fg = cp.katppuccino5}, rainbowcol2 = {bg = cp.katppuccino1, fg = cp.catppuccino8}, rainbowcol3 = {bg = cp.katppuccino1, fg = cp.catppuccino9}, rainbowcol4 = {bg = cp.katppuccino1, fg = cp.catppuccino10}, diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index cce1885..bad7c37 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -30,7 +30,7 @@ local function get_base() 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.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 + ErrorMsg = { fg = cp.katppuccino5 }, -- 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.katppuccino1, fg = cp.catppuccino12 }, -- 'foldcolumn' @@ -39,7 +39,7 @@ local function get_base() Substitute = { bg = cp.catppuccino13, fg = cp.katppuccino4 }, -- |: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.katppuccino0 }, -- 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| + MatchParen = { fg = cp.catppuccino7, style = "bold" }, -- The character under the cursor or just before it, if it is a paikatppuccino5 bracket, and its match. |pi_paren.txt| ModeMsg = { fg = cp.katppuccino0, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ") MsgArea = { fg = cp.katppuccino0 }, -- Area for messages and cmdline MsgSeparator = {}, -- Separator for scrolled messages, `msgsep` flag of 'display' @@ -59,7 +59,7 @@ local function get_base() Search = { bg = cp.catppuccino13, fg = cp.katppuccino4 }, -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand oucp. IncSearch = { bg = cp.katppuccino4, fg = cp.catppuccino13 }, -- '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.catppuccino6, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. + SpellBad = { sp = cp.katppuccino5, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. SpellCap = { sp = cp.catppuccino9, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal = { sp = cp.catppuccino10, 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.katppuccino0, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. @@ -76,53 +76,53 @@ local function get_base() WildMenu = { bg = cp.catppuccino12 }, -- 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 + -- catppuccino12ed out groups should chain up to their "preferkatppuccino5" group by -- default, -- Uncatppuccino12 and edit if you want more specific syntax highlighting. -- code itself - Constant = { fg = cp.catppuccino7 }, -- (prefercatppuccino6) any constant + Constant = { fg = cp.catppuccino7 }, -- (preferkatppuccino5) any constant String = { fg = cp.catppuccino8, style = cnf.styles.strings }, -- a string constant: "this is a string" Character = { fg = cp.catppuccino8 }, -- a character constant: 'c', '\n' 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.katppuccino2, style = cnf.styles.variables }, -- (prefercatppuccino6) any variable name + Identifier = { fg = cp.katppuccino2, style = cnf.styles.variables }, -- (preferkatppuccino5) any variable name Function = { fg = cp.catppuccino10, style = cnf.styles.functions }, -- function name (also: methods for classes) - Statement = { fg = cp.katppuccino3 }, -- (prefercatppuccino6) any statement - Conditional = { fg = cp.catppuccino6 }, -- if, then, else, endif, switch, etcp. - Repeat = { fg = cp.catppuccino6 }, -- for, do, while, etcp. + Statement = { fg = cp.katppuccino3 }, -- (preferkatppuccino5) any statement + Conditional = { fg = cp.katppuccino5 }, -- if, then, else, endif, switch, etcp. + Repeat = { fg = cp.katppuccino5 }, -- for, do, while, etcp. Label = { fg = cp.katppuccino3 }, -- case, default, etcp. Operator = { fg = cp.katppuccino2 }, -- "sizeof", "+", "*", etcp. Keyword = { fg = cp.katppuccino4, style = cnf.styles.keywords }, -- any other keyword -- Exception = { }, -- try, catch, throw - PreProc = { fg = cp.katppuccino4 }, -- (prefercatppuccino6) generic Preprocessor + PreProc = { fg = cp.katppuccino4 }, -- (preferkatppuccino5) generic Preprocessor Include = { fg = cp.katppuccino4 }, -- preprocessor #include -- Define = { }, -- preprocessor #define -- Macro = { }, -- same as Define -- PreCondit = { }, -- preprocessor #if, #else, #endif, etcp. - Type = { fg = cp.catppuccino9 }, -- (prefercatppuccino6) int, long, char, etcp. + Type = { fg = cp.catppuccino9 }, -- (preferkatppuccino5) int, long, char, etcp. StorageClass = { fg = cp.catppuccino9 }, -- static, register, volatile, etcp. Structure = { fg = cp.catppuccino9 }, -- struct, union, enum, etcp. Typedef = { fg = cp.catppuccino9 }, -- A typedef - Special = { fg = cp.catppuccino10 }, -- (prefercatppuccino6) any special symbol + Special = { fg = cp.catppuccino10 }, -- (preferkatppuccino5) any special symbol -- SpecialChar = { }, -- special character in a constant -- Tag = { }, -- you can use CTRL-] on this -- Delimiter = { }, -- character that needs attention -- Specialcatppuccino12= { }, -- special things inside a catppuccino12 -- Debug = { }, -- debugging statements - Underlined = { style = "underline" }, -- (prefercatppuccino6) text that stands out, HTML links + Underlined = { style = "underline" }, -- (preferkatppuccino5) text that stands out, HTML links Bold = { style = "bold" }, Italic = { style = "italic" }, -- ("Ignore", below, may be invisible...) - -- Ignore = { }, -- (prefercatppuccino6) left blank, hidden |hl-Ignore| + -- Ignore = { }, -- (preferkatppuccino5) left blank, hidden |hl-Ignore| - Error = { fg = cp.catppuccino6 }, -- (prefercatppuccino6) any erroneous construct - Todo = { bg = cp.catppuccino9, fg = cp.katppuccino1, style = "bold" }, -- (prefercatppuccino6) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Error = { fg = cp.katppuccino5 }, -- (preferkatppuccino5) any erroneous construct + Todo = { bg = cp.catppuccino9, fg = cp.katppuccino1, style = "bold" }, -- (preferkatppuccino5) anything that needs extra attention; mostly the keywords TODO FIXME and XXX qfLineNr = { fg = cp.catppuccino9 }, qfFileName = { fg = cp.catppuccino10 }, htmlH1 = { fg = cp.katppuccino4, style = "bold" }, @@ -142,7 +142,7 @@ local function get_base() illuminatedCurWord = { bg = cp.catppuccino13 }, -- diff diffAdded = { fg = cp.catppuccino10 }, - diffRemoved = { fg = cp.catppuccino6 }, + diffRemoved = { fg = cp.katppuccino5 }, diffChanged = { fg = cp.catppuccino9 }, diffOldFile = { fg = cp.catppuccino9 }, diffNewFile = { fg = cp.catppuccino7 }, @@ -151,22 +151,22 @@ local function get_base() diffIndexLine = { fg = cp.katppuccino4 }, 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| + DiffDelete = { fg = cp.katppuccino5, 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 }, + healthError = { fg = cp.katppuccino5 }, healthSuccess = { fg = cp.catppuccino8 }, healthWarning = { fg = cp.catppuccino9 }, -- misc -- glyphs - GlyphPalette1 = { fg = cp.catppuccino6 }, + GlyphPalette1 = { fg = cp.katppuccino5 }, GlyphPalette2 = { fg = cp.catppuccino8 }, GlyphPalette3 = { fg = cp.catppuccino9 }, GlyphPalette4 = { fg = cp.catppuccino10 }, GlyphPalette6 = { fg = cp.catppuccino8 }, GlyphPalette7 = { fg = cp.catppuccino11 }, - GlyphPalette9 = { fg = cp.catppuccino6 }, + GlyphPalette9 = { fg = cp.katppuccino5 }, } end @@ -213,7 +213,7 @@ local function get_terminal() g.terminal_color_3 = cp.katppuccino2 g.terminal_color_4 = cp.katppuccino3 g.terminal_color_5 = cp.katppuccino4 - g.terminal_color_6 = cp.catppuccino6 + g.terminal_color_6 = cp.katppuccino5 g.terminal_color_7 = cp.catppuccino7 g.terminal_color_8 = cp.catppuccino8 g.terminal_color_9 = cp.catppuccino9