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,13 +15,17 @@ 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
-		return {status = true}, vim.tbl_deep_extend("force", color_scheme, remaps)
+		return { status = true }, vim.tbl_deep_extend("force", color_scheme, remaps)
 	else
-		return {status = true}, color_scheme
+		return { status = true }, color_scheme
 	end
 end
 

lua/catppuccino/core/integrations/barbar.lua

@@ -4,23 +4,23 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        BufferCurrent = {bg = cpt.fg_gutter, fg = cpt.fg},
-        BufferCurrentIndex = {bg = cpt.fg_gutter, fg = cpt.info},
-        BufferCurrentMod = {bg = cpt.fg_gutter, fg = cpt.warning},
-        BufferCurrentSign = {bg = cpt.fg_gutter, fg = cpt.info},
-        BufferCurrentTarget = {bg = cpt.fg_gutter, fg = cpt.red},
-        BufferVisible = {bg = cpt.bg_statusline, fg = cpt.fg},
-        BufferVisibleIndex = {bg = cpt.bg_statusline, fg = cpt.info},
-        BufferVisibleMod = {bg = cpt.bg_statusline, fg = cpt.warning},
-        BufferVisibleSign = {bg = cpt.bg_statusline, fg = cpt.info},
-        BufferVisibleTarget = {bg = cpt.bg_statusline, fg = cpt.red},
-        BufferInactive = {bg = cpt.bg_statusline, fg = cpt.comment},
-        BufferInactiveIndex = {bg = cpt.bg_statusline, fg = cpt.comment},
-        BufferInactiveMod = {bg = cpt.bg_statusline, fg = util.darken(cpt.warning, 0.7)},
-        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}
+		BufferCurrent = { bg = cpt.fg_gutter, fg = cpt.fg },
+		BufferCurrentIndex = { bg = cpt.fg_gutter, fg = cpt.info },
+		BufferCurrentMod = { bg = cpt.fg_gutter, fg = cpt.warning },
+		BufferCurrentSign = { bg = cpt.fg_gutter, fg = cpt.info },
+		BufferCurrentTarget = { bg = cpt.fg_gutter, fg = cpt.red },
+		BufferVisible = { bg = cpt.bg_statusline, fg = cpt.fg },
+		BufferVisibleIndex = { bg = cpt.bg_statusline, fg = cpt.info },
+		BufferVisibleMod = { bg = cpt.bg_statusline, fg = cpt.warning },
+		BufferVisibleSign = { bg = cpt.bg_statusline, fg = cpt.info },
+		BufferVisibleTarget = { bg = cpt.bg_statusline, fg = cpt.red },
+		BufferInactive = { bg = cpt.bg_statusline, fg = cpt.comment },
+		BufferInactiveIndex = { bg = cpt.bg_statusline, fg = cpt.comment },
+		BufferInactiveMod = { bg = cpt.bg_statusline, fg = util.darken(cpt.warning, 0.7) },
+		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 },
 	}
 end
 

lua/catppuccino/core/integrations/bufferline.lua

@@ -4,22 +4,22 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        BufferLineFill = {bg = util.brighten(cpt.bg, 0.04)},
-        BufferLineBackground = {fg = cpt.gray, bg = cpt.black},
-        BufferLineBufferVisible = {fg = cpt.gray, bg = cpt.black},
-        BufferLineBufferSelected = {fg = cpt.fg, bg = cpt.bg},
-        BufferLineTab = {fg = cpt.gray, bg = cpt.bg},
-        BufferLineTabSelected = {fg = cpt.red, bg = cpt.blue},
-        BufferLineTabClose = {fg = cpt.red, bg = cpt.black},
-        BufferLineIndicatorSelected = {fg = cpt.bg, bg = cpt.bg},
+		BufferLineFill = { bg = util.brighten(cpt.bg, 0.04) },
+		BufferLineBackground = { fg = cpt.gray, bg = cpt.black },
+		BufferLineBufferVisible = { fg = cpt.gray, bg = cpt.black },
+		BufferLineBufferSelected = { fg = cpt.fg, bg = cpt.bg },
+		BufferLineTab = { fg = cpt.gray, bg = cpt.bg },
+		BufferLineTabSelected = { fg = cpt.red, bg = cpt.blue },
+		BufferLineTabClose = { fg = cpt.red, bg = cpt.black },
+		BufferLineIndicatorSelected = { fg = cpt.bg, bg = cpt.bg },
 		-- separators
-        BufferLineSeparator = {fg = cpt.black, bg = cpt.black},
-        BufferLineSeparatorVisible = {fg = cpt.black, bg = cpt.black},
-        BufferLineSeparatorSelected = {fg = cpt.black, bg = cpt.black},
+		BufferLineSeparator = { fg = cpt.black, bg = cpt.black },
+		BufferLineSeparatorVisible = { fg = cpt.black, bg = cpt.black },
+		BufferLineSeparatorSelected = { fg = cpt.black, bg = cpt.black },
 		-- close buttons
-        BufferLineCloseButton = {fg = cpt.gray, bg = cpt.black},
-        BufferLineCloseButtonVisible = {fg = cpt.gray, bg = cpt.black},
-        BufferLineCloseButtonSelected = {fg = cpt.red, bg = cpt.bg}
+		BufferLineCloseButton = { fg = cpt.gray, bg = cpt.black },
+		BufferLineCloseButtonVisible = { fg = cpt.gray, bg = cpt.black },
+		BufferLineCloseButtonSelected = { fg = cpt.red, bg = cpt.bg },
 	}
 end
 

lua/catppuccino/core/integrations/dashboard.lua

@@ -2,10 +2,10 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        DashboardShortCut = {fg = cpt.cyan},
-        DashboardHeader = {fg = cpt.yellow},
-        DashboardCenter = {fg = cpt.green},
-        DashboardFooter = {fg = cpt.orange, style = "italic"}
+		DashboardShortCut = { fg = cpt.cyan },
+		DashboardHeader = { fg = cpt.yellow },
+		DashboardCenter = { fg = cpt.green },
+		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

@@ -2,9 +2,9 @@ local M = {}
 
 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|
+		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|
 	}
 end
 return M

lua/catppuccino/core/integrations/gitsigns.lua

@@ -2,9 +2,9 @@ local M = {}
 
 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|
+		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|
 	}
 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

@@ -2,26 +2,26 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        DiagnosticError = {fg = cpt.error},
-        DiagnosticWarning = {fg = cpt.warning},
-        DiagnosticInformation = {fg = cpt.info},
-        DiagnosticHint = {fg = cpt.hint},
-        LspFloatWinNormal = {bg = cpt.bg_float},
-        LspFloatWinBorder = {fg = cpt.border_highlight},
-        LspSagaBorderTitle = {fg = cpt.cyan},
-        LspSagaHoverBorder = {fg = cpt.blue},
-        LspSagaRenameBorder = {fg = cpt.green},
-        LspSagaDefPreviewBorder = {fg = cpt.green},
-        LspSagaCodeActionBorder = {fg = cpt.blue},
-        LspSagaFinderSelection = {fg = cpt.bg_visual},
-        LspSagaCodeActionTitle = {fg = cpt.blue1},
-        LspSagaCodeActionContent = {fg = cpt.purple},
-        LspSagaSignatureHelpBorder = {fg = cpt.red},
-        ReferencesCount = {fg = cpt.purple},
-        DefinitionCount = {fg = cpt.purple},
-        DefinitionIcon = {fg = cpt.blue},
-        ReferencesIcon = {fg = cpt.blue},
-        TargetWord = {fg = cpt.cyan}
+		DiagnosticError = { fg = cpt.error },
+		DiagnosticWarning = { fg = cpt.warning },
+		DiagnosticInformation = { fg = cpt.info },
+		DiagnosticHint = { fg = cpt.hint },
+		LspFloatWinNormal = { bg = cpt.bg_float },
+		LspFloatWinBorder = { fg = cpt.border_highlight },
+		LspSagaBorderTitle = { fg = cpt.cyan },
+		LspSagaHoverBorder = { fg = cpt.blue },
+		LspSagaRenameBorder = { fg = cpt.green },
+		LspSagaDefPreviewBorder = { fg = cpt.green },
+		LspSagaCodeActionBorder = { fg = cpt.blue },
+		LspSagaFinderSelection = { fg = cpt.bg_visual },
+		LspSagaCodeActionTitle = { fg = cpt.blue1 },
+		LspSagaCodeActionContent = { fg = cpt.purple },
+		LspSagaSignatureHelpBorder = { fg = cpt.red },
+		ReferencesCount = { fg = cpt.purple },
+		DefinitionCount = { fg = cpt.purple },
+		DefinitionIcon = { fg = cpt.blue },
+		ReferencesIcon = { fg = cpt.blue },
+		TargetWord = { fg = cpt.cyan },
 	}
 end
 return M

lua/catppuccino/core/integrations/lsp_trouble.lua

@@ -2,9 +2,9 @@ local M = {}
 
 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}
+		LspTroubleText = { fg = cpt.fg_alt },
+		LspTroubleCount = { fg = cpt.magenta, bg = cpt.fg_gutter },
+		LspTroubleNormal = { fg = cpt.fg_sidebar, bg = cpt.bg_sidebar },
 	}
 end
 

lua/catppuccino/core/integrations/markdown.lua

@@ -2,12 +2,12 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        markdownHeadingDelimiter = {fg = cpt.orange, style = "bold"},
-        markdownCode = {fg = cpt.cyan},
-        markdownCodeBlock = {fg = cpt.cyan},
-        markdownH1 = {fg = cpt.magenta, style = "bold"},
-        markdownH2 = {fg = cpt.blue, style = "bold"},
-        markdownLinkText = {fg = cpt.blue, style = "underline"}
+		markdownHeadingDelimiter = { fg = cpt.orange, style = "bold" },
+		markdownCode = { fg = cpt.cyan },
+		markdownCodeBlock = { fg = cpt.cyan },
+		markdownH1 = { fg = cpt.magenta, style = "bold" },
+		markdownH2 = { fg = cpt.blue, style = "bold" },
+		markdownLinkText = { fg = cpt.blue, style = "underline" },
 	}
 end
 

lua/catppuccino/core/integrations/native_lsp.lua

@@ -5,33 +5,33 @@ function M.get(cpt)
 		-- These groups are for the native LSP cliencpt. Some other LSP clients may
 		-- use these groups, or use their own. Consult your LSP client's
 		-- documentation.
-        LspReferenceText = {bg = cpt.fg_gutter}, -- used for highlighting "text" references
-        LspReferenceRead = {bg = cpt.fg_gutter}, -- used for highlighting "read" references
-        LspReferenceWrite = {bg = cpt.fg_gutter}, -- used for highlighting "write" references
+		LspReferenceText = { bg = cpt.fg_gutter }, -- used for highlighting "text" references
+		LspReferenceRead = { bg = cpt.fg_gutter }, -- used for highlighting "read" references
+		LspReferenceWrite = { bg = cpt.fg_gutter }, -- used for highlighting "write" references
 		-- hightlight diagnostics in numberline
-        LspDiagnosticsDefaultError = {fg = cpt.error}, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-        LspDiagnosticsDefaultWarning = {fg = cpt.warning}, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-        LspDiagnosticsDefaultInformation = {fg = cpt.info}, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-        LspDiagnosticsDefaultHint = {fg = cpt.hint}, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
-        LspSignatureActiveParameter = {fg = cpt.orange},
+		LspDiagnosticsDefaultError = { fg = cpt.error }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspDiagnosticsDefaultWarning = { fg = cpt.warning }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspDiagnosticsDefaultInformation = { fg = cpt.info }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspDiagnosticsDefaultHint = { fg = cpt.hint }, -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline)
+		LspSignatureActiveParameter = { fg = cpt.orange },
 		-- LspDiagnosticsFloatingError         = { }, -- Used to color "Error" diagnostic messages in diagnostics float
 		-- LspDiagnosticsFloatingWarning       = { }, -- Used to color "Warning" diagnostic messages in diagnostics float
 		-- LspDiagnosticsFloatingInformation   = { }, -- Used to color "Information" diagnostic messages in diagnostics float
 		-- LspDiagnosticsFloatingHint          = { }, -- Used to color "Hint" diagnostic messages in diagnostics float
 
-        LspDiagnosticsError = {fg = cpt.error},
-        LspDiagnosticsWarning = {fg = cpt.warning},
-        LspDiagnosticsInformation = {fg = cpt.info},
-        LspDiagnosticsHint = {fg = cpt.hint},
-        LspDiagnosticsVirtualTextError = {fg = cpt.error, style = cpc.integrations.native_lsp.styles.errors}, -- Used for "Error" diagnostic virtual text
-        LspDiagnosticsVirtualTextWarning = {fg = cpt.warning, style = cpc.integrations.native_lsp.styles.warnings}, -- Used for "Warning" diagnostic virtual text
-        LspDiagnosticsVirtualTextInformation = {fg = cpt.info, style = cpc.integrations.native_lsp.styles.information}, -- Used for "Information" diagnostic virtual text
-        LspDiagnosticsVirtualTextHint = {fg = cpt.hint, style = cpc.integrations.native_lsp.styles.hints}, -- Used for "Hint" diagnostic virtual text
-        LspDiagnosticsUnderlineError = {style = "underline", sp = cpt.error}, -- Used to underline "Error" diagnostics
-        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
+		LspDiagnosticsError = { fg = cpt.error },
+		LspDiagnosticsWarning = { fg = cpt.warning },
+		LspDiagnosticsInformation = { fg = cpt.info },
+		LspDiagnosticsHint = { fg = cpt.hint },
+		LspDiagnosticsVirtualTextError = { fg = cpt.error, style = cpc.integrations.native_lsp.styles.errors }, -- Used for "Error" diagnostic virtual text
+		LspDiagnosticsVirtualTextWarning = { fg = cpt.warning, style = cpc.integrations.native_lsp.styles.warnings }, -- Used for "Warning" diagnostic virtual text
+		LspDiagnosticsVirtualTextInformation = { fg = cpt.info, style = cpc.integrations.native_lsp.styles.information }, -- Used for "Information" diagnostic virtual text
+		LspDiagnosticsVirtualTextHint = { fg = cpt.hint, style = cpc.integrations.native_lsp.styles.hints }, -- Used for "Hint" diagnostic virtual text
+		LspDiagnosticsUnderlineError = { style = "underline", sp = cpt.error }, -- Used to underline "Error" diagnostics
+		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
 	}
 end
 

lua/catppuccino/core/integrations/neogit.lua

@@ -3,13 +3,13 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        NeogitBranch = {fg = cpt.magenta},
-        NeogitRemote = {fg = cpt.pink},
-        NeogitHunkHeader = {bg = cpt.bg_highlight, fg = cpt.fg},
-        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}
+		NeogitBranch = { fg = cpt.magenta },
+		NeogitRemote = { fg = cpt.pink },
+		NeogitHunkHeader = { bg = cpt.bg_highlight, fg = cpt.fg },
+		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 },
 	}
 end
 

lua/catppuccino/core/integrations/nvimtree.lua

@@ -1,23 +1,31 @@
 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},
-        NvimTreeNormal = {fg = cpt.fg, bg = cpt.bg_sidebar},
-        NvimTreeOpenedFolderName = {fg = cpt.blue},
-        NvimTreeEmptyFolderName = {fg = cpt.blue_br},
-        NvimTreeIndentMarker = {fg = cpt.comment},
-        NvimTreeVertSplit = {fg = cpt.black, bg = cpt.black},
-        NvimTreeRootFolder = {fg = cpt.black, style = "bold"},
-        NvimTreeSymlink = {fg = cpt.magenta},
-        NvimTreeStatuslineNc = {fg = cpt.black, bg = cpt.black},
-        NvimTreeGitDirty = {fg = cpt.git.change},
-        NvimTreeGitNew = {fg = cpt.git.add},
-        NvimTreeGitDeleted = {fg = cpt.git.delete},
-        NvimTreeSpecialFile = {fg = cpt.cyan},
-        NvimTreeImageFile = {fg = cpt.fg_sidebar},
-        NvimTreeOpenedFile = {fg = cpt.magenta}
+		NvimTreeFolderName = { fg = cpt.blue },
+		NvimTreeFolderIcon = { fg = cpt.blue },
+		NvimTreeNormal = { fg = cpt.fg, bg = cpt.bg_sidebar },
+		NvimTreeOpenedFolderName = { fg = cpt.blue },
+		NvimTreeEmptyFolderName = { fg = cpt.blue_br },
+		NvimTreeIndentMarker = { fg = cpt.comment },
+		NvimTreeVertSplit = { fg = cpt.black, bg = cpt.black },
+		NvimTreeRootFolder = { fg = root_dir_color, style = "bold" },
+		NvimTreeSymlink = { fg = cpt.magenta },
+		NvimTreeStatuslineNc = { fg = cpt.black, bg = cpt.black },
+		NvimTreeGitDirty = { fg = cpt.git.change },
+		NvimTreeGitNew = { fg = cpt.git.add },
+		NvimTreeGitDeleted = { fg = cpt.git.delete },
+		NvimTreeSpecialFile = { fg = cpt.cyan },
+		NvimTreeImageFile = { fg = cpt.fg_sidebar },
+		NvimTreeOpenedFile = { fg = cpt.magenta },
 	}
 end
 

lua/catppuccino/core/integrations/telescope.lua

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

lua/catppuccino/core/integrations/treesitter.lua

@@ -14,51 +14,51 @@ function M.get(cpt)
 		-- TSBoolean           = { };    -- For booleans.
 		-- TSCharacter         = { };    -- For characters.
 		-- TSComment           = { };    -- For comment blocks.
-		TSNote = {fg = cpt.bg, bg = cpt.info},
-		TSWarning = {fg = cpt.bg, bg = cpt.warning},
-		TSDanger = {fg = cpt.bg, bg = cpt.error},
-		TSConstructor = {fg = cpt.magenta}, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
+		TSNote = { fg = cpt.bg, bg = cpt.info },
+		TSWarning = { fg = cpt.bg, bg = cpt.warning },
+		TSDanger = { fg = cpt.bg, bg = cpt.error },
+		TSConstructor = { fg = cpt.magenta }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors.
 		-- TSConditional       = { };    -- For keywords related to conditionnals.
-		TSConstant = {fg = cpt.orange}, -- For constants
-		TSConstBuiltin = {fg = cpt.orange_br}, -- For constant that are built in the language: `nil` in Lua.
+		TSConstant = { fg = cpt.orange }, -- For constants
+		TSConstBuiltin = { fg = cpt.orange_br }, -- For constant that are built in the language: `nil` in Lua.
 		-- TSConstMacro        = { };    -- For constants that are defined by macros: `NULL` in cpt.
 		-- TSError             = { };    -- For syntax/parser errors.
 		-- TSException         = { };    -- For exception related keywords.
-		TSField = {fg = cpt.red}, -- For fields.
-		rustTSField = {fg = util.darken(cpt.white, 0.75)}, -- For fields.
+		TSField = { fg = cpt.red }, -- For fields.
+		rustTSField = { fg = util.darken(cpt.white, 0.75) }, -- For fields.
 		-- TSFloat             = { };    -- For floats.
 		-- TSFunction = { fg = cpt.fg_gutter }, -- For function (calls and definitions).
-		TSFuncBuiltin = {fg = cpt.cyan}, -- For builtin functions: `table.insert` in Lua.
-		TSFuncMacro = {fg = cpt.red}, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscpt.
+		TSFuncBuiltin = { fg = cpt.cyan }, -- For builtin functions: `table.insert` in Lua.
+		TSFuncMacro = { fg = cpt.red }, -- For macro defined functions (calls and definitions): each `macro_rules` in Ruscpt.
 		-- TSInclude           = { };    -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua.
-		TSKeyword = {fg = cpt.magenta, style = cpc.styles.keywords}, -- For keywords that don't fall in previous categories.
-		TSKeywordFunction = {fg = cpt.magenta, style = cpc.styles.functions}, -- For keywords used to define a fuction.
-		TSLabel = {fg = cpt.blue}, -- For labels: `label:` in C and `:label:` in Lua.
+		TSKeyword = { fg = cpt.magenta, style = cpc.styles.keywords }, -- For keywords that don't fall in previous categories.
+		TSKeywordFunction = { fg = cpt.magenta, style = cpc.styles.functions }, -- For keywords used to define a fuction.
+		TSLabel = { fg = cpt.blue }, -- For labels: `label:` in C and `:label:` in Lua.
 		-- TSMethod            = { };    -- For method calls and definitions.
-		TSNamespace = {fg = cpt.cyan}, -- For identifiers referring to modules and namespaces.
+		TSNamespace = { fg = cpt.cyan }, -- For identifiers referring to modules and namespaces.
 		-- TSNone              = { };    -- TODO: docs
 		-- TSNumber            = { };    -- For all numbers
-		TSOperator = {fg = cpt.fg}, -- For any operator: `+`, but also `->` and `*` in cpt.
-		TSParameter = {fg = cpt.orange_br}, -- For parameters of a function.
+		TSOperator = { fg = cpt.fg }, -- For any operator: `+`, but also `->` and `*` in cpt.
+		TSParameter = { fg = cpt.orange_br }, -- For parameters of a function.
 		-- TSParameterReference= { };    -- For references to parameters of a function.
-		TSProperty = {fg = cpt.red_br}, -- Same as `TSField`.
-		tomlTSProperty = {fg = cpt.blue}, -- Differentiates between string and properties
-		TSPunctDelimiter = {fg = util.string_to_color(cpt, "", cpt.fg_alt)}, -- For delimiters ie: `.`
-		TSPunctBracket = {fg = cpt.red}, -- For brackets and parenthesis.
-		TSPunctSpecial = {fg = cpt.white}, -- For special punctutation that does not fall in the catagories before.
+		TSProperty = { fg = cpt.red_br }, -- Same as `TSField`.
+		tomlTSProperty = { fg = cpt.blue }, -- Differentiates between string and properties
+		TSPunctDelimiter = { fg = util.string_to_color(cpt, "", cpt.fg_alt) }, -- For delimiters ie: `.`
+		TSPunctBracket = { fg = cpt.red }, -- For brackets and parenthesis.
+		TSPunctSpecial = { fg = cpt.white }, -- For special punctutation that does not fall in the catagories before.
 		-- TSRepeat            = { };    -- For keywords related to loops.
 		-- TSString            = { };    -- For strings.
-		TSStringRegex = {fg = cpt.blue, style = cpc.styles.strings}, -- For regexes.
-		TSStringEscape = {fg = cpt.magenta, style = cpc.styles.strings}, -- For escape characters within a string.
+		TSStringRegex = { fg = cpt.blue, style = cpc.styles.strings }, -- For regexes.
+		TSStringEscape = { fg = cpt.magenta, style = cpc.styles.strings }, -- For escape characters within a string.
 		-- TSSymbol            = { };    -- For identifiers referring to symbols or atoms.
 		-- TSType              = { };    -- For types.
-		TSTypeBuiltin = {fg = cpt.cyan}, -- For builtin types.
-		TSVariable = {style = cpc.styles.variables}, -- Any variable name that does not have another highlighcpt.
-		TSVariableBuiltin = {fg = cpt.red}, -- Variable names that are defined by the languages, like `this` or `self`.
+		TSTypeBuiltin = { fg = cpt.cyan }, -- For builtin types.
+		TSVariable = { style = cpc.styles.variables }, -- Any variable name that does not have another highlighcpt.
+		TSVariableBuiltin = { fg = cpt.red }, -- Variable names that are defined by the languages, like `this` or `self`.
 		-- 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

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

lua/catppuccino/core/integrations/which_key.lua

@@ -2,13 +2,13 @@ local M = {}
 
 function M.get(cpt)
 	return {
-        WhichKey = {fg = cpt.cyan},
-        WhichKeyGroup = {fg = cpt.blue},
-        WhichKeyDesc = {fg = cpt.magenta},
-        WhichKeySeperator = {fg = cpt.comment},
-        WhichKeySeparator = {fg = cpt.comment},
-        WhichKeyFloat = {bg = cpt.bg_sidebar},
-        WhichKeyValue = {fg = cpt.comment}
+		WhichKey = { fg = cpt.cyan },
+		WhichKeyGroup = { fg = cpt.blue },
+		WhichKeyDesc = { fg = cpt.magenta },
+		WhichKeySeperator = { fg = cpt.comment },
+		WhichKeySeparator = { fg = cpt.comment },
+		WhichKeyFloat = { bg = cpt.bg_sidebar },
+		WhichKeyValue = { fg = cpt.comment },
 	}
 end
 

lua/catppuccino/core/mapper.lua

@@ -17,60 +17,60 @@ local function get_base()
 	local cpt = get_cs()
 
 	return {
-        Comment = {fg = cpt.comment, style = cpc.styles.comments}, -- any comment
-        ColorColumn = {bg = cpt.bg_visual}, -- used for the columns set with 'colorcolumn'
-        Conceal = {fg = cpt.black}, -- placeholder characters substituted for concealed text (see 'conceallevel')
-        Cursor = {fg = cpt.bg, bg = cpt.fg}, -- character under the cursor
-        lCursor = {fg = cpt.bg, bg = cpt.fg}, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
-        CursorIM = {fg = cpt.bg, bg = cpt.fg}, -- like Cursor, but used when in IME mode |CursorIM|
-        CursorColumn = {bg = cpt.bg_highlight}, -- Screen-column at the cursor, when 'cursorcolumn' is secpt.
-        CursorLine = {bg = cpt.bg_highlight}, -- Screen-line at the cursor, when 'cursorline' is secpt.  Low-priority if foreground (ctermfg OR guifg) is not secpt.
-        Directory = {fg = cpt.blue}, -- directory names (and other special names in listings)
-        EndOfBuffer = {fg = cpt.bg}, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
-        ErrorMsg = {fg = cpt.error}, -- error messages on the command line
-        VertSplit = {fg = cpt.border}, -- the column separating vertically split windows
-        Folded = {fg = cpt.blue, bg = cpt.fg_gutter}, -- line used for closed folds
-        FoldColumn = {bg = cpt.bg, fg = cpt.comment}, -- 'foldcolumn'
-        SignColumn = {bg = cpc.transparency and cpt.none or cpt.bg, fg = cpt.fg_gutter}, -- column where |signs| are displayed
-        SignColumnSB = {bg = cpt.bg_sidebar, fg = cpt.fg_gutter}, -- column where |signs| are displayed
-        Substitute = {bg = cpt.red, fg = cpt.black}, -- |:substitute| replacement text highlighting
-        LineNr = {fg = cpt.fg_gutter}, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secpt.
-        CursorLineNr = {fg = cpt.fg_alt}, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline.
-        MatchParen = {fg = cpt.orange, style = "bold"}, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
-        ModeMsg = {fg = cpt.fg_alt, style = "bold"}, -- 'showmode' message (e.g., "-- INSERT -- ")
-        MsgArea = {fg = cpt.white_br}, -- Area for messages and cmdline
+		Comment = { fg = cpt.comment, style = cpc.styles.comments }, -- any comment
+		ColorColumn = { bg = cpt.bg_visual }, -- used for the columns set with 'colorcolumn'
+		Conceal = { fg = cpt.black }, -- placeholder characters substituted for concealed text (see 'conceallevel')
+		Cursor = { fg = cpt.bg, bg = cpt.fg }, -- character under the cursor
+		lCursor = { fg = cpt.bg, bg = cpt.fg }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
+		CursorIM = { fg = cpt.bg, bg = cpt.fg }, -- like Cursor, but used when in IME mode |CursorIM|
+		CursorColumn = { bg = cpt.bg_highlight }, -- Screen-column at the cursor, when 'cursorcolumn' is secpt.
+		CursorLine = { bg = cpt.bg_highlight }, -- Screen-line at the cursor, when 'cursorline' is secpt.  Low-priority if foreground (ctermfg OR guifg) is not secpt.
+		Directory = { fg = cpt.blue }, -- directory names (and other special names in listings)
+		EndOfBuffer = { fg = cpt.bg }, -- filler lines (~) after the end of the buffer.  By default, this is highlighted like |hl-NonText|.
+		ErrorMsg = { fg = cpt.error }, -- error messages on the command line
+		VertSplit = { fg = cpt.border }, -- the column separating vertically split windows
+		Folded = { fg = cpt.blue, bg = cpt.fg_gutter }, -- line used for closed folds
+		FoldColumn = { bg = cpt.bg, fg = cpt.comment }, -- 'foldcolumn'
+		SignColumn = { bg = cpc.transparency and cpt.none or cpt.bg, fg = cpt.fg_gutter }, -- column where |signs| are displayed
+		SignColumnSB = { bg = cpt.bg_sidebar, fg = cpt.fg_gutter }, -- column where |signs| are displayed
+		Substitute = { bg = cpt.red, fg = cpt.black }, -- |:substitute| replacement text highlighting
+		LineNr = { fg = cpt.fg_gutter }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is secpt.
+		CursorLineNr = { fg = cpt.fg_alt }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. highlights the number in numberline.
+		MatchParen = { fg = cpt.orange, style = "bold" }, -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt|
+		ModeMsg = { fg = cpt.fg_alt, style = "bold" }, -- 'showmode' message (e.g., "-- INSERT -- ")
+		MsgArea = { fg = cpt.white_br }, -- Area for messages and cmdline
 		MsgSeparator = {}, -- Separator for scrolled messages, `msgsep` flag of 'display'
-        MoreMsg = {fg = cpt.blue}, -- |more-prompt|
-        NonText = {fg = cpt.comment}, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
-        Normal = {fg = cpt.fg, bg = cpc.transparency and cpt.none or cpt.bg}, -- normal text
-        NormalNC = {fg = cpt.fg, bg = cpc.transparency and cpt.none or cpt.bg}, -- normal text in non-current windows
-        NormalSB = {fg = cpt.fg_sidebar, bg = cpt.bg_sidebar}, -- normal text in non-current windows
-        NormalFloat = {fg = cpt.fg, bg = cpt.bg_float}, -- Normal text in floating windows.
-        FloatBorder = {fg = cpt.border_highlight},
-        Pmenu = {bg = cpt.bg_popup, fg = cpt.fg}, -- Popup menu: normal item.
-        PmenuSel = {fg = cpt.cyan, bg = util.darken(cpt.fg_gutter, 0.8)}, -- Popup menu: selected item.
-        PmenuSbar = {bg = util.lighten(cpt.bg_popup, 0.95)}, -- Popup menu: scrollbar.
-        PmenuThumb = {bg = cpt.fg_gutter}, -- Popup menu: Thumb of the scrollbar.
-        Question = {fg = cpt.blue}, -- |hit-enter| prompt and yes/no questions
-        QuickFixLine = {bg = cpt.bg_visual, style = "bold"}, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
-        Search = {bg = cpt.bg_search, fg = cpt.fg}, -- Last search pattern highlighting (see 'hlsearch').  Also used for similar items that need to stand oucpt.
-        IncSearch = {bg = cpt.cyan, fg = cpt.black}, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
-        SpecialKey = {fg = cpt.black}, -- Unprintable characters: text displayed differently from what it really is.  But not 'listchars' whitespace. |hl-Whitespace|
-        SpellBad = {sp = cpt.error, style = "undercurl"}, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
-        SpellCap = {sp = cpt.warning, style = "undercurl"}, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
-        SpellLocal = {sp = cpt.info, style = "undercurl"}, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
-        SpellRare = {sp = cpt.hint, style = "undercurl"}, -- Word that is recognized by the spellchecker as one that is hardly ever used.  |spell| Combined with the highlighting used otherwise.
-        StatusLine = {fg = cpt.fg_sidebar, bg = cpt.bg_statusline}, -- status line of current window
-        StatusLineNC = {fg = cpt.fg_gutter, bg = cpt.bg_statusline}, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
-        TabLine = {bg = cpt.bg_statusline, fg = cpt.fg_gutter}, -- tab pages line, not active tab page label
-        TabLineFill = {bg = cpt.black}, -- tab pages line, where there are no labels
-        TabLineSel = {fg = cpt.fg_alt, bg = cpt.fg_gutter}, -- tab pages line, active tab page label
-        Title = {fg = cpt.blue, style = "bold"}, -- titles for output from ":set all", ":autocmd" etcpt.
-        Visual = {bg = cpt.bg_visual}, -- Visual mode selection
-        VisualNOS = {bg = cpt.bg_visual}, -- Visual mode selection when vim is "Not Owning the Selection".
-        WarningMsg = {fg = cpt.warning}, -- warning messages
-        Whitespace = {fg = cpt.fg_gutter}, -- "nbsp", "space", "tab" and "trail" in 'listchars'
-        WildMenu = {bg = cpt.bg_visual}, -- current match in 'wildmenu' completion
+		MoreMsg = { fg = cpt.blue }, -- |more-prompt|
+		NonText = { fg = cpt.comment }, -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|.
+		Normal = { fg = cpt.fg, bg = cpc.transparency and cpt.none or cpt.bg }, -- normal text
+		NormalNC = { fg = cpt.fg, bg = cpc.transparency and cpt.none or cpt.bg }, -- normal text in non-current windows
+		NormalSB = { fg = cpt.fg_sidebar, bg = cpt.bg_sidebar }, -- normal text in non-current windows
+		NormalFloat = { fg = cpt.fg, bg = cpt.bg_float }, -- Normal text in floating windows.
+		FloatBorder = { fg = cpt.border_highlight },
+		Pmenu = { bg = cpt.bg_popup, fg = cpt.fg }, -- Popup menu: normal item.
+		PmenuSel = { fg = cpt.cyan, bg = util.darken(cpt.fg_gutter, 0.8) }, -- Popup menu: selected item.
+		PmenuSbar = { bg = util.lighten(cpt.bg_popup, 0.95) }, -- Popup menu: scrollbar.
+		PmenuThumb = { bg = cpt.fg_gutter }, -- Popup menu: Thumb of the scrollbar.
+		Question = { fg = cpt.blue }, -- |hit-enter| prompt and yes/no questions
+		QuickFixLine = { bg = cpt.bg_visual, style = "bold" }, -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there.
+		Search = { bg = cpt.bg_search, fg = cpt.fg }, -- Last search pattern highlighting (see 'hlsearch').  Also used for similar items that need to stand oucpt.
+		IncSearch = { bg = cpt.cyan, fg = cpt.black }, -- 'incsearch' highlighting; also used for the text replaced with ":s///c"
+		SpecialKey = { fg = cpt.black }, -- Unprintable characters: text displayed differently from what it really is.  But not 'listchars' whitespace. |hl-Whitespace|
+		SpellBad = { sp = cpt.error, style = "undercurl" }, -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise.
+		SpellCap = { sp = cpt.warning, style = "undercurl" }, -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise.
+		SpellLocal = { sp = cpt.info, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise.
+		SpellRare = { sp = cpt.hint, style = "undercurl" }, -- Word that is recognized by the spellchecker as one that is hardly ever used.  |spell| Combined with the highlighting used otherwise.
+		StatusLine = { fg = cpt.fg_sidebar, bg = cpt.bg_statusline }, -- status line of current window
+		StatusLineNC = { fg = cpt.fg_gutter, bg = cpt.bg_statusline }, -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window.
+		TabLine = { bg = cpt.bg_statusline, fg = cpt.fg_gutter }, -- tab pages line, not active tab page label
+		TabLineFill = { bg = cpt.black }, -- tab pages line, where there are no labels
+		TabLineSel = { fg = cpt.fg_alt, bg = cpt.fg_gutter }, -- tab pages line, active tab page label
+		Title = { fg = cpt.blue, style = "bold" }, -- titles for output from ":set all", ":autocmd" etcpt.
+		Visual = { bg = cpt.bg_visual }, -- Visual mode selection
+		VisualNOS = { bg = cpt.bg_visual }, -- Visual mode selection when vim is "Not Owning the Selection".
+		WarningMsg = { fg = cpt.warning }, -- warning messages
+		Whitespace = { fg = cpt.fg_gutter }, -- "nbsp", "space", "tab" and "trail" in 'listchars'
+		WildMenu = { bg = cpt.bg_visual }, -- current match in 'wildmenu' completion
 		-- These groups are not listed as default vim groups,
 		-- but they are defacto standard group names for syntax highlighting.
 		-- commented out groups should chain up to their "preferred" group by
@@ -79,92 +79,92 @@ local function get_base()
 
 		-- code itself
 
-        Constant = {fg = cpt.orange}, -- (preferred) any constant
-        String = {fg = cpt.green, style = cpc.styles.strings}, -- a string constant: "this is a string"
-        Character = {fg = cpt.green}, --  a character constant: 'c', '\n'
-        Number = {fg = cpt.orange_br}, --   a number constant: 234, 0xff
-        Float = {fg = cpt.orange_br}, --    a floating point constant: 2.3e10
-        Boolean = {fg = cpt.orange_br}, --  a boolean constant: TRUE, false
-        Identifier = {fg = cpt.cyan, style = cpc.styles.variables}, -- (preferred) any variable name
-        Function = {fg = cpt.blue, style = cpc.styles.functions}, -- function name (also: methods for classes)
-        Statement = {fg = cpt.magenta_br}, -- (preferred) any statement
-        Conditional = {fg = cpt.red}, --  if, then, else, endif, switch, etcpt.
-        Repeat = {fg = cpt.red}, --   for, do, while, etcpt.
-        Label = {fg = cpt.magenta_br}, --    case, default, etcpt.
-        Operator = {fg = cpt.fg_alt}, -- "sizeof", "+", "*", etcpt.
-        Keyword = {fg = cpt.magenta, style = cpc.styles.keywords}, --  any other keyword
+		Constant = { fg = cpt.orange }, -- (preferred) any constant
+		String = { fg = cpt.green, style = cpc.styles.strings }, -- a string constant: "this is a string"
+		Character = { fg = cpt.green }, --  a character constant: 'c', '\n'
+		Number = { fg = cpt.orange_br }, --   a number constant: 234, 0xff
+		Float = { fg = cpt.orange_br }, --    a floating point constant: 2.3e10
+		Boolean = { fg = cpt.orange_br }, --  a boolean constant: TRUE, false
+		Identifier = { fg = cpt.cyan, style = cpc.styles.variables }, -- (preferred) any variable name
+		Function = { fg = cpt.blue, style = cpc.styles.functions }, -- function name (also: methods for classes)
+		Statement = { fg = cpt.magenta_br }, -- (preferred) any statement
+		Conditional = { fg = cpt.red }, --  if, then, else, endif, switch, etcpt.
+		Repeat = { fg = cpt.red }, --   for, do, while, etcpt.
+		Label = { fg = cpt.magenta_br }, --    case, default, etcpt.
+		Operator = { fg = cpt.fg_alt }, -- "sizeof", "+", "*", etcpt.
+		Keyword = { fg = cpt.magenta, style = cpc.styles.keywords }, --  any other keyword
 		-- Exception     = { }, --  try, catch, throw
 
-        PreProc = {fg = cpt.pink}, -- (preferred) generic Preprocessor
-        Include = {fg = cpt.pink}, --  preprocessor #include
+		PreProc = { fg = cpt.pink }, -- (preferred) generic Preprocessor
+		Include = { fg = cpt.pink }, --  preprocessor #include
 		-- Define        = { }, --   preprocessor #define
 		-- Macro         = { }, --    same as Define
 		-- PreCondit     = { }, --  preprocessor #if, #else, #endif, etcpt.
 
-        Type = {fg = cpt.yellow}, -- (preferred) int, long, char, etcpt.
-        StorageClass = {fg = cpt.yellow}, -- static, register, volatile, etcpt.
-        Structure = {fg = cpt.yellow}, --  struct, union, enum, etcpt.
-        Typedef = {fg = cpt.yellow}, --  A typedef
-        Special = {fg = cpt.blue}, -- (preferred) any special symbol
+		Type = { fg = cpt.yellow }, -- (preferred) int, long, char, etcpt.
+		StorageClass = { fg = cpt.yellow }, -- static, register, volatile, etcpt.
+		Structure = { fg = cpt.yellow }, --  struct, union, enum, etcpt.
+		Typedef = { fg = cpt.yellow }, --  A typedef
+		Special = { fg = cpt.blue }, -- (preferred) any special symbol
 		-- SpecialChar   = { }, --  special character in a constant
 		-- Tag           = { }, --    you can use CTRL-] on this
 		-- Delimiter     = { }, --  character that needs attention
 		-- SpecialComment= { }, -- special things inside a comment
 		-- Debug         = { }, --    debugging statements
 
-        Underlined = {style = "underline"}, -- (preferred) text that stands out, HTML links
-        Bold = {style = "bold"},
-        Italic = {style = "italic"},
+		Underlined = { style = "underline" }, -- (preferred) text that stands out, HTML links
+		Bold = { style = "bold" },
+		Italic = { style = "italic" },
 		-- ("Ignore", below, may be invisible...)
 		-- Ignore = { }, -- (preferred) left blank, hidden  |hl-Ignore|
 
-        Error = {fg = cpt.error}, -- (preferred) any erroneous construct
-        Todo = {bg = cpt.yellow, fg = cpt.bg}, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
-        qfLineNr = {fg = cpt.yellow},
-        qfFileName = {fg = cpt.blue},
-        htmlH1 = {fg = cpt.magenta, style = "bold"},
-        htmlH2 = {fg = cpt.blue, style = "bold"},
+		Error = { fg = cpt.error }, -- (preferred) any erroneous construct
+		Todo = { bg = cpt.yellow, fg = cpt.bg }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX
+		qfLineNr = { fg = cpt.yellow },
+		qfFileName = { fg = cpt.blue },
+		htmlH1 = { fg = cpt.magenta, style = "bold" },
+		htmlH2 = { fg = cpt.blue, style = "bold" },
 		-- mkdHeading = { fg = cpt.orange, style = "bold" },
 		-- mkdCode = { bg = cpt.terminal_black, fg = cpt.fg },
-        mkdCodeDelimiter = {bg = cpt.terminal_black, fg = cpt.fg},
-        mkdCodeStart = {fg = cpt.cyan, style = "bold"},
-        mkdCodeEnd = {fg = cpt.cyan, style = "bold"},
+		mkdCodeDelimiter = { bg = cpt.terminal_black, fg = cpt.fg },
+		mkdCodeStart = { fg = cpt.cyan, style = "bold" },
+		mkdCodeEnd = { fg = cpt.cyan, style = "bold" },
 		-- mkdLink = { fg = cpt.blue, style = "underline" },
 
 		-- debugging
-        debugPC = {bg = cpt.bg_sidebar}, -- used for highlighting the current line in terminal-debug
-        debugBreakpoint = {bg = util.darken(cpt.info, 0.1), fg = cpt.info}, -- used for breakpoint colors in terminal-debug
+		debugPC = { bg = cpt.bg_sidebar }, -- used for highlighting the current line in terminal-debug
+		debugBreakpoint = { bg = util.darken(cpt.info, 0.1), fg = cpt.info }, -- used for breakpoint colors in terminal-debug
 		-- illuminate
-        illuminatedWord = {bg = cpt.fg_gutter},
-        illuminatedCurWord = {bg = cpt.fg_gutter},
+		illuminatedWord = { bg = cpt.fg_gutter },
+		illuminatedCurWord = { bg = cpt.fg_gutter },
 		-- diff
-        diffAdded = {fg = cpt.git.add},
-        diffRemoved = {fg = cpt.git.delete},
-        diffChanged = {fg = cpt.git.change},
-        diffOldFile = {fg = cpt.yellow},
-        diffNewFile = {fg = cpt.orange},
-        diffFile = {fg = cpt.blue},
-        diffLine = {fg = cpt.comment},
-        diffIndexLine = {fg = cpt.magenta},
+		diffAdded = { fg = cpt.git.add },
+		diffRemoved = { fg = cpt.git.delete },
+		diffChanged = { fg = cpt.git.change },
+		diffOldFile = { fg = cpt.yellow },
+		diffNewFile = { fg = cpt.orange },
+		diffFile = { fg = cpt.blue },
+		diffLine = { fg = cpt.comment },
+		diffIndexLine = { fg = cpt.magenta },
 		-- git diff
-        DiffAdd = {fg = cpt.diff.add, bg = cpt.bg}, -- diff mode: Added line |diff.txt|
-        DiffChange = {fg = cpt.diff.change, bg = cpt.bg}, -- diff mode: Changed line |diff.txt|
-        DiffDelete = {fg = cpt.diff.delete, bg = cpt.bg}, -- diff mode: Deleted line |diff.txt|
-        DiffText = {fg = cpt.diff.text, bg = cpt.bg}, -- diff mode: Changed text within a changed line |diff.txt|
+		DiffAdd = { fg = cpt.diff.add, bg = cpt.bg }, -- diff mode: Added line |diff.txt|
+		DiffChange = { fg = cpt.diff.change, bg = cpt.bg }, -- diff mode: Changed line |diff.txt|
+		DiffDelete = { fg = cpt.diff.delete, bg = cpt.bg }, -- diff mode: Deleted line |diff.txt|
+		DiffText = { fg = cpt.diff.text, bg = cpt.bg }, -- diff mode: Changed text within a changed line |diff.txt|
 		-- NeoVim
-        healthError = {fg = cpt.error},
-        healthSuccess = {fg = cpt.green_br},
-        healthWarning = {fg = cpt.warning},
+		healthError = { fg = cpt.error },
+		healthSuccess = { fg = cpt.green_br },
+		healthWarning = { fg = cpt.warning },
 		-- misc
 
 		-- glyphs
-        GlyphPalette1 = {fg = cpt.red},
-        GlyphPalette2 = {fg = cpt.green},
-        GlyphPalette3 = {fg = cpt.yellow},
-        GlyphPalette4 = {fg = cpt.blue},
-        GlyphPalette6 = {fg = cpt.green_br},
-        GlyphPalette7 = {fg = cpt.fg},
-        GlyphPalette9 = {fg = cpt.red}
+		GlyphPalette1 = { fg = cpt.red },
+		GlyphPalette2 = { fg = cpt.green },
+		GlyphPalette3 = { fg = cpt.yellow },
+		GlyphPalette4 = { fg = cpt.blue },
+		GlyphPalette6 = { fg = cpt.green_br },
+		GlyphPalette7 = { fg = cpt.fg },
+		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

@@ -11,7 +11,7 @@ local function color_is_bright(r, g, b)
 end
 
 function M.hex2rgb(hex)
-    return tonumber("0x"..hex:sub(1,2)), tonumber("0x"..hex:sub(3,4)), tonumber("0x"..hex:sub(5,6))
+	return tonumber("0x" .. hex:sub(1, 2)), tonumber("0x" .. hex:sub(3, 4)), tonumber("0x" .. hex:sub(5, 6))
 end
 
 function M.assert_brightness(color)
@@ -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

@@ -50,7 +50,7 @@ hsluv.get_bounds = function(l)
 			local top1 = (284517 * m1 - 94839 * m3) * sub2
 			local top2 = (838422 * m3 + 769860 * m2 + 731718 * m1) * l * sub2 - 769860 * t * l
 			local bottom = (632260 * m3 - 126452 * m2) * sub2 + 126452 * t
-            table.insert(result, {slope = top1 / bottom, intercept = top2 / bottom})
+			table.insert(result, { slope = top1 / bottom, intercept = top2 / bottom })
 		end
 	end
 	return result
@@ -112,16 +112,16 @@ 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
 
 hsluv.rgb_to_xyz = function(tuple)
-    local rgbl = {hsluv.to_linear(tuple[1]), hsluv.to_linear(tuple[2]), hsluv.to_linear(tuple[3])}
+	local rgbl = { hsluv.to_linear(tuple[1]), hsluv.to_linear(tuple[2]), hsluv.to_linear(tuple[3]) }
 	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
 
@@ -156,9 +156,9 @@ hsluv.xyz_to_luv = function(tuple)
 	end
 	local L = hsluv.y_to_l(Y)
 	if L == 0 then
-        return {0, 0, 0}
+		return { 0, 0, 0 }
 	end
-    return {L, 13 * L * (varU - hsluv.refU), 13 * L * (varV - hsluv.refV)}
+	return { L, 13 * L * (varU - hsluv.refU), 13 * L * (varV - hsluv.refV) }
 end
 
 hsluv.luv_to_xyz = function(tuple)
@@ -166,13 +166,13 @@ hsluv.luv_to_xyz = function(tuple)
 	local U = tuple[2]
 	local V = tuple[3]
 	if L == 0 then
-        return {0, 0, 0}
+		return { 0, 0, 0 }
 	end
 	local varU = U / (13 * L) + hsluv.refU
 	local varV = V / (13 * L) + hsluv.refV
 	local Y = hsluv.l_to_y(L)
 	local X = 0 - (9 * Y * varU) / (((varU - 4) * varV) - varU * varV)
-    return {X, Y, (9 * Y - 15 * varV * Y - varV * X) / (3 * varV)}
+	return { X, Y, (9 * Y - 15 * varV * Y - varV * X) / (3 * varV) }
 end
 
 hsluv.luv_to_lch = function(tuple)
@@ -189,14 +189,14 @@ hsluv.luv_to_lch = function(tuple)
 			H = 360 + H
 		end
 	end
-    return {L, C, H}
+	return { L, C, H }
 end
 
 hsluv.lch_to_luv = function(tuple)
 	local L = tuple[1]
 	local C = tuple[2]
 	local Hrad = tuple[3] / 360.0 * 2 * math.pi
-    return {L, math.cos(Hrad) * C, math.sin(Hrad) * C}
+	return { L, math.cos(Hrad) * C, math.sin(Hrad) * C }
 end
 
 hsluv.hsluv_to_lch = function(tuple)
@@ -204,12 +204,12 @@ hsluv.hsluv_to_lch = function(tuple)
 	local S = tuple[2]
 	local L = tuple[3]
 	if L > 99.9999999 then
-        return {100, 0, H}
+		return { 100, 0, H }
 	end
 	if L < 0.00000001 then
-        return {0, 0, H}
+		return { 0, 0, H }
 	end
-    return {L, hsluv.max_safe_chroma_for_lh(L, H) / 100 * S, H}
+	return { L, hsluv.max_safe_chroma_for_lh(L, H) / 100 * S, H }
 end
 
 hsluv.lch_to_hsluv = function(tuple)
@@ -218,13 +218,13 @@ hsluv.lch_to_hsluv = function(tuple)
 	local H = tuple[3]
 	local max_chroma = hsluv.max_safe_chroma_for_lh(L, H)
 	if L > 99.9999999 then
-        return {H, 0, 100}
+		return { H, 0, 100 }
 	end
 	if L < 0.00000001 then
-        return {H, 0, 0}
+		return { H, 0, 0 }
 	end
 
-    return {H, C / max_chroma * 100, L}
+	return { H, C / max_chroma * 100, L }
 end
 
 hsluv.hpluv_to_lch = function(tuple)
@@ -232,12 +232,12 @@ hsluv.hpluv_to_lch = function(tuple)
 	local S = tuple[2]
 	local L = tuple[3]
 	if L > 99.9999999 then
-        return {100, 0, H}
+		return { 100, 0, H }
 	end
 	if L < 0.00000001 then
-        return {0, 0, H}
+		return { 0, 0, H }
 	end
-    return {L, hsluv.max_safe_chroma_for_l(L) / 100 * S, H}
+	return { L, hsluv.max_safe_chroma_for_l(L) / 100 * S, H }
 end
 
 hsluv.lch_to_hpluv = function(tuple)
@@ -245,12 +245,12 @@ hsluv.lch_to_hpluv = function(tuple)
 	local C = tuple[2]
 	local H = tuple[3]
 	if L > 99.9999999 then
-        return {H, 0, 100}
+		return { H, 0, 100 }
 	end
 	if L < 0.00000001 then
-        return {H, 0, 0}
+		return { H, 0, 0 }
 	end
-    return {H, C / hsluv.max_safe_chroma_for_l(L) * 100, L}
+	return { H, C / hsluv.max_safe_chroma_for_l(L) * 100, L }
 end
 
 hsluv.rgb_to_hex = function(tuple)
@@ -320,14 +320,14 @@ hsluv.hex_to_hpluv = function(s)
 end
 
 hsluv.m = {
-    {3.240969941904521, -1.537383177570093, -0.498610760293},
-    {-0.96924363628087, 1.87596750150772, 0.041555057407175},
-    {0.055630079696993, -0.20397695888897, 1.056971514242878}
+	{ 3.240969941904521, -1.537383177570093, -0.498610760293 },
+	{ -0.96924363628087, 1.87596750150772, 0.041555057407175 },
+	{ 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.41239079926595, 0.35758433938387, 0.18048078840183 },
+	{ 0.21263900587151, 0.71516867876775, 0.072192315360733 },
+	{ 0.019330818715591, 0.11919477979462, 0.95053215224966 },
 }
 hsluv.refY = 1.0
 hsluv.refU = 0.19783000664283

lua/catppuccino/utils/util.lua

@@ -18,7 +18,7 @@ local hex_to_rgb = function(hex_str)
 	assert(string.find(hex_str, pat) ~= nil, "hex_to_rgb: invalid hex_str: " .. tostring(hex_str))
 
 	local red, green, blue = string.match(hex_str, pat)
-    return {tonumber(red, 16), tonumber(green, 16), tonumber(blue, 16)}
+	return { tonumber(red, 16), tonumber(green, 16), tonumber(blue, 16) }
 end
 
 ---@param fg string foreground color
@@ -78,7 +78,7 @@ function util.string_to_color(colors, value, default)
 		return value
 	end
 
-    local acceptable_colors = {"black", "red", "green", "blue", "magenta", "cyan", "white", "orange", "pink"}
+	local acceptable_colors = { "black", "red", "green", "blue", "magenta", "cyan", "white", "orange", "pink" }
 	for _, ac in ipairs(acceptable_colors) do
 		if string.match(value, ac) then
 			return colors[value]
@@ -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
@@ -9,36 +11,36 @@ local cpt = color_scheme
 local catppuccino = {}
 
 catppuccino.normal = {
-    left = {{cpt.black, cpt.blue}, {cpt.blue, cpt.bg}},
-    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}}
+	left = { { cpt.black, cpt.blue }, { cpt.blue, cpt.bg } },
+	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 } },
 }
 
 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}}
+	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 } },
 }
 
 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}}
+	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 } },
 }
 
 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)
@@ -8,35 +10,35 @@ local cpt = color_scheme
 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}
+	a = { bg = cpt.blue, fg = cpt.black },
+	b = { bg = cpt.fg_gutter, fg = cpt.blue },
+	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}
+	a = { bg = cpt.green, fg = cpt.black },
+	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}
+	a = { bg = cpt.orange, fg = cpt.black },
+	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}
+	a = { bg = cpt.magenta, fg = cpt.black },
+	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}
+	a = { bg = cpt.red_bg, fg = cpt.black },
+	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}
+	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 },
 }
 
 return catppuccino

stylua.toml

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