[Refactor/Bugfix] move on_config_done callbacks to relevant setup() (#1175)

* Make autopairs config consistent with others

* Fix two typos for autopairs

* Remove extranous autopairs code. Return on setup

* Remove extranous else for autopairs completion confirmation

* Move on_config_done callbacks to setup functions.

* Add on_config_done completion for builtins lacking a config function

* enables galaxyline callbacks to work properly

* Add modules for more builtins

* Finish streamline of config function in plugin setup

* Fix double use of which_key/wk

* Fix erroneous remove of functionality in autopairs completion

* consistency fixes

* Work around telescope not found at config time

* Match plugin definition of project and lualine with others

* fix: restore config callback syntax

Co-authored-by: Johan Melin <[email protected]>
Co-authored-by: rebuilt <[email protected]>
Co-authored-by: Luc Sinet <[email protected]>
Co-authored-by: kylo252 <[email protected]>

1 files changed, 1 insertions, 43 deletions

diff --git a/lua/plugins.lua b/lua/plugins.lua
index 9aaea922..5aaac3ce 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -8,11 +8,8 @@ return {
     "kabouzeid/nvim-lspinstall",
     event = "VimEnter",
     config = function()
-      local lspinstall = require "lspinstall"
+      local lspinstall = require "core.lspinstall"
       lspinstall.setup()
-      if lvim.builtin.lspinstall.on_config_done then
-        lvim.builtin.lspinstall.on_config_done(lspinstall)
-      end
     end,
   },
 
@@ -23,9 +20,6 @@ return {
     "nvim-telescope/telescope.nvim",
     config = function()
       require("core.telescope").setup()
-      if lvim.builtin.telescope.on_config_done then
-        lvim.builtin.telescope.on_config_done(require "telescope")
-      end
     end,
     disable = not lvim.builtin.telescope.active,
   },
@@ -36,9 +30,6 @@ return {
     event = "InsertEnter",
     config = function()
       require("core.compe").setup()
-      if lvim.builtin.compe.on_config_done then
-        lvim.builtin.compe.on_config_done(require "compe")
-      end
     end,
     disable = not lvim.builtin.compe.active,
     -- wants = "vim-vsnip",
@@ -73,9 +64,6 @@ return {
     after = "nvim-compe",
     config = function()
       require("core.autopairs").setup()
-      if lvim.builtin.autopairs.on_config_done then
-        lvim.builtin.autopairs.on_config_done(require "nvim-autopairs")
-      end
     end,
     disable = not lvim.builtin.autopairs.active or not lvim.builtin.compe.active,
   },
@@ -87,9 +75,6 @@ return {
     -- run = ":TSUpdate",
     config = function()
       require("core.treesitter").setup()
-      if lvim.builtin.treesitter.on_config_done then
-        lvim.builtin.treesitter.on_config_done(require "nvim-treesitter.configs")
-      end
     end,
   },
 
@@ -101,9 +86,6 @@ return {
     -- commit = "fd7f60e242205ea9efc9649101c81a07d5f458bb",
     config = function()
       require("core.nvimtree").setup()
-      if lvim.builtin.nvimtree.on_config_done then
-        lvim.builtin.nvimtree.on_config_done(require "nvim-tree.config")
-      end
     end,
     disable = not lvim.builtin.nvimtree.active,
   },
@@ -113,9 +95,6 @@ return {
 
     config = function()
       require("core.gitsigns").setup()
-      if lvim.builtin.gitsigns.on_config_done then
-        lvim.builtin.gitsigns.on_config_done(require "gitsigns")
-      end
     end,
     event = "BufRead",
     disable = not lvim.builtin.gitsigns.active,
@@ -126,9 +105,6 @@ return {
     "folke/which-key.nvim",
     config = function()
       require("core.which-key").setup()
-      if lvim.builtin.which_key.on_config_done then
-        lvim.builtin.which_key.on_config_done(require "which-key")
-      end
     end,
     event = "BufWinEnter",
     disable = not lvim.builtin.which_key.active,
@@ -140,9 +116,6 @@ return {
     event = "BufRead",
     config = function()
       require("nvim_comment").setup()
-      if lvim.builtin.comment.on_config_done then
-        lvim.builtin.comment.on_config_done(require "nvim_comment")
-      end
     end,
     disable = not lvim.builtin.comment.active,
   },
@@ -152,9 +125,6 @@ return {
     "ahmedkhalf/project.nvim",
     config = function()
       require("core.project").setup()
-      if lvim.builtin.project.on_config_done then
-        lvim.builtin.project.on_config_done()
-      end
     end,
     disable = not lvim.builtin.project.active,
   },
@@ -177,9 +147,6 @@ return {
     "romgrk/barbar.nvim",
     config = function()
       require("core.bufferline").setup()
-      if lvim.builtin.bufferline.on_config_done then
-        lvim.builtin.bufferline.on_config_done()
-      end
     end,
     event = "BufWinEnter",
     disable = not lvim.builtin.bufferline.active,
@@ -191,9 +158,6 @@ return {
     -- event = "BufWinEnter",
     config = function()
       require("core.dap").setup()
-      if lvim.builtin.dap.on_config_done then
-        lvim.builtin.dap.on_config_done(require "dap")
-      end
     end,
     disable = not lvim.builtin.dap.active,
   },
@@ -212,9 +176,6 @@ return {
     event = "BufWinEnter",
     config = function()
       require("core.dashboard").setup()
-      if lvim.builtin.dashboard.on_config_done then
-        lvim.builtin.dashboard.on_config_done(require "dashboard")
-      end
     end,
     disable = not lvim.builtin.dashboard.active,
   },
@@ -225,9 +186,6 @@ return {
     event = "BufWinEnter",
     config = function()
       require("core.terminal").setup()
-      if lvim.builtin.terminal.on_config_done then
-        lvim.builtin.terminal.on_config_done(require "toggleterm")
-      end
     end,
     disable = not lvim.builtin.terminal.active,
   },