Simplify plugin management even more (#1518)

This commit is contained in:
siduck 2022-09-02 11:05:50 +05:30 committed by Sidhanth Rathod
parent f0c93c8472
commit d61946d3bf
5 changed files with 70 additions and 106 deletions

View File

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

View File

@ -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

View File

@ -99,40 +99,33 @@ M.load_mappings = function(section, mapping_opt)
end end
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 -- merge default/user plugin tables
M.merge_plugins = function(default_plugins) M.merge_plugins = function(default_plugins)
local user_plugins = M.load_config().plugins.user default_plugins = merge_tb("force", default_plugins, M.load_config().plugins)
-- merge default + user plugin table
default_plugins = merge_tb("force", default_plugins, user_plugins)
local final_table = {} local final_table = {}
for key, _ in pairs(default_plugins) do for key, val in pairs(default_plugins) do
default_plugins[key][1] = key if val then
final_table[#final_table + 1] = default_plugins[key] default_plugins[key][1] = key
final_table[#final_table + 1] = default_plugins[key]
end
end end
return final_table return final_table
end end
M.load_override = function(default_table, plugin_name) -- override plugin options table with custom ones
local user_table = M.load_config().plugins.override[plugin_name] or {} M.load_override = function(options_table, name)
user_table = type(user_table) == "table" and user_table or user_table() local user_plugins = M.load_config().plugins
return merge_tb("force", default_table, user_table) or {} 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 end
M.packer_sync = function(...) M.packer_sync = function(...)

View File

@ -2,14 +2,6 @@ local M = {}
local load_override = require("core.utils").load_override local load_override = require("core.utils").load_override
M.nvchad_ui = function()
local present, nvchad_ui = pcall(require, "nvchad_ui")
if present then
nvchad_ui.setup()
end
end
M.autopairs = function() M.autopairs = function()
local present1, autopairs = pcall(require, "nvim-autopairs") local present1, autopairs = pcall(require, "nvim-autopairs")
local present2, cmp = pcall(require, "cmp") local present2, cmp = pcall(require, "cmp")
@ -170,4 +162,22 @@ M.devicons = function()
end end
end end
M.packer_init = function()
return {
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,
},
}
end
return M return M

View File

@ -1,14 +1,16 @@
vim.cmd "packadd packer.nvim"
local plugins = { local plugins = {
["nvim-lua/plenary.nvim"] = { module = "plenary" }, ["nvim-lua/plenary.nvim"] = { module = "plenary" },
["lewis6991/impatient.nvim"] = {},
["wbthomason/packer.nvim"] = { ["wbthomason/packer.nvim"] = {
cmd = require("core.lazy_load").packer_cmds, cmd = require("core.lazy_load").packer_cmds,
config = function() config = function()
require "plugins" require "plugins"
end, end,
}, },
["NvChad/extensions"] = { module = { "telescope", "nvchad" } }, ["NvChad/extensions"] = { module = { "telescope", "nvchad" } },
["NvChad/base46"] = { ["NvChad/base46"] = {
@ -24,7 +26,11 @@ local plugins = {
["NvChad/ui"] = { ["NvChad/ui"] = {
after = "base46", after = "base46",
config = function() config = function()
require("plugins.configs.others").nvchad_ui() local present, nvchad_ui = pcall(require, "nvchad_ui")
if present then
nvchad_ui.setup()
end
end, end,
}, },
@ -91,7 +97,6 @@ local plugins = {
}, },
-- lsp stuff -- lsp stuff
["williamboman/mason.nvim"] = { ["williamboman/mason.nvim"] = {
cmd = require("core.lazy_load").mason_cmds, cmd = require("core.lazy_load").mason_cmds,
config = function() config = function()
@ -131,25 +136,11 @@ local plugins = {
end, end,
}, },
["saadparwaiz1/cmp_luasnip"] = { ["saadparwaiz1/cmp_luasnip"] = { after = "LuaSnip" },
after = "LuaSnip", ["hrsh7th/cmp-nvim-lua"] = { after = "cmp_luasnip" },
}, ["hrsh7th/cmp-nvim-lsp"] = { after = "cmp-nvim-lua" },
["hrsh7th/cmp-buffer"] = { after = "cmp-nvim-lsp" },
["hrsh7th/cmp-nvim-lua"] = { ["hrsh7th/cmp-path"] = { after = "cmp-buffer" },
after = "cmp_luasnip",
},
["hrsh7th/cmp-nvim-lsp"] = {
after = "cmp-nvim-lua",
},
["hrsh7th/cmp-buffer"] = {
after = "cmp-nvim-lsp",
},
["hrsh7th/cmp-path"] = {
after = "cmp-buffer",
},
-- misc plugins -- misc plugins
["windwp/nvim-autopairs"] = { ["windwp/nvim-autopairs"] = {
@ -212,9 +203,25 @@ local plugins = {
require("core.utils").load_mappings "whichkey" require("core.utils").load_mappings "whichkey"
end, end,
}, },
-- Speed up deffered plugins
["lewis6991/impatient.nvim"] = {},
} }
require("core.packer").run(plugins) -- Load all plugins
local present, packer = pcall(require, "packer")
if present then
vim.cmd "packadd packer.nvim"
-- Override with default plugins with user ones
plugins = require("core.utils").merge_plugins(plugins)
-- load packer init options
local init_options = require("plugins.configs.others").packer_init()
init_options = require("core.utils").load_override(init_options, "wbthomason/packer.nvim")
packer.init(init_options)
packer.startup(function(use)
for _, v in pairs(plugins) do
use(v)
end
end)
end