fix: merge conflict

README.md

@@ -154,7 +154,10 @@ integrations = {
 	gitgutter = false,
 	gitsigns = false,
 	telescope = false,
-	nvimtree = false,
+	nvimtree = {
+		enabled = false,
+		show_root = false,
+	},
 	which_key = false,
 	indent_blankline = false,
 	dashboard = false,
@@ -204,7 +207,10 @@ catppuccino.setup(
 			gitgutter = false,
 			gitsigns = false,
 			telescope = false,
-			nvimtree = false,
+			nvimtree = {
+				enabled = false,
+				show_root = false,
+			},
 			which_key = false,
 			indent_blankline = false,
 			dashboard = false,
@@ -261,7 +267,10 @@ catppuccino.setup(
 			gitgutter = false,
 			gitsigns = false,
 			telescope = false,
-			nvimtree = false,
+			nvimtree = {
+				enabled = false,
+				show_root = false,
+			},
 			which_key = false,
 			indent_blankline = false,
 			dashboard = false,
@@ -350,6 +359,17 @@ let g:lightline = {'colorscheme': 'catppuccino'}
 
 -   **Kitty:** Copy and paste the file corresponding to theme you want to use from [this directory](https://github.com/Pocco81/Catppuccino.nvim/tree/main/extra/kitty) on your Kitty config.
 -   **Alacritty:** Copy and paste the file corresponding to theme you want to use from [this directory](https://github.com/Pocco81/Catppuccino.nvim/tree/main/extra/alacritty) on your Alacritty config.
+-   **NvimTree:** setting `enabled` to `true` enables this integration:
+
+```lua
+integration = {
+  nvimtree = {
+    enabled = true,
+    show_root = true, -- makes the root folder not transparent
+  }
+}
+```
+>>>>>>> main
 
 ## List of colorschemes
 

lua/catppuccino/color_schemes/catppuccino.lua

@@ -31,7 +31,7 @@ local colors = {
 		add = "#dfdfe0",
 		change = "#F6A878",
 		delete = "#e06c75",
-        conflict = "#FFE37E"
+		conflict = "#FFE37E",
 	},
 }
 
@@ -44,7 +44,7 @@ colors.diff = { -- also used for gitsigns
 	add = util.darken(colors.blue, 0.50),
 	delete = util.darken(colors.red, 0.50),
 	change = util.darken(colors.yellow, 0.50),
-    text = colors.blue
+	text = colors.blue,
 }
 
 colors.git.ignore = colors.black

lua/catppuccino/color_schemes/light_melya.lua

@@ -32,7 +32,7 @@ local colors = {
 		change = "#F4843E",
 		delete = "#e06c75",
 		conflict = "#FFE070",
-    }
+	},
 }
 
 util.bg = colors.bg
@@ -45,7 +45,7 @@ colors.diff = {
 	add = util.darken(colors.blue, 0.50),
 	delete = util.darken(colors.red, 0.50),
 	change = util.darken(colors.yellow, 0.50),
-    text = colors.blue
+	text = colors.blue,
 }
 
 colors.git.ignore = colors.black

lua/catppuccino/color_schemes/neon_latte.lua

@@ -31,7 +31,7 @@ local colors = {
 		add = "#dfdfe0",
 		change = "#F8B58C",
 		delete = "#e06c75",
-        conflict = "#FFE070"
+		conflict = "#FFE070",
 	},
 }
 
@@ -44,7 +44,7 @@ colors.diff = { -- also used for gitsigns
 	add = util.darken(colors.blue, 0.50),
 	delete = util.darken(colors.red, 0.50),
 	change = util.darken(colors.yellow, 0.50),
-    text = colors.blue
+	text = colors.blue,
 }
 
 colors.git.ignore = colors.black

lua/catppuccino/config.lua

@@ -19,15 +19,18 @@ config.options = {
 				errors = "italic",
 				hints = "italic",
 				warnings = "italic",
-				information = "italic"
-			}
+				information = "italic",
+			},
 		},
 		lsp_trouble = false,
 		lsp_saga = false,
 		gitgutter = false,
 		gitsigns = false,
 		telescope = false,
-		nvimtree = false,
+		nvimtree = {
+			enabled = false,
+			show_root = false,
+		},
 		which_key = false,
 		indent_blankline = false,
 		dashboard = false,
@@ -37,7 +40,7 @@ config.options = {
 		barbar = false,
 		bufferline = false,
 		markdown = false,
-	}
+	},
 }
 
 function config.set_options(opts)

lua/catppuccino/core/cs.lua

@@ -15,7 +15,11 @@ function M.get_color_scheme(cs)
 	local good, color_scheme = pcall(require, "catppuccino.color_schemes." .. cs)
 
 	if not good then
-		return {status = false, msg = "Catppuccino: the colorscheme '" .. cs .. "' was not recognized. Defaulting to Catppuccino Dark."}, require("catppuccino.color_schemes.catppuccino")
+		return {
+			status = false,
+			msg = "Catppuccino: the colorscheme '" .. cs .. "' was not recognized. Defaulting to Catppuccino Dark.",
+		},
+			require("catppuccino.color_schemes.catppuccino")
 	end
 
 	if not (next(remaps) == nil) then

lua/catppuccino/core/integrations/barbar.lua

@@ -20,7 +20,7 @@ function M.get(cpt)
 		BufferInactiveSign = { bg = cpt.bg_statusline, fg = cpt.border_highlight },
 		BufferInactiveTarget = { bg = cpt.bg_statusline, fg = cpt.red },
 		BufferTabpages = { bg = cpt.bg_statusline, fg = cpt.none },
-        BufferTabpage = {bg = cpt.bg_statusline, fg = cpt.border_highlight}
+		BufferTabpage = { bg = cpt.bg_statusline, fg = cpt.border_highlight },
 	}
 end
 

lua/catppuccino/core/integrations/bufferline.lua

@@ -19,7 +19,7 @@ function M.get(cpt)
 		-- close buttons
 		BufferLineCloseButton = { fg = cpt.gray, bg = cpt.black },
 		BufferLineCloseButtonVisible = { fg = cpt.gray, bg = cpt.black },
-        BufferLineCloseButtonSelected = {fg = cpt.red, bg = cpt.bg}
+		BufferLineCloseButtonSelected = { fg = cpt.red, bg = cpt.bg },
 	}
 end
 

lua/catppuccino/core/integrations/dashboard.lua

@@ -5,7 +5,7 @@ function M.get(cpt)
 		DashboardShortCut = { fg = cpt.cyan },
 		DashboardHeader = { fg = cpt.yellow },
 		DashboardCenter = { fg = cpt.green },
-        DashboardFooter = {fg = cpt.orange, style = "italic"}
+		DashboardFooter = { fg = cpt.orange, style = "italic" },
 	}
 end
 

lua/catppuccino/core/integrations/fern.lua

@@ -2,7 +2,7 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        FernBranchText = {fg = cpt.blue}
+		FernBranchText = { fg = cpt.blue },
 	}
 end
 

lua/catppuccino/core/integrations/gitgutter.lua

@@ -4,7 +4,7 @@ function M.get(cpt)
 	return {
 		GitGutterAdd = { fg = cpt.gitSigns.add }, -- diff mode: Added line |diff.txt|
 		GitGutterChange = { fg = cpt.gitSigns.change }, -- diff mode: Changed line |diff.txt|
-        GitGutterDelete = {fg = cpt.gitSigns.delete} -- diff mode: Deleted line |diff.txt|
+		GitGutterDelete = { fg = cpt.gitSigns.delete }, -- diff mode: Deleted line |diff.txt|
 	}
 end
 return M

lua/catppuccino/core/integrations/gitsigns.lua

@@ -4,7 +4,7 @@ function M.get(cpt)
 	return {
 		GitSignsAdd = { fg = cpt.diff.add, bg = cpt.bg }, -- diff mode: Added line |diff.txt|
 		GitSignsChange = { fg = cpt.diff.change, bg = cpt.bg }, -- diff mode: Changed line |diff.txt|
-        GitSignsDelete = {fg = cpt.diff.delete, bg = cpt.bg} -- diff mode: Deleted line |diff.txt|
+		GitSignsDelete = { fg = cpt.diff.delete, bg = cpt.bg }, -- diff mode: Deleted line |diff.txt|
 	}
 end
 

lua/catppuccino/core/integrations/indent_blankline.lua

@@ -2,7 +2,7 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        IndentBlanklineChar = {fg = cpt.gray}
+		IndentBlanklineChar = { fg = cpt.gray },
 	}
 end
 

lua/catppuccino/core/integrations/lsp_saga.lua

@@ -21,7 +21,7 @@ function M.get(cpt)
 		DefinitionCount = { fg = cpt.purple },
 		DefinitionIcon = { fg = cpt.blue },
 		ReferencesIcon = { fg = cpt.blue },
-        TargetWord = {fg = cpt.cyan}
+		TargetWord = { fg = cpt.cyan },
 	}
 end
 return M

lua/catppuccino/core/integrations/lsp_trouble.lua

@@ -4,7 +4,7 @@ function M.get(cpt)
 	return {
 		LspTroubleText = { fg = cpt.fg_alt },
 		LspTroubleCount = { fg = cpt.magenta, bg = cpt.fg_gutter },
-        LspTroubleNormal = {fg = cpt.fg_sidebar, bg = cpt.bg_sidebar}
+		LspTroubleNormal = { fg = cpt.fg_sidebar, bg = cpt.bg_sidebar },
 	}
 end
 

lua/catppuccino/core/integrations/markdown.lua

@@ -7,7 +7,7 @@ function M.get(cpt)
 		markdownCodeBlock = { fg = cpt.cyan },
 		markdownH1 = { fg = cpt.magenta, style = "bold" },
 		markdownH2 = { fg = cpt.blue, style = "bold" },
-        markdownLinkText = {fg = cpt.blue, style = "underline"}
+		markdownLinkText = { fg = cpt.blue, style = "underline" },
 	}
 end
 

lua/catppuccino/core/integrations/native_lsp.lua

@@ -31,7 +31,7 @@ function M.get(cpt)
 		LspDiagnosticsUnderlineWarning = { style = "underline", sp = cpt.warning }, -- Used to underline "Warning" diagnostics
 		LspDiagnosticsUnderlineInformation = { style = "underline", sp = cpt.info }, -- Used to underline "Information" diagnostics
 		LspDiagnosticsUnderlineHint = { style = "underline", sp = cpt.hint }, -- Used to underline "Hint" diagnostics
-        LspCodeLens = {fg = cpt.comment} -- virtual text of the codelens
+		LspCodeLens = { fg = cpt.comment }, -- virtual text of the codelens
 	}
 end
 

lua/catppuccino/core/integrations/neogit.lua

@@ -9,7 +9,7 @@ function M.get(cpt)
 		NeogitHunkHeaderHighlight = { bg = cpt.fg_gutter, fg = cpt.blue },
 		NeogitDiffContextHighlight = { bg = util.darken(cpt.fg_gutter, 0.5), fg = cpt.fg_alt },
 		NeogitDiffDeleteHighlight = { fg = cpt.git.delete, bg = cpt.diff.delete },
-        NeogitDiffAddHighlight = {fg = cpt.git.add, bg = cpt.diff.add}
+		NeogitDiffAddHighlight = { fg = cpt.git.add, bg = cpt.diff.add },
 	}
 end
 

lua/catppuccino/core/integrations/nvimtree.lua

@@ -1,6 +1,14 @@
 local M = {}
 
 function M.get(cpt)
+	local config = require("catppuccino.config").options
+
+	local root_dir_color = cpt.bg_sidebar
+
+	if config.integrations.nvimtree.show_root then
+		root_dir_color = cpt.blue
+	end
+
 	return {
 		NvimTreeFolderName = { fg = cpt.blue },
 		NvimTreeFolderIcon = { fg = cpt.blue },
@@ -9,7 +17,7 @@ function M.get(cpt)
 		NvimTreeEmptyFolderName = { fg = cpt.blue_br },
 		NvimTreeIndentMarker = { fg = cpt.comment },
 		NvimTreeVertSplit = { fg = cpt.black, bg = cpt.black },
-        NvimTreeRootFolder = {fg = cpt.black, style = "bold"},
+		NvimTreeRootFolder = { fg = root_dir_color, style = "bold" },
 		NvimTreeSymlink = { fg = cpt.magenta },
 		NvimTreeStatuslineNc = { fg = cpt.black, bg = cpt.black },
 		NvimTreeGitDirty = { fg = cpt.git.change },
@@ -17,7 +25,7 @@ function M.get(cpt)
 		NvimTreeGitDeleted = { fg = cpt.git.delete },
 		NvimTreeSpecialFile = { fg = cpt.cyan },
 		NvimTreeImageFile = { fg = cpt.fg_sidebar },
-        NvimTreeOpenedFile = {fg = cpt.magenta}
+		NvimTreeOpenedFile = { fg = cpt.magenta },
 	}
 end
 

lua/catppuccino/core/integrations/telescope.lua

@@ -5,7 +5,7 @@ function M.get(cpt)
 		TelescopeBorder = { fg = cpt.border_highlight },
 		TelescopeSelectionCaret = { fg = cpt.cyan },
 		TelescopeSelection = { fg = cpt.cyan, bg = cpt.bg_highlight },
-        TelescopeMatching = {fg = cpt.blue}
+		TelescopeMatching = { fg = cpt.blue },
 	}
 end
 

lua/catppuccino/core/integrations/treesitter.lua

@@ -58,7 +58,7 @@ function M.get(cpt)
 		-- TSTag               = { };    -- Tags like html tag names.
 		-- TSTagDelimiter      = { };    -- Tag delimiter like `<` `>` `/`
 		-- TSText              = { };    -- For strings considered text in a markup language.
-		TSTextReference = {fg = cpt.cyan}
+		TSTextReference = { fg = cpt.cyan },
 		-- TSEmphasis          = { };    -- For text to be represented with emphasis.
 		-- TSUnderline         = { };    -- For text to be represented with an underline.
 		-- TSStrike            = { };    -- For strikethrough texcpt.
@@ -69,4 +69,3 @@ function M.get(cpt)
 end
 
 return M
-

lua/catppuccino/core/integrations/vim_sneak.lua

@@ -3,7 +3,7 @@ local M = {}
 function M.get(cpt)
 	return {
 		Sneak = { fg = cpt.bg_highlight, bg = cpt.magenta },
-        SneakScope = {bg = cpt.bg_visual}
+		SneakScope = { bg = cpt.bg_visual },
 	}
 end
 

lua/catppuccino/core/integrations/which_key.lua

@@ -8,7 +8,7 @@ function M.get(cpt)
 		WhichKeySeperator = { fg = cpt.comment },
 		WhichKeySeparator = { fg = cpt.comment },
 		WhichKeyFloat = { bg = cpt.bg_sidebar },
-        WhichKeyValue = {fg = cpt.comment}
+		WhichKeyValue = { fg = cpt.comment },
 	}
 end
 

lua/catppuccino/core/mapper.lua

@@ -164,7 +164,7 @@ local function get_base()
 		GlyphPalette4 = { fg = cpt.blue },
 		GlyphPalette6 = { fg = cpt.green_br },
 		GlyphPalette7 = { fg = cpt.fg },
-        GlyphPalette9 = {fg = cpt.red}
+		GlyphPalette9 = { fg = cpt.red },
 	}
 end
 
@@ -175,17 +175,17 @@ local function get_integrations()
 
 	for integration in pairs(integrations) do
 		local cot = false
-        if (type(integrations[integration]) == "table") then
-            if (integrations[integration]["enabled"] == true) then
+		if type(integrations[integration]) == "table" then
+			if integrations[integration]["enabled"] == true then
 				cot = true
 			end
 		else
-            if (integrations[integration] == true) then
+			if integrations[integration] == true then
 				cot = true
 			end
 		end
 
-        if (cot) then
+		if cot then
 			table.insert(final_integrations, require("catppuccino.core.integrations." .. integration).get(cpt))
 		end
 	end
@@ -197,10 +197,10 @@ local function get_properties()
 	local cpt = get_cs()
 	local props = {
 		termguicolors = true,
-        background = "dark"
+		background = "dark",
 	}
 
-    if (colors_util.assert_brightness(cpt.bg)) then
+	if colors_util.assert_brightness(cpt.bg) then
 		props["background"] = "light"
 	end
 

lua/catppuccino/main.lua

@@ -5,14 +5,14 @@ local utils = require("catppuccino.utils.util")
 local function load(args)
 	local catppuccino = require("catppuccino")
 
-    if (catppuccino.before_loading ~= nil) then
+	if catppuccino.before_loading ~= nil then
 		catppuccino.before_loading()
 	end
 
 	local theme = require("catppuccino.core.mapper").apply(args)
 	utils.load(theme)
 
-    if (catppuccino.after_loading ~= nil) then
+	if catppuccino.after_loading ~= nil then
 		catppuccino.after_loading()
 	end
 end
@@ -20,7 +20,7 @@ end
 function M.main(option, args)
 	option = option or "load"
 
-	if (option == "load") then
+	if option == "load" then
 		load(args)
 	else
 		print("Catppuccino: command was not recognized")

lua/catppuccino/utils/colors.lua

@@ -20,7 +20,7 @@ function M.assert_brightness(color)
 	local g = M.hex2rgb(string.sub(hex, 3, 4))
 	local b = M.hex2rgb(string.sub(hex, 5, 6))
 
-    if (color_is_bright(tonumber(r), tonumber(g), tonumber(b)) == true) then
+	if color_is_bright(tonumber(r), tonumber(g), tonumber(b)) == true then
 		return true -- bright
 	end
 

lua/catppuccino/utils/hsluv.lua

@@ -112,7 +112,7 @@ hsluv.xyz_to_rgb = function(tuple)
 	return {
 		hsluv.from_linear(hsluv.dot_product(hsluv.m[1], tuple)),
 		hsluv.from_linear(hsluv.dot_product(hsluv.m[2], tuple)),
-        hsluv.from_linear(hsluv.dot_product(hsluv.m[3], tuple))
+		hsluv.from_linear(hsluv.dot_product(hsluv.m[3], tuple)),
 	}
 end
 
@@ -121,7 +121,7 @@ hsluv.rgb_to_xyz = function(tuple)
 	return {
 		hsluv.dot_product(hsluv.minv[1], rgbl),
 		hsluv.dot_product(hsluv.minv[2], rgbl),
-        hsluv.dot_product(hsluv.minv[3], rgbl)
+		hsluv.dot_product(hsluv.minv[3], rgbl),
 	}
 end
 
@@ -322,12 +322,12 @@ end
 hsluv.m = {
 	{ 3.240969941904521, -1.537383177570093, -0.498610760293 },
 	{ -0.96924363628087, 1.87596750150772, 0.041555057407175 },
-    {0.055630079696993, -0.20397695888897, 1.056971514242878}
+	{ 0.055630079696993, -0.20397695888897, 1.056971514242878 },
 }
 hsluv.minv = {
 	{ 0.41239079926595, 0.35758433938387, 0.18048078840183 },
 	{ 0.21263900587151, 0.71516867876775, 0.072192315360733 },
-    {0.019330818715591, 0.11919477979462, 0.95053215224966}
+	{ 0.019330818715591, 0.11919477979462, 0.95053215224966 },
 }
 hsluv.refY = 1.0
 hsluv.refU = 0.19783000664283

lua/catppuccino/utils/util.lua

@@ -104,7 +104,7 @@ end
 
 function util.syntax(tbl)
 	for group, colors in pairs(tbl) do
-        if (type(group) == "number") then
+		if type(group) == "number" then
 			for inner_group, clrs in pairs(colors) do
 				util.highlight(inner_group, clrs)
 			end

lua/lightline/colorscheme/catppuccino.lua

@@ -1,4 +1,6 @@
-local good, color_scheme = require("catppuccino.core.cs").get_color_scheme(require("catppuccino.config").options["cptcheme"])
+local good, color_scheme = require("catppuccino.core.cs").get_color_scheme(
+	require("catppuccino.config").options["cptcheme"]
+)
 
 if not good then
 	print(color_scheme) -- error message
@@ -13,32 +15,32 @@ catppuccino.normal = {
 	middle = { { cpt.blue, cpt.fg_gutter } },
 	right = { { cpt.fg_sidebar, cpt.bg_statusline }, { cpt.blue, cpt.bg } },
 	error = { { cpt.black, cpt.error } },
-    warning = {{cpt.black, cpt.warning}}
+	warning = { { cpt.black, cpt.warning } },
 }
 
 catppuccino.insert = {
-    left = {{cpt.black, cpt.green}, {cpt.blue, cpt.bg}}
+	left = { { cpt.black, cpt.green }, { cpt.blue, cpt.bg } },
 }
 
 catppuccino.visual = {
-    left = {{cpt.black, cpt.magenta}, {cpt.blue, cpt.bg}}
+	left = { { cpt.black, cpt.magenta }, { cpt.blue, cpt.bg } },
 }
 
 catppuccino.replace = {
-    left = {{cpt.black, cpt.red}, {cpt.blue, cpt.bg}}
+	left = { { cpt.black, cpt.red }, { cpt.blue, cpt.bg } },
 }
 
 catppuccino.inactive = {
 	left = { { cpt.blue, cpt.bg_statusline }, { cpt.comment, cpt.bg } },
 	middle = { { cpt.fg_gutter, cpt.bg_statusline } },
-    right = {{cpt.fg_gutter, cpt.bg_statusline}, {cpt.comment, cpt.bg}}
+	right = { { cpt.fg_gutter, cpt.bg_statusline }, { cpt.comment, cpt.bg } },
 }
 
 catppuccino.tabline = {
 	left = { { cpt.comment, cpt.bg_highlight }, { cpt.comment, cpt.bg } },
 	middle = { { cpt.fg_gutter, cpt.bg_statusline } },
 	right = { { cpt.fg_gutter, cpt.bg_statusline }, { cpt.comment, cpt.bg } },
-    tabsel = {{cpt.blue, cpt.fg_gutter}, {cpt.comment, cpt.bg}}
+	tabsel = { { cpt.blue, cpt.fg_gutter }, { cpt.comment, cpt.bg } },
 }
 
 return catppuccino

lua/lualine/themes/catppuccino.lua

@@ -1,4 +1,6 @@
-local err, color_scheme = require("catppuccino.core.cs").get_color_scheme(require("catppuccino.config").options["colorscheme"])
+local err, color_scheme = require("catppuccino.core.cs").get_color_scheme(
+	require("catppuccino.config").options["colorscheme"]
+)
 
 if not err.status then
 	vim.api.nvim_err_writeln(err.msg)
@@ -10,33 +12,33 @@ local catppuccino = {}
 catppuccino.normal = {
 	a = { bg = cpt.blue, fg = cpt.black },
 	b = { bg = cpt.fg_gutter, fg = cpt.blue },
-    c = {bg = cpt.bg_statusline, fg = cpt.fg_sidebar}
+	c = { bg = cpt.bg_statusline, fg = cpt.fg_sidebar },
 }
 
 catppuccino.insert = {
 	a = { bg = cpt.green, fg = cpt.black },
-    b = {bg = cpt.fg_gutter, fg = cpt.green}
+	b = { bg = cpt.fg_gutter, fg = cpt.green },
 }
 
 catppuccino.command = {
 	a = { bg = cpt.orange, fg = cpt.black },
-    b = {bg = cpt.fg_gutter, fg = cpt.orange}
+	b = { bg = cpt.fg_gutter, fg = cpt.orange },
 }
 
 catppuccino.visual = {
 	a = { bg = cpt.magenta, fg = cpt.black },
-    b = {bg = cpt.fg_gutter, fg = cpt.magenta}
+	b = { bg = cpt.fg_gutter, fg = cpt.magenta },
 }
 
 catppuccino.replace = {
 	a = { bg = cpt.red_bg, fg = cpt.black },
-    b = {bg = cpt.fg_gutter, fg = cpt.red_bg}
+	b = { bg = cpt.fg_gutter, fg = cpt.red_bg },
 }
 
 catppuccino.inactive = {
 	a = { bg = cpt.bg_statusline, fg = cpt.blue },
 	b = { bg = cpt.bg_statusline, fg = cpt.fg_gutter, gui = "bold" },
-    c = {bg = cpt.bg_statusline, fg = cpt.fg_gutter}
+	c = { bg = cpt.bg_statusline, fg = cpt.fg_gutter },
 }
 
 return catppuccino

stylua.toml

@@ -0,0 +1,5 @@
+column_width = 120
+line_endings = "Unix"
+indent_type = "Tabs"
+indent_width = 4
+quote_style = "AutoPreferDouble"