Simplify plugin management even more (#1518)

lua/core/default_config.lua

@@ -19,11 +19,7 @@ M.ui = {
   transparency = false,
 }
 
-M.plugins = {
-  override = {},
-  remove = {},
-  user = {},
-}
+M.plugins = {}
 
 -- check core.mappings for table structure
 M.mappings = require "core.mappings"

lua/core/packer.lua

@@ -1,42 +0,0 @@
-local M = {}
-
-M.options = {
-  auto_clean = true,
-  compile_on_sync = true,
-  git = { clone_timeout = 6000 },
-  display = {
-    working_sym = "ﲊ",
-    error_sym = "✗ ",
-    done_sym = " ",
-    removed_sym = " ",
-    moved_sym = "",
-    open_fn = function()
-      return require("packer.util").float { border = "single" }
-    end,
-  },
-}
-
--- merge overrides if there are any
-M.options = require("core.utils").load_override(M.options, "wbthomason/packer.nvim")
-
-M.run = function(plugins)
-  local present, packer = pcall(require, "packer")
-
-  if not present then
-    return
-  end
-
-  -- Override with chadrc values
-  plugins = require("core.utils").remove_default_plugins(plugins)
-  plugins = require("core.utils").merge_plugins(plugins)
-
-  packer.init(M.options)
-
-  packer.startup(function(use)
-    for _, v in pairs(plugins) do
-      use(v)
-    end
-  end)
-end
-
-return M

lua/core/utils.lua

@@ -99,40 +99,33 @@ M.load_mappings = function(section, mapping_opt)
   end
 end
 
--- remove plugins defined in chadrc
-M.remove_default_plugins = function(plugins)
-  local removals = M.load_config().plugins.remove or {}
-
-  if not vim.tbl_isempty(removals) then
-    for _, plugin in pairs(removals) do
-      plugins[plugin] = nil
-    end
-  end
-
-  return plugins
-end
-
 -- merge default/user plugin tables
 M.merge_plugins = function(default_plugins)
-  local user_plugins = M.load_config().plugins.user
-
-  -- merge default + user plugin table
-  default_plugins = merge_tb("force", default_plugins, user_plugins)
+  default_plugins = merge_tb("force", default_plugins, M.load_config().plugins)
 
   local final_table = {}
 
-  for key, _ in pairs(default_plugins) do
-    default_plugins[key][1] = key
-    final_table[#final_table + 1] = default_plugins[key]
+  for key, val in pairs(default_plugins) do
+    if val then
+      default_plugins[key][1] = key
+      final_table[#final_table + 1] = default_plugins[key]
+    end
   end
 
   return final_table
 end
 
-M.load_override = function(default_table, plugin_name)
-  local user_table = M.load_config().plugins.override[plugin_name] or {}
-  user_table = type(user_table) == "table" and user_table or user_table()
-  return merge_tb("force", default_table, user_table) or {}
+-- override plugin options table with custom ones
+M.load_override = function(options_table, name)
+  local user_plugins = M.load_config().plugins
+  local plugin_options = {}
+
+  if user_plugins[name] then
+    plugin_options = user_plugins[name].override_options or {}
+    plugin_options = type(plugin_options) == "table" and plugin_options or plugin_options()
+  end
+
+  return merge_tb("force", options_table, plugin_options)
 end
 
 M.packer_sync = function(...)