fix: merge

lua/catppuccin/groups/integrations/leap.lua

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

lua/catppuccin/init.lua

@@ -21,12 +21,6 @@ end, {
 })
 
 function M.load()
-	local catppuccin = require("catppuccin")
-
-	if catppuccin.before_loading ~= nil then
-		catppuccin.before_loading()
-	end
-
 	local compiled = nil
 	local config = require("catppuccin.config").options
 
@@ -48,10 +42,6 @@ function M.load()
 		require("catppuccin.lib.highlighter").load(require("catppuccin.lib.mapper").apply())
 	end
 
-	if catppuccin.after_loading ~= nil then
-		catppuccin.after_loading()
-	end
-
 	vim.api.nvim_exec_autocmds("User", { pattern = "CatppuccinLoaded" })
 end
 

lua/catppuccin/palettes/frappe.lua

@@ -19,15 +19,15 @@ local color_palette = {
 	blue = "#8CAAEE",
 	lavender = "#BABBF1",
 
-	text = "#D1D9F8",
+	text = "#CED7F7",
-	subtext1 = "#B5BFE2",
+	subtext1 = "#BCC5E3",
-	subtext0 = "#A5ADCE",
+	subtext0 = "#ABB3D0",
-	overlay2 = "#949CBB",
+	overlay2 = "#99A1BC",
-	overlay1 = "#838BA7",
+	overlay1 = "#888FA8",
-	overlay0 = "#737994",
+	overlay0 = "#767C95",
-	surface2 = "#626880",
+	surface2 = "#656A81",
-	surface1 = "#51576D",
+	surface1 = "#53586D",
-	surface0 = "#414559",
+	surface0 = "#42465A",
 
 	base = "#303446",
 	mantle = "#292C3C",