1 files changed, 21 insertions, 22 deletions
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index 51b47b36..cd2946ab 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -1,26 +1,25 @@
 local M = {}
 
 local builtins = {
-  "lvim.core.theme",
-  "lvim.core.which-key",
-  "lvim.core.gitsigns",
-  "lvim.core.cmp",
-  "lvim.core.dap",
-  "lvim.core.terminal",
-  "lvim.core.telescope",
-  "lvim.core.treesitter",
-  "lvim.core.nvimtree",
-  "lvim.core.lir",
-  "lvim.core.illuminate",
-  "lvim.core.indentlines",
-  "lvim.core.breadcrumbs",
-  "lvim.core.project",
-  "lvim.core.bufferline",
-  "lvim.core.autopairs",
-  "lvim.core.comment",
-  "lvim.core.lualine",
-  "lvim.core.alpha",
-  "lvim.core.mason",
+  "lvim.core.builtins.which-key",
+  "lvim.core.builtins.gitsigns",
+  "lvim.core.builtins.cmp",
+  "lvim.core.builtins.dap",
+  "lvim.core.builtins.terminal",
+  "lvim.core.builtins.telescope",
+  "lvim.core.builtins.treesitter",
+  "lvim.core.builtins.nvimtree",
+  "lvim.core.builtins.lir",
+  "lvim.core.builtins.illuminate",
+  "lvim.core.builtins.indentlines",
+  "lvim.core.builtins.breadcrumbs",
+  "lvim.core.builtins.project",
+  "lvim.core.builtins.bufferline",
+  "lvim.core.builtins.autopairs",
+  "lvim.core.builtins.comment",
+  "lvim.core.builtins.lualine",
+  "lvim.core.builtins.alpha",
+  "lvim.core.builtins.mason",
 }
 
 ---@class LvimBuiltin
@@ -39,10 +38,10 @@ function M.init(config)
 end
 
 function M.setup(modname)
-  local plugin = require("lvim.core." .. modname).setup()
+  local plugin = require("lvim.core.builtins." .. modname).setup()
 
   local builtin_tbl = lvim.builtin[modname:gsub("-", "_")]
-  if type(builtin_tbl.on_config_done) == "function" then
+  if plugin and type(builtin_tbl.on_config_done) == "function" then
     builtin_tbl.on_config_done(plugin)
   end
 end