From b4a8c281315ac0ded4fa90acbc15327b3bd4ee2c Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Thu, 28 Oct 2021 23:49:58 -0500 Subject: [PATCH] fix: renaming colors -> done with cp3-5 --- .../core/integrations/indent_blankline.lua | 2 +- lua/catppuccino/core/integrations/lightspeed.lua | 4 ++-- lua/catppuccino/core/integrations/lsp_trouble.lua | 2 +- lua/catppuccino/core/integrations/markdown.lua | 2 +- lua/catppuccino/core/integrations/neogit.lua | 4 ++-- lua/catppuccino/core/integrations/nvimtree.lua | 4 ++-- lua/catppuccino/core/integrations/treesitter.lua | 12 ++++++------ lua/catppuccino/core/integrations/ts_rainbow.lua | 2 +- lua/catppuccino/core/integrations/vim_sneak.lua | 2 +- lua/catppuccino/core/integrations/which_key.lua | 2 +- lua/catppuccino/core/mapper.lua | 14 +++++++------- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/lua/catppuccino/core/integrations/indent_blankline.lua b/lua/catppuccino/core/integrations/indent_blankline.lua index deb47a8..4eec127 100644 --- a/lua/catppuccino/core/integrations/indent_blankline.lua +++ b/lua/catppuccino/core/integrations/indent_blankline.lua @@ -12,7 +12,7 @@ function M.get(cp) hi["IndentBlanklineIndent4"] = {blend = "nocombine", fg = cp.green} hi["IndentBlanklineIndent3"] = {blend = "nocombine", fg = cp.orange} hi["IndentBlanklineIndent2"] = {blend = "nocombine", fg = cp.blue} - hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.magenta} + hi["IndentBlanklineIndent1"] = {blend = "nocombine", fg = cp.catppuccino5} end return hi diff --git a/lua/catppuccino/core/integrations/lightspeed.lua b/lua/catppuccino/core/integrations/lightspeed.lua index 6d76cff..264701b 100644 --- a/lua/catppuccino/core/integrations/lightspeed.lua +++ b/lua/catppuccino/core/integrations/lightspeed.lua @@ -30,8 +30,8 @@ function M.get(cp) return { LightspeedLabel = {catppuccino2 = cp.catppuccino2_search, fg = cp.fg}, LightspeedOverlapped = {catppuccino2 = cp.catppuccino2_visual, fg = cp.fg}, - LightspeedLabelDistant = {catppuccino2 = cp.magenta_br, fg = cp.fg}, - LightspeedLabelDistantOverlapped = {catppuccino2 = cp.magenta_br, fg = cp.fg}, + LightspeedLabelDistant = {catppuccino2 = cp.catppuccino4, fg = cp.fg}, + LightspeedLabelDistantOverlapped = {catppuccino2 = cp.catppuccino4, fg = cp.fg}, LightspeedShortcut = {catppuccino2 = cp.catppuccino2, fg = cp.orange, style = "italic"}, LightspeedShortcutOverlapped = {catppuccino2 = cp.catppuccino2, fg = cp.orange, style = "bold"}, LightspeedMaskedChar = {catppuccino2 = cp.catppuccino2, fg = cp.red, style = "undercurl"}, diff --git a/lua/catppuccino/core/integrations/lsp_trouble.lua b/lua/catppuccino/core/integrations/lsp_trouble.lua index e79d199..b2f0f4d 100644 --- a/lua/catppuccino/core/integrations/lsp_trouble.lua +++ b/lua/catppuccino/core/integrations/lsp_trouble.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) return { LspTroubleText = { fg = cp.fg_alt }, - LspTroubleCount = { fg = cp.magenta, catppuccino2 = cp.fg_gutter }, + LspTroubleCount = { fg = cp.catppuccino5, catppuccino2 = cp.fg_gutter }, LspTroubleNormal = { fg = cp.fg_sidebar, catppuccino2 = cp.catppuccino2_sidebar }, } end diff --git a/lua/catppuccino/core/integrations/markdown.lua b/lua/catppuccino/core/integrations/markdown.lua index c51cdd5..2952d82 100644 --- a/lua/catppuccino/core/integrations/markdown.lua +++ b/lua/catppuccino/core/integrations/markdown.lua @@ -5,7 +5,7 @@ function M.get(cp) markdownHeadingDelimiter = { fg = cp.orange, style = "bold" }, markdownCode = { fg = cp.catppuccino3 }, markdownCodeBlock = { fg = cp.catppuccino3 }, - markdownH1 = { fg = cp.magenta, style = "bold" }, + markdownH1 = { fg = cp.catppuccino5, style = "bold" }, markdownH2 = { fg = cp.blue, style = "bold" }, markdownLinkText = { fg = cp.blue, style = "underline" }, } diff --git a/lua/catppuccino/core/integrations/neogit.lua b/lua/catppuccino/core/integrations/neogit.lua index 4e1e26f..b4a1ddd 100644 --- a/lua/catppuccino/core/integrations/neogit.lua +++ b/lua/catppuccino/core/integrations/neogit.lua @@ -3,8 +3,8 @@ local util = require("catppuccino.utils.util") function M.get(cp) return { - NeogitBranch = { fg = cp.magenta }, - NeogitRemote = { fg = cp.pink }, + NeogitBranch = { fg = cp.catppuccino5 }, + NeogitRemote = { fg = cp.catppuccino5 }, NeogitHunkHeader = { catppuccino2 = cp.catppuccino2_highlight, fg = cp.fg }, NeogitHunkHeaderHighlight = { catppuccino2 = cp.fg_gutter, fg = cp.blue }, NeogitDiffContextHighlight = { catppuccino2 = util.darken(cp.fg_gutter, 0.5), fg = cp.fg_alt }, diff --git a/lua/catppuccino/core/integrations/nvimtree.lua b/lua/catppuccino/core/integrations/nvimtree.lua index 0f3e615..324b1f4 100644 --- a/lua/catppuccino/core/integrations/nvimtree.lua +++ b/lua/catppuccino/core/integrations/nvimtree.lua @@ -18,14 +18,14 @@ function M.get(cp) NvimTreeIndentMarker = { fg = cp.comment }, NvimTreeVertSplit = { fg = cp.black, catppuccino2 = cp.black }, NvimTreeRootFolder = { fg = root_dir_color, style = "bold" }, - NvimTreeSymlink = { fg = cp.magenta }, + NvimTreeSymlink = { fg = cp.catppuccino5 }, NvimTreeStatuslineNc = { fg = cp.black, catppuccino2 = 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 }, - NvimTreeOpenedFile = { fg = cp.magenta }, + NvimTreeOpenedFile = { fg = cp.catppuccino5 }, } end diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index f153803..91e6222 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -17,22 +17,22 @@ function M.get(cp) TSNote = { fg = cp.catppuccino2, catppuccino2 = cp.info }, TSWarning = { fg = cp.catppuccino2, catppuccino2 = cp.warning }, TSDanger = { fg = cp.catppuccino2, catppuccino2 = cp.error }, - TSConstructor = { fg = cp.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. + TSConstructor = { fg = cp.catppuccino5 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. TSConditional = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords related to conditionnals. TSConstant = { fg = cp.orange }, -- For constants TSConstBuiltin = { fg = cp.orange_br, 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.magenta_br, style = cnf.styles.keywords }, -- For exception related keywords. + TSException = { fg = cp.catppuccino4, style = cnf.styles.keywords }, -- For exception related keywords. TSField = { fg = cp.red }, -- For fields. rustTSField = { fg = util.darken(cp.catppuccino0, 0.75) }, -- For fields. -- TSFloat = { }; -- For floats. TSFunction = { fg = cp.blue, style = cnf.styles.functions }, -- For function (calls and definitions). TSFuncBuiltin = { fg = cp.catppuccino3 }, -- For builtin functions: `table.insert` in Lua. TSFuncMacro = { fg = cp.red }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscp. - TSInclude = { fg = cp.magenta, style = cnf.styles.keywords }, -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. - TSKeyword = { fg = cp.magenta, style = cnf.styles.keywords }, -- For keywords that don't fall in previous categories. - TSKeywordFunction = { fg = cp.magenta_br, style = cnf.styles.keywords }, -- For keywords used to define a fuction. + 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 TSLabel = { fg = cp.blue }, -- For labels: `label:` in C and `:label:` in Lua. -- TSMethod = { }; -- For method calls and definitions. @@ -50,7 +50,7 @@ function M.get(cp) TSRepeat = { fg = cp.red, style = cnf.styles.keywords }, -- For keywords related to loops. -- TSString = { }; -- For strings. TSStringRegex = { fg = cp.blue, style = cnf.styles.strings }, -- For regexes. - TSStringEscape = { fg = cp.magenta, style = cnf.styles.strings }, -- For escape characters within a string. + 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. diff --git a/lua/catppuccino/core/integrations/ts_rainbow.lua b/lua/catppuccino/core/integrations/ts_rainbow.lua index 43e3e0e..f723d95 100644 --- a/lua/catppuccino/core/integrations/ts_rainbow.lua +++ b/lua/catppuccino/core/integrations/ts_rainbow.lua @@ -6,7 +6,7 @@ function M.get(cp) rainbowcol2 = {catppuccino2 = cp.catppuccino2, fg = cp.green}, rainbowcol3 = {catppuccino2 = cp.catppuccino2, fg = cp.yellow}, rainbowcol4 = {catppuccino2 = cp.catppuccino2, fg = cp.blue}, - rainbowcol5 = {catppuccino2 = cp.catppuccino2, fg = cp.magenta}, + rainbowcol5 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino5}, rainbowcol6 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino3}, rainbowcol7 = {catppuccino2 = cp.catppuccino2, fg = cp.catppuccino0}, } diff --git a/lua/catppuccino/core/integrations/vim_sneak.lua b/lua/catppuccino/core/integrations/vim_sneak.lua index d4e4bf5..e5747ee 100644 --- a/lua/catppuccino/core/integrations/vim_sneak.lua +++ b/lua/catppuccino/core/integrations/vim_sneak.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - Sneak = { fg = cp.catppuccino2_highlight, catppuccino2 = cp.magenta }, + Sneak = { fg = cp.catppuccino2_highlight, catppuccino2 = cp.catppuccino5 }, SneakScope = { catppuccino2 = cp.catppuccino2_visual }, } end diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua index 358f8db..0f5aae6 100644 --- a/lua/catppuccino/core/integrations/which_key.lua +++ b/lua/catppuccino/core/integrations/which_key.lua @@ -4,7 +4,7 @@ function M.get(cp) return { WhichKey = { fg = cp.catppuccino3 }, WhichKeyGroup = { fg = cp.blue }, - WhichKeyDesc = { fg = cp.magenta }, + WhichKeyDesc = { fg = cp.catppuccino5 }, WhichKeySeperator = { fg = cp.comment }, WhichKeySeparator = { fg = cp.comment }, WhichKeyFloat = { catppuccino2 = cp.catppuccino2_sidebar }, diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index d4c4579..be9b97a 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -91,16 +91,16 @@ local function get_base() Boolean = { fg = cp.orange_br }, -- a boolean constant: TRUE, false Identifier = { fg = cp.catppuccino3, style = cnf.styles.variables }, -- (preferred) any variable name Function = { fg = cp.blue, style = cnf.styles.functions }, -- function name (also: methods for classes) - Statement = { fg = cp.magenta_br }, -- (preferred) any statement + Statement = { fg = cp.catppuccino4 }, -- (preferred) any statement Conditional = { fg = cp.red }, -- if, then, else, endif, switch, etcp. Repeat = { fg = cp.red }, -- for, do, while, etcp. - Label = { fg = cp.magenta_br }, -- case, default, etcp. + Label = { fg = cp.catppuccino4 }, -- case, default, etcp. Operator = { fg = cp.fg_alt }, -- "sizeof", "+", "*", etcp. - Keyword = { fg = cp.magenta, style = cnf.styles.keywords }, -- any other keyword + Keyword = { fg = cp.catppuccino5, style = cnf.styles.keywords }, -- any other keyword -- Exception = { }, -- try, catch, throw - PreProc = { fg = cp.pink }, -- (preferred) generic Preprocessor - Include = { fg = cp.pink }, -- preprocessor #include + PreProc = { fg = cp.catppuccino5 }, -- (preferred) generic Preprocessor + Include = { fg = cp.catppuccino5 }, -- preprocessor #include -- Define = { }, -- preprocessor #define -- Macro = { }, -- same as Define -- PreCondit = { }, -- preprocessor #if, #else, #endif, etcp. @@ -126,7 +126,7 @@ local function get_base() Todo = { catppuccino2 = cp.yellow, fg = cp.catppuccino2, style = "bold" }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX qfLineNr = { fg = cp.yellow }, qfFileName = { fg = cp.blue }, - htmlH1 = { fg = cp.magenta, style = "bold" }, + htmlH1 = { fg = cp.catppuccino5, style = "bold" }, htmlH2 = { fg = cp.blue, style = "bold" }, -- mkdHeading = { fg = cp.orange, style = "bold" }, -- mkdCode = { catppuccino2 = cp.terminal_black, fg = cp.fg }, @@ -149,7 +149,7 @@ local function get_base() diffNewFile = { fg = cp.orange }, diffFile = { fg = cp.blue }, diffLine = { fg = cp.comment }, - diffIndexLine = { fg = cp.magenta }, + 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|