From bf7270855614addf1ca0562e0b60cea1661f1bf5 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Mon, 1 Nov 2021 10:26:06 -0500 Subject: [PATCH] renamed catppuccino7 -> katppuccino6 --- lua/catppuccino/core/color_palette.lua | 2 +- lua/catppuccino/core/integrations/dashboard.lua | 2 +- lua/catppuccino/core/integrations/hop.lua | 2 +- .../core/integrations/indent_blankline.lua | 2 +- lua/catppuccino/core/integrations/lightspeed.lua | 4 ++-- lua/catppuccino/core/integrations/markdown.lua | 2 +- lua/catppuccino/core/integrations/native_lsp.lua | 2 +- lua/catppuccino/core/integrations/treesitter.lua | 8 ++++---- lua/catppuccino/core/mapper.lua | 16 ++++++++-------- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lua/catppuccino/core/color_palette.lua b/lua/catppuccino/core/color_palette.lua index 18a6521..69185d6 100644 --- a/lua/catppuccino/core/color_palette.lua +++ b/lua/catppuccino/core/color_palette.lua @@ -5,7 +5,7 @@ local color_palette = { katppuccino3 = "#AE9AD6", -- Blue Shell katppuccino4 = "#F0A8E4", -- Orchid Crayola katppuccino5 = "#E28D8D", -- New York Pink - catppuccino7 = "#E7A988", -- Tumbleweed + katppuccino6 = "#E7A988", -- Tumbleweed catppuccino8 = "#ADD692", -- Granny Smith Apple catppuccino9 = "#E3DAA3", -- Megium Champagne catppuccino10 = "#7EA1C8", -- Cerulean Frost diff --git a/lua/catppuccino/core/integrations/dashboard.lua b/lua/catppuccino/core/integrations/dashboard.lua index 91f8295..4e3f7b6 100644 --- a/lua/catppuccino/core/integrations/dashboard.lua +++ b/lua/catppuccino/core/integrations/dashboard.lua @@ -5,7 +5,7 @@ function M.get(cp) DashboardShortCut = { fg = cp.katppuccino2 }, DashboardHeader = { fg = cp.catppuccino9 }, DashboardCenter = { fg = cp.catppuccino8 }, - DashboardFooter = { fg = cp.catppuccino7, style = "italic" }, + DashboardFooter = { fg = cp.katppuccino6, style = "italic" }, } end diff --git a/lua/catppuccino/core/integrations/hop.lua b/lua/catppuccino/core/integrations/hop.lua index 902876f..f694874 100644 --- a/lua/catppuccino/core/integrations/hop.lua +++ b/lua/catppuccino/core/integrations/hop.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - HopNextKey = { bg = cp.katppuccino1, fg = cp.catppuccino7, style = "bold,underline" }, + HopNextKey = { bg = cp.katppuccino1, fg = cp.katppuccino6, 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 }, diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua index 6ff0b15..44408e7 100644 --- a/lua/catppuccino/core/integrations/indent_blankline.lua +++ b/lua/catppuccino/core/integrations/indent_blankline.lua @@ -10,7 +10,7 @@ function M.get(cp) hi["IndentBlanklineIndent6"] = {blend = "nocombine", fg = cp.catppuccino9} hi["IndentBlanklineIndent5"] = {blend = "nocombine", fg = cp.katppuccino5} hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.catppuccino8} - hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.catppuccino7} + hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.katppuccino6} hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.catppuccino10} hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.katppuccino4} end diff --git a/lua/catppuccino/core/integrations/lightspeed.lua b/lua/catppuccino/core/integrations/lightspeed.lua index 0507d55..f426f15 100644 --- a/lua/catppuccino/core/integrations/lightspeed.lua +++ b/lua/catppuccino/core/integrations/lightspeed.lua @@ -32,8 +32,8 @@ function M.get(cp) LightspeedOverlapped = {bg = cp.catppuccino13, fg = cp.catppuccino11}, LightspeedLabelDistant = {bg = cp.katppuccino3, fg = cp.catppuccino11}, 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"}, + LightspeedShortcut = {bg = cp.katppuccino1, fg = cp.katppuccino6, style = "italic"}, + LightspeedShortcutOverlapped = {bg = cp.katppuccino1, fg = cp.katppuccino6, style = "bold"}, LightspeedMaskedChar = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "undercurl"}, LightspeedGreyWash = {bg = cp.katppuccino1, fg = cp.catppuccino12}, LightspeedUnlabeledMatch = {bg = cp.katppuccino1, fg = cp.katppuccino5, style = "underline"}, diff --git a/lua/catppuccino/core/integrations/markdown.lua b/lua/catppuccino/core/integrations/markdown.lua index 976a285..51d29aa 100644 --- a/lua/catppuccino/core/integrations/markdown.lua +++ b/lua/catppuccino/core/integrations/markdown.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - markdownHeadingDelimiter = { fg = cp.catppuccino7, style = "bold" }, + markdownHeadingDelimiter = { fg = cp.katppuccino6, style = "bold" }, markdownCode = { fg = cp.katppuccino2 }, markdownCodeBlock = { fg = cp.katppuccino2 }, markdownH1 = { fg = cp.katppuccino4, style = "bold" }, diff --git a/lua/catppuccino/core/integrations/native_lsp.lua b/lua/catppuccino/core/integrations/native_lsp.lua index 7cfd1a2..cf8ba35 100644 --- a/lua/catppuccino/core/integrations/native_lsp.lua +++ b/lua/catppuccino/core/integrations/native_lsp.lua @@ -22,7 +22,7 @@ function M.get(cp) 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) - LspSignatureActiveParameter = { fg = cp.catppuccino7 }, + LspSignatureActiveParameter = { fg = cp.katppuccino6 }, -- LspDiagnosticsFloatingError = { }, -- Used to color "Error" diagnostic messages in diagnostics float -- LspDiagnosticsFloatingWarning = { }, -- Used to color "Warning" diagnostic messages in diagnostics float -- LspDiagnosticsFloatingInformation = { }, -- Used to color "Information" diagnostic messages in diagnostics float diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index f071b0c..4359233 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -10,7 +10,7 @@ function M.get(cp) -- TSAnnotation = { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. -- TSAttribute = { }; -- (unstable) TODO: docs - TSBoolean = { fg = cp.catppuccino7, style = cnf.styles.keywords }, -- For booleans. + TSBoolean = { fg = cp.katppuccino6, style = cnf.styles.keywords }, -- For booleans. -- TSCharacter = { }; -- For characters. -- TScatppuccino12 = { }; -- For catppuccino12 blocks. TSNote = { fg = cp.katppuccino1, bg = cp.catppuccino10 }, @@ -18,8 +18,8 @@ function M.get(cp) TSDanger = { fg = cp.katppuccino1, bg = cp.katppuccino5 }, TSConstructor = { fg = cp.katppuccino4 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. 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. + TSConstant = { fg = cp.katppuccino6 }, -- For constants + TSConstBuiltin = { fg = cp.katppuccino6, 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. @@ -39,7 +39,7 @@ function M.get(cp) -- TSNone = { }; -- TODO: docs -- TSNumber = { }; -- For all numbers TSOperator = { fg = cp.katppuccino2 }, -- For any operator: `+`, but also `->` and `*` in cp. - TSParameter = { fg = cp.catppuccino7 }, -- For parameters of a function. + TSParameter = { fg = cp.katppuccino6 }, -- For parameters of a function. -- TSParameterReference= { }; -- For references to parameters of a function. TSProperty = { fg = cp.katppuccino5 }, -- Same as `TSField`. tomlTSProperty = { fg = cp.catppuccino10 }, -- Differentiates between string and properties diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index bad7c37..19bf025 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -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 paikatppuccino5 bracket, and its match. |pi_paren.txt| + MatchParen = { fg = cp.katppuccino6, 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' @@ -82,12 +82,12 @@ local function get_base() -- code itself - Constant = { fg = cp.catppuccino7 }, -- (preferkatppuccino5) any constant + Constant = { fg = cp.katppuccino6 }, -- (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 + Number = { fg = cp.katppuccino6 }, -- a number constant: 234, 0xff + Float = { fg = cp.katppuccino6 }, -- a floating point constant: 2.3e10 + Boolean = { fg = cp.katppuccino6 }, -- a boolean constant: TRUE, false 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 }, -- (preferkatppuccino5) any statement @@ -127,7 +127,7 @@ local function get_base() qfFileName = { fg = cp.catppuccino10 }, htmlH1 = { fg = cp.katppuccino4, style = "bold" }, htmlH2 = { fg = cp.catppuccino10, style = "bold" }, - -- mkdHeading = { fg = cp.catppuccino7, style = "bold" }, + -- mkdHeading = { fg = cp.katppuccino6, style = "bold" }, -- mkdCode = { bg = cp.terminal_black, fg = cp.catppuccino11 }, mkdCodeDelimiter = { bg = cp.katppuccino1, fg = cp.catppuccino11 }, mkdCodeStart = { fg = cp.katppuccino2, style = "bold" }, @@ -145,7 +145,7 @@ local function get_base() diffRemoved = { fg = cp.katppuccino5 }, diffChanged = { fg = cp.catppuccino9 }, diffOldFile = { fg = cp.catppuccino9 }, - diffNewFile = { fg = cp.catppuccino7 }, + diffNewFile = { fg = cp.katppuccino6 }, diffFile = { fg = cp.catppuccino10 }, diffLine = { fg = cp.catppuccino12 }, diffIndexLine = { fg = cp.katppuccino4 }, @@ -214,7 +214,7 @@ local function get_terminal() g.terminal_color_4 = cp.katppuccino3 g.terminal_color_5 = cp.katppuccino4 g.terminal_color_6 = cp.katppuccino5 - g.terminal_color_7 = cp.catppuccino7 + g.terminal_color_7 = cp.katppuccino6 g.terminal_color_8 = cp.catppuccino8 g.terminal_color_9 = cp.catppuccino9 g.terminal_color_10 = cp.catppuccino10