Merge pull request #73 from jorgebef/dev

feat: tweaked some colors and updated certain integrations

lua/catppuccin/core/color_palette.lua

@@ -1,25 +1,25 @@
 local color_palette = {
 	-- morning palette
-	catppuccin0 = "#AEE3B8",
+	catppuccin0 = "#AEE3B8", -- Teal
-	catppuccin2 = "#F2CECF",
+	catppuccin2 = "#F2CECF", -- Flamingo
-	catppuccin4 = "#E5B4E2",
+	catppuccin3 = "#CCA5E5", -- Magenta
-	catppuccin3 = "#CCA5E5",
+	catppuccin4 = "#E5B4E2", -- Pink
-	catppuccin5 = "#E28A8D",
+	catppuccin5 = "#E28A8D", -- Red
-	catppuccin6 = "#F9C096",
+	catppuccin6 = "#F9C096", -- Orange
-	catppuccin7 = "#BEE4ED",
+	catppuccin7 = "#BEE4ED", -- Light Blue
-	catppuccin8 = "#EBDDAD",
+	catppuccin8 = "#EBDDAD", -- Yellow
-	catppuccin9 = "#A4B9EF",
+	catppuccin9 = "#A4B9EF", -- Blue
 
 	-- night palette
-	catppuccin13 = "#15121C",
+	catppuccin13 = "#15121C", -- Black0
-	catppuccin14 = "#1B1923",
+	catppuccin14 = "#1B1923", -- Black1
-	catppuccin1 = "#1E1E28",
+	catppuccin1 = "#1E1E28", -- Black2
-	catppuccin16 = "#332E41",
+	catppuccin16 = "#332E41", -- Black3
-	catppuccin12 = "#575268",
+	catppuccin12 = "#575268", -- Black4
-	catppuccin11 = "#6E6C7E",
+	catppuccin11 = "#6E6C7E", -- Gray0
-	catppuccin17 = "#988BA2",
+	catppuccin17 = "#988BA2", -- Gray1
-	catppuccin15 = "#C3BAC6",
+	catppuccin15 = "#C3BAC6", -- Gray2
-	catppuccin10 = "#D6D7E5",
+	catppuccin10 = "#D6D7E5", -- White
 }
 
 return color_palette

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|
 	}

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

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.
+		TSTag               = { fg = cp.catppuccin6 };    -- Tags like html tag names.
-		-- TSTagDelimiter      = { };    -- Tag delimiter like < > /
+		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.

lua/lualine/themes/catppuccin.lua

@@ -2,35 +2,35 @@ 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 },
 }
 
 catppuccin.inactive = {
-	a = { bg = cp.catppuccin14, fg = cp.catppuccin9 },
+	a = { bg = cp.catppuccin1, fg = cp.catppuccin9 },
-	b = { bg = cp.catppuccin14, fg = cp.catppuccin12, gui = "bold" },
+	b = { bg = cp.catppuccin1, fg = cp.catppuccin12, gui = "bold" },
-	c = { bg = cp.catppuccin14, fg = cp.catppuccin11 },
+	c = { bg = cp.catppuccin1, fg = cp.catppuccin11 },
 }
 
 return catppuccin