From bfa735fc85ae195fb6dc37036484937ec9c1ebdd Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Wed, 5 Jan 2022 10:45:52 -0500 Subject: [PATCH] feat: migrated misleading color name (magenta -> mauve) --- lua/catppuccin/core/color_palette.lua | 2 +- lua/catppuccin/core/integrations/cmp.lua | 2 +- lua/catppuccin/core/integrations/feline.lua | 8 ++++---- lua/catppuccin/core/integrations/lightspeed.lua | 4 ++-- lua/catppuccin/core/integrations/treesitter.lua | 6 +++--- lua/catppuccin/core/mapper.lua | 2 +- lua/lightline/colorscheme/catppuccin.lua | 2 +- lua/lualine/themes/catppuccin.lua | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lua/catppuccin/core/color_palette.lua b/lua/catppuccin/core/color_palette.lua index e9d5ce8..0a166fe 100644 --- a/lua/catppuccin/core/color_palette.lua +++ b/lua/catppuccin/core/color_palette.lua @@ -1,7 +1,7 @@ local color_palette = { rosewater = "#F5E0DC", -- Rosewater flamingo = "#F2CDCD", -- Flamingo - magenta = "#DFB1EB", -- Magenta + mauve = "#DFB1EB", -- Mauve pink = "#F5C2E7", -- Pink red = "#F08FA9", -- Red maroon = "#E8A2AF", -- Maroon diff --git a/lua/catppuccin/core/integrations/cmp.lua b/lua/catppuccin/core/integrations/cmp.lua index f734f88..556c366 100644 --- a/lua/catppuccin/core/integrations/cmp.lua +++ b/lua/catppuccin/core/integrations/cmp.lua @@ -10,7 +10,7 @@ function M.get(cp) CmpItemAbbrMatchFuzzy = { fg = cp.white, style = "bold" }, -- kind support - CmpItemKindSnippet = { fg = cp.magenta }, + CmpItemKindSnippet = { fg = cp.mauve }, CmpItemKindKeyword = { fg = cp.red }, CmpItemKindText = { fg = cp.teal }, CmpItemKindMethod = { fg = cp.blue }, diff --git a/lua/catppuccin/core/integrations/feline.lua b/lua/catppuccin/core/integrations/feline.lua index 46e69e6..0444e04 100644 --- a/lua/catppuccin/core/integrations/feline.lua +++ b/lua/catppuccin/core/integrations/feline.lua @@ -31,7 +31,7 @@ local clrs = require("catppuccin.core.color_palette") -- settings local sett = { bkg = clrs.black3, - diffs = clrs.magenta, + diffs = clrs.mauve, extras = clrs.gray1, curr_file = clrs.maroon, curr_dir = clrs.flamingo, @@ -56,7 +56,7 @@ local mode_colors = { ["ce"] = { "COMMAND", clrs.peach }, ["r"] = { "PROMPT", clrs.teal }, ["rm"] = { "MORE", clrs.teal }, - ["r?"] = { "CONFIRM", clrs.magenta }, + ["r?"] = { "CONFIRM", clrs.mauve }, ["!"] = { "SHELL", clrs.green }, } @@ -136,8 +136,8 @@ components.active[1][3] = { -- there is a dilema: we need to hide Diffs if ther is no git info. We can do that, but this will -- leave the right_semicircle colored with purple, and since we can't change the color conditonally --- then the solution is to create two right_semicircles: one with a magenta sett.bkg and the other one normal --- sett.bkg; both have the same fg (vi mode). The magenta one appears if there is git info, else the one with +-- then the solution is to create two right_semicircles: one with a mauve sett.bkg and the other one normal +-- sett.bkg; both have the same fg (vi mode). The mauve one appears if there is git info, else the one with -- the normal sett.bkg appears. Fixed :) -- enable if git diffs are not available diff --git a/lua/catppuccin/core/integrations/lightspeed.lua b/lua/catppuccin/core/integrations/lightspeed.lua index 108c2e7..0565df4 100644 --- a/lua/catppuccin/core/integrations/lightspeed.lua +++ b/lua/catppuccin/core/integrations/lightspeed.lua @@ -30,8 +30,8 @@ function M.get(cp) return { LightspeedLabel = {bg = cp.black4, fg = cp.white}, LightspeedOverlapped = {bg = cp.black4, fg = cp.white}, - LightspeedLabelDistant = {bg = cp.magenta, fg = cp.white}, - LightspeedLabelDistantOverlapped = {bg = cp.magenta, fg = cp.white}, + LightspeedLabelDistant = {bg = cp.mauve, fg = cp.white}, + LightspeedLabelDistantOverlapped = {bg = cp.mauve, fg = cp.white}, LightspeedShortcut = {bg = cp.black2, fg = cp.peach, style = "italic"}, LightspeedShortcutOverlapped = {bg = cp.black2, fg = cp.peach, style = "bold"}, LightspeedMaskedChar = {bg = cp.black2, fg = cp.red, style = "undercurl"}, diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index 2c792e6..a079e15 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -3,7 +3,7 @@ local M = {} function M.get(cp) local delimeters = cp.gray1 local operators = cp.sky - local cl = cp.magenta -- conditionals, loops + local cl = cp.mauve -- conditionals, loops local keywords = cp.red local math_logic = cp.peach @@ -65,7 +65,7 @@ function M.get(cp) -- TSSymbol = { }; -- For identifiers referring to symbols or atoms. TSType = { fg = cp.yellow }, -- For types. TSVariable = { fg = cp.white, style = cnf.styles.variables }, -- Any variable name that does not have another highlighcp. - TSTagAttribute = { fg = cp.magenta, style = "italic" }, -- Tags like html tag names. + TSTagAttribute = { fg = cp.mauve, style = "italic" }, -- Tags like html tag names. TSTag = { fg = cp.peach }, -- Tags like html tag names. TSTagDelimiter = { fg = cp.maroon }, -- Tag delimiter like < > / TSText = { fg = cp.white }, -- For strings considerated text in a markup language. @@ -97,7 +97,7 @@ function M.get(cp) javaTSConstant = { fg = cp.teal }, -- typescript - typescriptTSProperty = { fg = cp.magenta, style = "italic" }, -- Same as TSField. + typescriptTSProperty = { fg = cp.mauve, style = "italic" }, -- Same as TSField. -- css cssTSType = { fg = cp.lavender }, diff --git a/lua/catppuccin/core/mapper.lua b/lua/catppuccin/core/mapper.lua index 152798e..3f97382 100644 --- a/lua/catppuccin/core/mapper.lua +++ b/lua/catppuccin/core/mapper.lua @@ -91,7 +91,7 @@ local function get_base() Boolean = { fg = cp.peach }, -- a boolean constant: TRUE, false Identifier = { fg = cp.flamingo, 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 }, -- (preferred) any statement + Statement = { fg = cp.mauve }, -- (preferred) any statement Conditional = { fg = cp.red }, -- if, then, else, endif, switch, etcp. Repeat = { fg = cp.red }, -- for, do, while, etcp. Label = { fg = cp.peach }, -- case, default, etcp. diff --git a/lua/lightline/colorscheme/catppuccin.lua b/lua/lightline/colorscheme/catppuccin.lua index e94242d..2beb2c2 100644 --- a/lua/lightline/colorscheme/catppuccin.lua +++ b/lua/lightline/colorscheme/catppuccin.lua @@ -14,7 +14,7 @@ catppuccin.insert = { } catppuccin.visual = { - left = { { cp.black1, cp.magenta }, { cp.blue, cp.black2 } }, + left = { { cp.black1, cp.mauve }, { cp.blue, cp.black2 } }, } catppuccin.replace = { diff --git a/lua/lualine/themes/catppuccin.lua b/lua/lualine/themes/catppuccin.lua index 9602a5f..6fd1ecc 100644 --- a/lua/lualine/themes/catppuccin.lua +++ b/lua/lualine/themes/catppuccin.lua @@ -18,8 +18,8 @@ catppuccin.command = { } catppuccin.visual = { - a = { bg = cp.magenta, fg = cp.black2, gui = "bold" }, - b = { bg = cp.black4, fg = cp.magenta }, + a = { bg = cp.mauve, fg = cp.black2, gui = "bold" }, + b = { bg = cp.black4, fg = cp.mauve }, } catppuccin.replace = {