fix: pass plugin module to on_config_done

20 files changed, 40 insertions, 2 deletions

diff --git a/lua/lvim/core/alpha.lua b/lua/lvim/core/alpha.lua
index 13642c29..4e14b39a 100644
--- a/lua/lvim/core/alpha.lua
+++ b/lua/lvim/core/alpha.lua
@@ -80,6 +80,8 @@ function M.setup()
   end
 
   alpha.setup(config)
+
+  return alpha
 end
 
 return M
diff --git a/lua/lvim/core/autopairs.lua b/lua/lvim/core/autopairs.lua
index c73e4fca..97f405be 100644
--- a/lua/lvim/core/autopairs.lua
+++ b/lua/lvim/core/autopairs.lua
@@ -75,6 +75,8 @@ M.setup = function()
     require("cmp").event:off("confirm_done", on_confirm_done)
     require("cmp").event:on("confirm_done", on_confirm_done)
   end)
+
+  return autopairs
 end
 
 return M
diff --git a/lua/lvim/core/breadcrumbs.lua b/lua/lvim/core/breadcrumbs.lua
index 9b175bec..2196252a 100644
--- a/lua/lvim/core/breadcrumbs.lua
+++ b/lua/lvim/core/breadcrumbs.lua
@@ -86,6 +86,8 @@ M.setup = function()
 
   M.create_winbar()
   navic.setup(lvim.builtin.breadcrumbs.options)
+
+  return navic
 end
 
 M.get_filename = function()
diff --git a/lua/lvim/core/bufferline.lua b/lua/lvim/core/bufferline.lua
index a10cf86f..768ed988 100644
--- a/lua/lvim/core/bufferline.lua
+++ b/lua/lvim/core/bufferline.lua
@@ -158,6 +158,8 @@ M.setup = function()
     options = lvim.builtin.bufferline.options,
     highlights = lvim.builtin.bufferline.highlights,
   }
+
+  return bufferline
 end
 
 --stylua: ignore
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index 1a564cd6..d36c3bee 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -39,11 +39,11 @@ function M.config(config)
 end
 
 function M.setup_builtin(modname)
-  require("lvim.core." .. modname).setup()
+  local plugin = require("lvim.core." .. modname).setup()
 
   local builtin_tbl = lvim.builtin[string.gsub(modname, "-", "_")]
   if type(builtin_tbl.on_config_done) == "function" then
-    builtin_tbl.on_config_done()
+    builtin_tbl.on_config_done(plugin)
   end
 end
 
diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua
index e22e82c9..2bbb7ecc 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
@@ -370,6 +370,8 @@ function M.setup()
       })
     end
   end
+
+  return cmp
 end
 
 return M
diff --git a/lua/lvim/core/comment.lua b/lua/lvim/core/comment.lua
index f6a5facf..677dfbb6 100644
--- a/lua/lvim/core/comment.lua
+++ b/lua/lvim/core/comment.lua
@@ -77,6 +77,8 @@ function M.setup()
   local nvim_comment = require "Comment"
 
   nvim_comment.setup(lvim.builtin.comment)
+
+  return nvim_comment
 end
 
 return M
diff --git a/lua/lvim/core/dap.lua b/lua/lvim/core/dap.lua
index 7d6adfa8..bc5b8e9d 100644
--- a/lua/lvim/core/dap.lua
+++ b/lua/lvim/core/dap.lua
@@ -109,6 +109,8 @@ M.setup = function()
   end
 
   dap.set_log_level(lvim.builtin.dap.log.level)
+
+  return dap
 end
 
 M.setup_ui = function()
diff --git a/lua/lvim/core/gitsigns.lua b/lua/lvim/core/gitsigns.lua
index 9cb67a0b..27f50562 100644
--- a/lua/lvim/core/gitsigns.lua
+++ b/lua/lvim/core/gitsigns.lua
@@ -74,6 +74,8 @@ M.setup = function()
   local gitsigns = reload "gitsigns"
 
   gitsigns.setup(lvim.builtin.gitsigns.opts)
+
+  return gitsigns
 end
 
 return M
diff --git a/lua/lvim/core/illuminate.lua b/lua/lvim/core/illuminate.lua
index f206c501..75afa362 100644
--- a/lua/lvim/core/illuminate.lua
+++ b/lua/lvim/core/illuminate.lua
@@ -62,6 +62,8 @@ M.setup = function()
   if not config_ok then
     return
   end
+
+  return illuminate
 end
 
 return M
diff --git a/lua/lvim/core/indentlines.lua b/lua/lvim/core/indentlines.lua
index 98354a30..43f025c6 100644
--- a/lua/lvim/core/indentlines.lua
+++ b/lua/lvim/core/indentlines.lua
@@ -33,6 +33,8 @@ M.setup = function()
   end
 
   indent_blankline.setup(lvim.builtin.indentlines.options)
+
+  return indent_blankline
 end
 
 return M
diff --git a/lua/lvim/core/lir.lua b/lua/lvim/core/lir.lua
index 14f1c51b..9c59a99c 100644
--- a/lua/lvim/core/lir.lua
+++ b/lua/lvim/core/lir.lua
@@ -110,6 +110,8 @@ function M.setup()
 
   lir.setup(lvim.builtin.lir)
   M.icon_setup()
+
+  return lir
 end
 
 return M
diff --git a/lua/lvim/core/lualine/init.lua b/lua/lvim/core/lualine/init.lua
index f4f6adeb..fa17afd7 100644
--- a/lua/lvim/core/lualine/init.lua
+++ b/lua/lvim/core/lualine/init.lua
@@ -47,6 +47,8 @@ M.setup = function()
   require("lvim.core.lualine.styles").update()
 
   lualine.setup(lvim.builtin.lualine)
+
+  return lualine
 end
 
 return M
diff --git a/lua/lvim/core/mason.lua b/lua/lvim/core/mason.lua
index 75b12229..958b9e76 100644
--- a/lua/lvim/core/mason.lua
+++ b/lua/lvim/core/mason.lua
@@ -84,6 +84,8 @@ function M.setup()
   add_to_path(lvim.builtin.mason.PATH == "append")
 
   mason.setup(lvim.builtin.mason)
+
+  return mason
 end
 
 return M
diff --git a/lua/lvim/core/nvimtree.lua b/lua/lvim/core/nvimtree.lua
index 5e72e1ea..a46db583 100644
--- a/lua/lvim/core/nvimtree.lua
+++ b/lua/lvim/core/nvimtree.lua
@@ -268,6 +268,8 @@ function M.setup()
   end
 
   nvim_tree.setup(lvim.builtin.nvimtree.setup)
+
+  return nvim_tree
 end
 
 function M.start_telescope(telescope_mode)
diff --git a/lua/lvim/core/project.lua b/lua/lvim/core/project.lua
index c78ebf61..10c4a71f 100644
--- a/lua/lvim/core/project.lua
+++ b/lua/lvim/core/project.lua
@@ -57,6 +57,8 @@ function M.setup()
   end
 
   project.setup(lvim.builtin.project)
+
+  return project
 end
 
 return M
diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua
index 85f02509..576c70e9 100644
--- a/lua/lvim/core/telescope.lua
+++ b/lua/lvim/core/telescope.lua
@@ -140,6 +140,8 @@ function M.setup()
       require("telescope").load_extension "fzf"
     end)
   end
+
+  return telescope
 end
 
 return M
diff --git a/lua/lvim/core/terminal.lua b/lua/lvim/core/terminal.lua
index 71d74430..2fc8ea9c 100644
--- a/lua/lvim/core/terminal.lua
+++ b/lua/lvim/core/terminal.lua
@@ -97,6 +97,8 @@ M.setup = function()
 
     M.add_exec(opts)
   end
+
+  return terminal
 end
 
 M.add_exec = function(opts)
diff --git a/lua/lvim/core/treesitter.lua b/lua/lvim/core/treesitter.lua
index 021e3d55..4548b792 100644
--- a/lua/lvim/core/treesitter.lua
+++ b/lua/lvim/core/treesitter.lua
@@ -109,6 +109,8 @@ function M.setup()
   local opts = vim.deepcopy(lvim.builtin.treesitter)
 
   treesitter_configs.setup(opts)
+
+  return require "treesitter"
 end
 
 return M
diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index 4cb956eb..cdfc91e4 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -312,6 +312,8 @@ M.setup = function()
 
   which_key.register(mappings, opts)
   which_key.register(vmappings, vopts)
+
+  return which_key
 end
 
 return M