fix: merge user options before asserting options

Author: comfysage

lua/catppuccin/init.lua

@@ -149,16 +149,17 @@ function M.setup(user_conf)
 	-- Parsing user config
 	user_conf = user_conf or {}
 
-	if user_conf.auto_integrations ~= false then
-		user_conf.integrations = vim.tbl_deep_extend(
+	M.options = vim.tbl_deep_extend("keep", user_conf, M.default_options)
+
+	if M.options.auto_integrations then
+		M.options.integrations = vim.tbl_deep_extend(
 			"force",
 			require("catppuccin.lib.detect_integrations").create_integrations_table(),
-			user_conf.integrations or {}
+			M.options.integrations or {}
 		)
 	end
 
-	M.options = vim.tbl_deep_extend("keep", user_conf, M.default_options)
-	M.options.highlight_overrides.all = user_conf.custom_highlights or M.options.highlight_overrides.all
+	M.options.highlight_overrides.all = M.options.custom_highlights or M.options.highlight_overrides.all
 
 	-- Get cached hash
 	local cached_path = M.options.compile_path .. M.path_sep .. "cached"