fix: make sure useropts are loaded after defaultopts

This commit is contained in:
2024-10-04 10:23:20 -04:00
parent e83a2b8d42
commit f6a95ae977
+8 -8
View File
@@ -11,7 +11,7 @@ local function merge_into_opts(mod)
end end
end end
-- List of config modules to merge -- List of default config modules to merge
local modules = { local modules = {
"colors", "colors",
"font", "font",
@@ -20,15 +20,15 @@ local modules = {
"platform", "platform",
} }
-- If USERCONFIG is true, merge userconfig -- Merge all default modules into opts
if USERCONFIG then
merge_into_opts("user")
end
-- Merge all modules into opts
for _, mod in ipairs(modules) do for _, mod in ipairs(modules) do
merge_into_opts(mod) merge_into_opts(mod)
end end
-- Return config options -- If USERCONFIG is true, merge userconfig into opts
if USERCONFIG then
merge_into_opts("user")
end
-- Return config options table
return opts return opts