diff --git a/lua/lazy/core/module.lua b/lua/lazy/core/module.lua index 05439e6..2238238 100644 --- a/lua/lazy/core/module.lua +++ b/lua/lazy/core/module.lua @@ -58,11 +58,11 @@ local function _add_module(dir, modname) for _, entry in ipairs(entries) do local path = dir .. "/" .. entry.name if entry.type == "directory" then - _add_module(path, modname .. "." .. entry.name) + _add_module(path, modname and (modname .. "." .. entry.name) or entry.name) else local childname = entry.name:match("^(.*)%.lua$") if childname then - local child = entry.name == "init.lua" and modname or (modname .. "." .. childname) + local child = entry.name == "init.lua" and modname or modname and (modname .. "." .. childname) or childname if child then M.add(child, path) end @@ -76,6 +76,9 @@ local function _add_module(dir, modname) end function M.add_module(path) + if path:find("/lua/?$") then + return _add_module(path) + end ---@type string local modname = path:match("/lua/(.*)/?") assert(modname) diff --git a/lua/lazy/init.lua b/lua/lazy/init.lua index 5bc63d1..69610f6 100644 --- a/lua/lazy/init.lua +++ b/lua/lazy/init.lua @@ -39,6 +39,10 @@ function M.setup(opts) -- rebuild state local Plugin = require("lazy.plugin") Module.add_module(vim.fn.stdpath("config") .. "/lua/" .. Config.options.plugins:gsub("%.", "/")) + -- Module.add_module(vim.fn.stdpath("config") .. "/lua") + -- Module.add_module(Config.options.package_path .. "/start/tokyonight.nvim/lua") + -- Module.add_module(Config.options.package_path .. "/opt/nvim-cmp/lua") + -- Module.add_module(Config.options.package_path .. "/opt/cmp-buffer/lua") vim.schedule(function() vim.notify("Reloading") end)