From cd0b85ca42d025e4baa7e1d4601182aad70bb185 Mon Sep 17 00:00:00 2001 From: Jorge Befan Date: Sun, 19 Dec 2021 12:59:45 +0100 Subject: [PATCH 1/6] Changing Add color from blue to green (teal) for it to be more intuitive --- lua/catppuccin/core/integrations/gitsigns.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/catppuccin/core/integrations/gitsigns.lua b/lua/catppuccin/core/integrations/gitsigns.lua index d0a2f0c..0c70560 100644 --- a/lua/catppuccin/core/integrations/gitsigns.lua +++ b/lua/catppuccin/core/integrations/gitsigns.lua @@ -2,7 +2,7 @@ local M = {} function M.get(cp) return { - GitSignsAdd = { fg = cp.catppuccin9, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- diff mode: Added line |diff.txt| + GitSignsAdd = { fg = cp.catppuccin0, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- diff mode: Added line |diff.txt| GitSignsChange = { fg = cp.catppuccin8, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- diff mode: Changed line |diff.txt| GitSignsDelete = { fg = cp.catppuccin5, bg = cnf.transparency and cp.none or cp.catppuccin1 }, -- diff mode: Deleted line |diff.txt| } From 4bea8d3600032c1fcc0f60c460d6583cc6bc3752 Mon Sep 17 00:00:00 2001 From: Jorge Befan Date: Sun, 19 Dec 2021 13:01:16 +0100 Subject: [PATCH 2/6] Making section a that signals mode bold and changing Insert to teal for it to be more distinguishible from Normal --- lua/lualine/themes/catppuccin.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lua/lualine/themes/catppuccin.lua b/lua/lualine/themes/catppuccin.lua index fd2c75c..0e8aff6 100644 --- a/lua/lualine/themes/catppuccin.lua +++ b/lua/lualine/themes/catppuccin.lua @@ -2,28 +2,28 @@ local cp = require("catppuccin.core.color_palette") local catppuccin = {} catppuccin.normal = { - a = { bg = cp.catppuccin9, fg = cp.catppuccin14 }, + a = { bg = cp.catppuccin9, fg = cp.catppuccin14, gui = "bold" }, b = { bg = cp.catppuccin12, fg = cp.catppuccin9 }, c = { bg = cp.catppuccin14, fg = cp.catppuccin10 }, } catppuccin.insert = { - a = { bg = cp.catppuccin7, fg = cp.catppuccin14 }, + a = { bg = cp.catppuccin0, fg = cp.catppuccin1, gui = "bold" }, b = { bg = cp.catppuccin12, fg = cp.catppuccin7 }, } catppuccin.command = { - a = { bg = cp.catppuccin6, fg = cp.catppuccin14 }, + a = { bg = cp.catppuccin6, fg = cp.catppuccin1, gui = "bold" }, b = { bg = cp.catppuccin12, fg = cp.catppuccin6 }, } catppuccin.visual = { - a = { bg = cp.catppuccin3, fg = cp.catppuccin14 }, + a = { bg = cp.catppuccin3, fg = cp.catppuccin1, gui = "bold" }, b = { bg = cp.catppuccin12, fg = cp.catppuccin3 }, } catppuccin.replace = { - a = { bg = cp.catppuccin5, fg = cp.catppuccin14 }, + a = { bg = cp.catppuccin5, fg = cp.catppuccin1, gui = "bold" }, b = { bg = cp.catppuccin12, fg = cp.catppuccin5 }, } From d000c6211a84835778306a910920d6f223afa274 Mon Sep 17 00:00:00 2001 From: Jorge Befan Date: Sun, 19 Dec 2021 13:02:43 +0100 Subject: [PATCH 3/6] Adding comments with color names for easier indentification --- lua/catppuccin/core/color_palette.lua | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lua/catppuccin/core/color_palette.lua b/lua/catppuccin/core/color_palette.lua index 4e62fa2..af30d5f 100644 --- a/lua/catppuccin/core/color_palette.lua +++ b/lua/catppuccin/core/color_palette.lua @@ -1,25 +1,25 @@ local color_palette = { -- morning palette - catppuccin0 = "#AEE3B8", - catppuccin2 = "#F2CECF", - catppuccin4 = "#E5B4E2", - catppuccin3 = "#CCA5E5", - catppuccin5 = "#E28A8D", - catppuccin6 = "#F9C096", - catppuccin7 = "#BEE4ED", - catppuccin8 = "#EBDDAD", - catppuccin9 = "#A4B9EF", + catppuccin0 = "#AEE3B8", -- Teal + catppuccin2 = "#F2CECF", -- Flamingo + catppuccin3 = "#CCA5E5", -- Magenta + catppuccin4 = "#E5B4E2", -- Pink + catppuccin5 = "#E28A8D", -- Red + catppuccin6 = "#F9C096", -- Orange + catppuccin7 = "#BEE4ED", -- Light Blue + catppuccin8 = "#EBDDAD", -- Yellow + catppuccin9 = "#A4B9EF", -- Blue -- night palette - catppuccin13 = "#15121C", - catppuccin14 = "#1B1923", - catppuccin1 = "#1E1E28", - catppuccin16 = "#332E41", - catppuccin12 = "#575268", - catppuccin11 = "#6E6C7E", - catppuccin17 = "#988BA2", - catppuccin15 = "#C3BAC6", - catppuccin10 = "#D6D7E5", + catppuccin13 = "#15121C", -- Black0 + catppuccin14 = "#1B1923", -- Black1 + catppuccin1 = "#1E1E28", -- Black2 + catppuccin16 = "#332E41", -- Black3 + catppuccin12 = "#575268", -- Black4 + catppuccin11 = "#6E6C7E", -- Gray0 + catppuccin17 = "#988BA2", -- Gray1 + catppuccin15 = "#C3BAC6", -- Gray2 + catppuccin10 = "#D6D7E5", -- White } return color_palette From cb05389ec3a0dbc71a3eac8bbe1d3c80f04a2bd3 Mon Sep 17 00:00:00 2001 From: Jorge Befan Date: Sun, 19 Dec 2021 13:13:23 +0100 Subject: [PATCH 4/6] Tweaking colors for Tags, etc... --- lua/catppuccin/core/integrations/treesitter.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/catppuccin/core/integrations/treesitter.lua b/lua/catppuccin/core/integrations/treesitter.lua index 344f38e..b8bac86 100644 --- a/lua/catppuccin/core/integrations/treesitter.lua +++ b/lua/catppuccin/core/integrations/treesitter.lua @@ -44,7 +44,7 @@ function M.get(cp) -- TSConstMacro = { }; -- For constants that are defined by macros: NULL in cp. TSError = { fg = cp.catppuccin5 }, -- For syntax/parser errors. -- rustTSField = { fg = cp.catppuccin12 }, -- For fields. - -- TSFloat = { }; -- For floats. + TSFloat = { fg = cp.catppuccin6 }; -- For floats. TSLabel = { fg = cp.catppuccin9 }, -- For labels: label: in C and :label: in Lua. TSMethod = { fg = cp.catppuccin9, style = "italic" }, -- For method calls and definitions. TSNamespace = { fg = cp.catppuccin2, style = "italic" }, -- For identifiers referring to modules and namespaces. @@ -60,8 +60,8 @@ function M.get(cp) TSType = { fg = cp.catppuccin8 }; -- For types. TSVariable = { fg = cp.catppuccin10, style = cnf.styles.variables }, -- Any variable name that does not have another highlighcp. TSTagAttribute = { fg = cp.catppuccin3, style = "italic" }, -- Tags like html tag names. - -- TSTag = { }; -- Tags like html tag names. - -- TSTagDelimiter = { }; -- Tag delimiter like < > / + TSTag = { fg = cp.catppuccin6 }; -- Tags like html tag names. + TSTagDelimiter = { fg = cp.catppuccin5 }; -- Tag delimiter like < > / TSText = { fg = cp.catppuccin10 }, -- For strings considerated text in a markup language. -- TSEmphasis = { }; -- For text to be represented with emphasis. -- TSUnderline = { }; -- For text to be represented with an underline. From b876fb4e2901783a3473293499ba9d1353e164e0 Mon Sep 17 00:00:00 2001 From: Jorge Befan Date: Sun, 19 Dec 2021 13:15:01 +0100 Subject: [PATCH 5/6] Dimming inactive lines while turning active white --- lua/catppuccin/core/integrations/indent_blankline.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/catppuccin/core/integrations/indent_blankline.lua b/lua/catppuccin/core/integrations/indent_blankline.lua index bc1fbc0..ab276bc 100644 --- a/lua/catppuccin/core/integrations/indent_blankline.lua +++ b/lua/catppuccin/core/integrations/indent_blankline.lua @@ -3,7 +3,8 @@ local M = {} function M.get(cp) local hi = { - IndentBlanklineChar = { fg = cp.catppuccin12 }, + IndentBlanklineChar = { fg = cp.catppuccin16 }, + IndentBlanklineContextChar = { fg = cp.catppuccin10 }, } if cnf.integrations.indent_blankline.colored_indent_levels then From 897f9d39647be1c01272d25eb00e7ea6560d3b77 Mon Sep 17 00:00:00 2001 From: Jorge Befan Date: Sun, 19 Dec 2021 14:03:43 +0100 Subject: [PATCH 6/6] setting inactive split to have same background as the main part of the split --- lua/lualine/themes/catppuccin.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua/lualine/themes/catppuccin.lua b/lua/lualine/themes/catppuccin.lua index 0e8aff6..6cb0fa5 100644 --- a/lua/lualine/themes/catppuccin.lua +++ b/lua/lualine/themes/catppuccin.lua @@ -28,9 +28,9 @@ catppuccin.replace = { } catppuccin.inactive = { - a = { bg = cp.catppuccin14, fg = cp.catppuccin9 }, - b = { bg = cp.catppuccin14, fg = cp.catppuccin12, gui = "bold" }, - c = { bg = cp.catppuccin14, fg = cp.catppuccin11 }, + a = { bg = cp.catppuccin1, fg = cp.catppuccin9 }, + b = { bg = cp.catppuccin1, fg = cp.catppuccin12, gui = "bold" }, + c = { bg = cp.catppuccin1, fg = cp.catppuccin11 }, } return catppuccin