Merge branch 'main' into main

README.md

@@ -348,6 +348,20 @@ catppuccin.before_loading = function ()
 end
 ```
 
+#### Autocmd
+
+Instead of `after_loading` hook, you can use autocmd event like this:
+
+```lua
+vim.api.nvim_create_autocmd("User", {
+    pattern = "CatppuccinLoaded",
+    callback = function()
+        local colors = require("catppuccin.api.colors").get_colors()
+        -- do something with colors
+    end
+})
+```
+
 ## 💝 Thanks to
 
 -   [Pocco81](https://github.com/Pocco81)

lua/catppuccin/config.lua

@@ -72,6 +72,7 @@ config.options = {
 		symbols_outline = true,
 	},
 	color_overrides = {}
+  custom_highlights = {},
 }
 
 function config.set_options(opts)

lua/catppuccin/core/integrations/lightspeed.lua

@@ -13,19 +13,14 @@ end
 function M.get(cp)
 
 	if not get_prepared() then
-		local catppuccin = require("catppuccin")
-		if catppuccin.after_loading ~= nil then
-			local callback = catppuccin.after_loading
-			catppuccin.after_loading = function ()
-				callback()
-				require'lightspeed'.init_highlight()
+		set_prepared(vim.api.nvim_create_autocmd("User", {
+			pattern = "CatppuccinLoaded",
+			callback = function ()
+				if pcall(require, "lightspeed") then
+					require("lightspeed").init_highlight()
+				end
 			end
-		else
-			catppuccin.after_loading = function ()
-				require'lightspeed'.init_highlight()
-			end
-		end
-		set_prepared(true)
+		}))
 	end
 
 	return {

lua/catppuccin/core/integrations/telescope.lua

@@ -6,6 +6,16 @@ function M.get(cp)
 		TelescopeSelectionCaret = { fg = cp.flamingo },
 		TelescopeSelection = { fg = cp.text, bg = cp.surface0, style = "bold" },
 		TelescopeMatching = { fg = cp.blue },
+    TelescopePromptPrefix = { bg = cp.crust },
+    TelescopePromptNormal = { bg = cp.crust},
+    TelescopeResultsNormal = { bg = cp.mantle},
+    TelescopePreviewNormal = { bg = cp.crust },
+    TelescopePromptBorder = { bg = cp.crust, fg = cp.crust },
+    TelescopeResultsBorder = { bg = cp.mantle, fg = cp.crust },
+    TelescopePreviewBorder = { bg = cp.crust, fg = cp.crust },
+    TelescopePromptTitle = { fg = cp.crust },
+    TelescopeResultsTitle = { fg = cp.text },
+    TelescopePreviewTitle = { fg = cp.crust },
 	}
 end
 

lua/catppuccin/main.lua

@@ -21,6 +21,8 @@ local function load()
 	if catppuccin.after_loading ~= nil then
 		catppuccin.after_loading()
 	end
+
+	vim.api.nvim_exec_autocmds("User", { pattern = "CatppuccinLoaded" })
 end
 
 function M.main(option)

lua/catppuccin/utils/util.lua

@@ -147,12 +147,16 @@ function util.load(theme)
 	if vim.fn.exists("syntax_on") then
 		vim.cmd("syntax reset")
 	end
+  local custom_highlights = require("catppuccin.config").options.custom_highlights
+
 
 	g.colors_name = "catppuccin"
+  
 
 	util.properties(theme.properties)
 	util.syntax(theme.base)
 	util.syntax(theme.integrations)
+  util.syntax(custom_highlights)
 
 	if require("catppuccin.config").options["term_colors"] then
 		util.terminal(theme.terminal)