Merge branch 'dev' into dev

README.md

@@ -115,6 +115,7 @@ integrations = {
 	nvimtree = {
 		enabled = true,
 		show_root = false,
+		transparent_panel = false,
 	},
 	which_key = false,
 	indent_blankline = {
@@ -243,6 +244,7 @@ integration = {
   nvimtree = {
     enabled = true,
     show_root = true, -- makes the root folder not transparent
+	transparent_panel = false, -- make the panel transparent
   }
 }
 ```

lua/catppuccin/config.lua

@@ -37,6 +37,7 @@ config.options = {
 		nvimtree = {
 			enabled = true,
 			show_root = false,
+			transparent_panel = false,
 		},
 		which_key = false,
 		indent_blankline = {
@@ -53,8 +54,8 @@ config.options = {
 		lightspeed = false,
 		ts_rainbow = false,
 		hop = false,
-        notify = true,
-        telekasten = true,
+		notify = true,
+		telekasten = true,
 	},
 }
 

lua/catppuccin/core/color_palette.lua

@@ -1,26 +1,26 @@
 local color_palette = {
 	rosewater = "#F5E0DC", -- Rosewater
 	flamingo = "#F2CDCD", -- Flamingo
-	mauve = "#DFB1EB", -- Mauve
+	mauve = "#DDB6F2", -- Mauve
 	pink = "#F5C2E7", -- Pink
-	red = "#F08FA9", -- Red
+	red = "#F28FAD", -- Red
 	maroon = "#E8A2AF", -- Maroon
-	peach = "#F9C296", -- Peach
-	yellow = "#F0DEAA", -- Yellow
-	green = "#ACE5AB", -- Green
-	blue = "#98BBF5", -- Blue
+	peach = "#F8BD96", -- Peach
+	yellow = "#FAE3B0", -- Yellow
+	green = "#ABE9B3", -- Green
+	blue = "#96CDFB", -- Blue
 	sky = "#89DCEB", -- Sky
 	teal = "#B5E8E0", -- Teal
 	lavender = "#C9CBFF", -- Lavender
-	white = "#DEDDF0", -- White
+	white = "#D9E0EE", -- White
 	gray2 = "#C3BAC6", -- Gray2
 	gray1 = "#988BA2", -- Gray1
 	gray0 = "#6E6C7E", -- Gray0
 	black4 = "#575268", -- Black4
-	black3 = "#332E41", -- Black3
-	black2 = "#1E1D2D", -- Black2
-	black1 = "#1B1923", -- Black1
-	black0 = "#15121C", -- Black0
+	black3 = "#302D41", -- Black3
+	black2 = "#1E1E2E", -- Black2
+	black1 = "#1A1826", -- Black1
+	black0 = "#161320", -- Black0
 }
 
 return color_palette

lua/catppuccin/core/integrations/neogit.lua

@@ -5,10 +5,10 @@ function M.get(cp)
 		NeogitBranch = { fg = cp.pink },
 		NeogitRemote = { fg = cp.pink },
 		NeogitHunkHeader = { bg = cp.blue, fg = cp.white },
-		NeogitHunkHeaderHighlight = { bg = cp.black4, fg = cp.blue },
-		NeogitDiffContextHighlight = { bg = cp.gray2, fg = cp.green },
-		NeogitDiffDeleteHighlight = { fg = cp.red, bg = cp.black2 },
-		NeogitDiffAddHighlight = { fg = cp.green, bg = cp.black2 },
+		NeogitHunkHeaderHighlight = { bg = cp.black2, fg = cp.blue },
+		NeogitDiffContextHighlight = { bg = cp.black1, fg = cp.gray2 },
+		NeogitDiffDeleteHighlight = { bg = cp.black1, fg = cp.red },
+		NeogitDiffAddHighlight = { bg = cp.black1, fg = cp.green },
 	}
 end
 

lua/catppuccin/core/integrations/nvimtree.lua

@@ -10,6 +10,7 @@ function M.get(cp)
 		root_dir_color = cp.blue
 	end
 
+
 	return {
 		NvimTreeFolderName = { fg = cp.blue },
 		NvimTreeFolderIcon = { fg = cp.blue },

lua/catppuccin/core/integrations/treesitter.lua

@@ -24,7 +24,7 @@ function M.get(cp)
 		TSNumber = { fg = math_logic, style = "bold,italic" }, -- For all numbers
 		TSBoolean = { fg = math_logic, style = "bold,italic" }, -- For booleans.
 
-		TSConstructor = { fg = cp.white }, -- For constructor calls and definitions: = { } in Lua, and Java constructors.
+		TSConstructor = { fg = cp.lavender }, -- For constructor calls and definitions: = { } in Lua, and Java constructors.
 		TSConstant = { fg = cp.peach }, -- For constants
 		TSConditional = { fg = cl, style = "bold" }, -- For keywords related to conditionnals.
 		TSRepeat = { fg = cl, style = "bold" }, -- For keywords related to loops.
@@ -58,7 +58,7 @@ function M.get(cp)
 		-- TSNone              = { };    -- TODO: docs
 		-- TSParameterReference= { };    -- For references to parameters of a function.
 		tomlTSProperty = { fg = cp.blue }, -- Differentiates between string and properties
-		TSPunctDelimiter = { fg = delimeters }, -- For delimiters ie: .
+		TSPunctDelimiter = { fg = cp.teal }, -- For delimiters ie: .
 		TSPunctBracket = { fg = delimeters }, -- For brackets and parenthesis.
 		TSString = { fg = cp.green }, -- For strings.
 		TSStringRegex = { fg = cp.peach, style = cnf.styles.strings }, -- For regexes.
@@ -77,9 +77,9 @@ function M.get(cp)
 		-- TSURI               = { };    -- Any URI like a link or email.
 		--
 		-- Markdown tresitter parser support
-		TSURI = { fg = cp.flamingo, style = "italic,underline" }, -- urls, links and emails
-		TSLiteral = { fg = cp.green, style = "italic" }, -- used for inline code in markdown and for doc in python (""")
-		TSTextReference = { fg = cp.teal, style = "bold" }, -- references
+		TSURI = { fg = cp.rosewater, style = "italic,underline" }, -- urls, links and emails
+		TSLiteral = { fg = cp.teal, style = "italic" }, -- used for inline code in markdown and for doc in python (""")
+		TSTextReference = { fg = cp.lavender, style = "bold" }, -- references
 		TSTitle = { fg = cp.blue, style = "bold" }, -- titles like: # Example
 		TSEmphasis = { fg = cp.maroon, style = "italic" }, -- bold
 		TSStrong = { fg = cp.maroon, style = "bold" }, -- italic
@@ -97,7 +97,7 @@ function M.get(cp)
 		javaTSConstant = { fg = cp.teal },
 
 		-- typescript
-		typescriptTSProperty = { fg = cp.mauve, style = "italic" }, -- Same as TSField.
+		typescriptTSProperty = { fg = cp.lavender, style = "italic" }, -- Same as TSField.
 
 		-- css
 		cssTSType = { fg = cp.lavender },

lua/catppuccin/core/integrations/ts_rainbow.lua

@@ -1,14 +1,16 @@
 local M = {}
 
 function M.get(cp)
+	local transparent_background = require("catppuccin.config").options.transparent_background
+	local bg_highlight = transparent_background and "NONE" or cp.black2
 	return {
-		rainbowcol1 = {bg = cp.black2, fg = cp.red},
-		rainbowcol2 = {bg = cp.black2, fg = cp.teal},
-		rainbowcol3 = {bg = cp.black2, fg = cp.yellow},
-		rainbowcol4 = {bg = cp.black2, fg = cp.blue},
-		rainbowcol5 = {bg = cp.black2, fg = cp.pink},
-		rainbowcol6 = {bg = cp.black2, fg = cp.flamingo},
-		rainbowcol7 = {bg = cp.black2, fg = cp.green},
+		rainbowcol1 = {bg = bg_highlight, fg = cp.red},
+		rainbowcol2 = {bg = bg_highlight, fg = cp.teal},
+		rainbowcol3 = {bg = bg_highlight, fg = cp.yellow},
+		rainbowcol4 = {bg = bg_highlight, fg = cp.blue},
+		rainbowcol5 = {bg = bg_highlight, fg = cp.pink},
+		rainbowcol6 = {bg = bg_highlight, fg = cp.flamingo},
+		rainbowcol7 = {bg = bg_highlight, fg = cp.green},
 	}
 end
 

lua/catppuccin/utils/util.lua

@@ -117,23 +117,29 @@ function util.properties(tbl)
 end
 
 function util.terminal(cp)
-	g.terminal_color_0 = cp.catppuccin1
-	g.terminal_color_1 = cp.catppuccin5
-	g.terminal_color_2 = cp.catppuccin7
-	g.terminal_color_3 = cp.catppuccin8
-	g.terminal_color_4 = cp.catppuccin9
-	g.terminal_color_5 = cp.catppuccin3
-	g.terminal_color_6 = cp.catppuccin4
-	g.terminal_color_7 = cp.catppuccin0
-
-	g.terminal_color_8 = cp.catppuccin1
-	g.terminal_color_9 = cp.catppuccin5
-	g.terminal_color_10 = cp.catppuccin7
-	g.terminal_color_11 = cp.catppuccin8
-	g.terminal_color_12 = cp.catppuccin9
-	g.terminal_color_13 = cp.catppuccin3
-	g.terminal_color_14 = cp.catppuccin4
-	g.terminal_color_15 = cp.catppuccin0
+	g.terminal_color_0 = cp.gray0
+	g.terminal_color_8 = cp.gray1
+
+	g.terminal_color_1 = cp.red
+	g.terminal_color_9 = cp.red
+
+	g.terminal_color_2 = cp.green
+	g.terminal_color_10 = cp.green
+
+	g.terminal_color_3 = cp.yellow
+	g.terminal_color_11 = cp.yellow
+
+	g.terminal_color_4 = cp.blue
+	g.terminal_color_12 = cp.blue
+
+	g.terminal_color_5 = cp.pink
+	g.terminal_color_13 = cp.pink
+
+	g.terminal_color_6 = cp.sky
+	g.terminal_color_14 = cp.sky
+
+	g.terminal_color_7 = cp.white
+	g.terminal_color_15 = cp.white
 end
 
 function util.load(theme)

lua/lightline/colorscheme/catppuccin.lua

@@ -4,7 +4,7 @@ local catppuccin = {}
 catppuccin.normal = {
 	left = { { cp.black1, cp.blue }, { cp.blue, cp.black2 } },
 	middle = { { cp.blue, cp.black4 } },
-	right = { { cp.black0, cp.black2 }, { cp.blue, cp.black2 } },
+	right = { { cp.gray0, cp.black2 }, { cp.blue, cp.black3 } },
 	error = { { cp.black1, cp.red } },
 	warning = { { cp.black1, cp.yellow } },
 }