1 files changed, 19 insertions, 21 deletions
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index d2efaf33..087ed7a3 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -17,7 +17,7 @@ local core_plugins = {
   {
     "williamboman/mason.nvim",
     config = function()
-      require("lvim.core.mason").setup()
+      require("lvim.core.builtins").setup_builtin "mason"
     end,
     cmd = { "Mason", "MasonInstall", "MasonUninstall", "MasonUninstallAll", "MasonLog" },
     lazy = true,
@@ -39,7 +39,7 @@ local core_plugins = {
     "nvim-telescope/telescope.nvim",
     branch = "0.1.x",
     config = function()
-      require("lvim.core.telescope").setup()
+      require("lvim.core.builtins").setup_builtin "telescope"
     end,
     dependencies = { "telescope-fzf-native.nvim" },
     lazy = true,
@@ -51,9 +51,7 @@ local core_plugins = {
   {
     "hrsh7th/nvim-cmp",
     config = function()
-      if lvim.builtin.cmp then
-        require("lvim.core.cmp").setup()
-      end
+      require("lvim.core.builtins").setup_builtin "cmp"
     end,
     event = { "InsertEnter", "CmdlineEnter" },
     dependencies = {
@@ -107,7 +105,7 @@ local core_plugins = {
     "windwp/nvim-autopairs",
     event = "InsertEnter",
     config = function()
-      require("lvim.core.autopairs").setup()
+      require("lvim.core.builtins").setup_builtin "autopairs"
     end,
     enabled = lvim.builtin.autopairs.active,
   },
@@ -120,7 +118,7 @@ local core_plugins = {
       local utils = require "lvim.utils"
       local path = utils.join_paths(get_runtime_dir(), "site", "pack", "lazy", "opt", "nvim-treesitter")
       vim.opt.rtp:prepend(path) -- treesitter needs to be before nvim's runtime in rtp
-      require("lvim.core.treesitter").setup()
+      require("lvim.core.builtins").setup_builtin "treesitter"
     end,
     cmd = { "TSInstall", "TSUninstall", "TSUpdate", "TSInstallInfo", "TSInstallSync", "TSInstallFromGrammar" },
     event = "User FileOpened",
@@ -135,7 +133,7 @@ local core_plugins = {
   {
     "kyazdani42/nvim-tree.lua",
     config = function()
-      require("lvim.core.nvimtree").setup()
+      require("lvim.core.builtins").setup_builtin "nvimtree"
     end,
     enabled = lvim.builtin.nvimtree.active,
     cmd = { "NvimTreeToggle", "NvimTreeOpen", "NvimTreeFocus", "NvimTreeFindFileToggle" },
@@ -145,7 +143,7 @@ local core_plugins = {
   {
     "tamago324/lir.nvim",
     config = function()
-      require("lvim.core.lir").setup()
+      require("lvim.core.builtins").setup_builtin "lir"
     end,
     enabled = lvim.builtin.lir.active,
     event = "User DirOpened",
@@ -153,7 +151,7 @@ local core_plugins = {
   {
     "lewis6991/gitsigns.nvim",
     config = function()
-      require("lvim.core.gitsigns").setup()
+      require("lvim.core.builtins").setup_builtin "gitsigns"
     end,
     event = "User FileOpened",
     cmd = "Gitsigns",
@@ -164,7 +162,7 @@ local core_plugins = {
   {
     "folke/which-key.nvim",
     config = function()
-      require("lvim.core.which-key").setup()
+      require("lvim.core.builtins").setup_builtin "which-key"
     end,
     cmd = "WhichKey",
     event = "VeryLazy",
@@ -175,7 +173,7 @@ local core_plugins = {
   {
     "numToStr/Comment.nvim",
     config = function()
-      require("lvim.core.comment").setup()
+      require("lvim.core.builtins").setup_builtin "comment"
     end,
     keys = { { "gc", mode = { "n", "v" } }, { "gb", mode = { "n", "v" } } },
     event = "User FileOpened",
@@ -186,7 +184,7 @@ local core_plugins = {
   {
     "ahmedkhalf/project.nvim",
     config = function()
-      require("lvim.core.project").setup()
+      require("lvim.core.builtins").setup_builtin "project"
     end,
     enabled = lvim.builtin.project.active,
     event = "VimEnter",
@@ -206,7 +204,7 @@ local core_plugins = {
     "nvim-lualine/lualine.nvim",
     -- "Lunarvim/lualine.nvim",
     config = function()
-      require("lvim.core.lualine").setup()
+      require("lvim.core.builtins").setup_builtin "lualine"
     end,
     event = "VimEnter",
     enabled = lvim.builtin.lualine.active,
@@ -216,7 +214,7 @@ local core_plugins = {
   {
     "SmiteshP/nvim-navic",
     config = function()
-      require("lvim.core.breadcrumbs").setup()
+      require("lvim.core.builtins").setup_builtin "breadcrumbs"
     end,
     event = "User FileOpened",
     enabled = lvim.builtin.breadcrumbs.active,
@@ -225,7 +223,7 @@ local core_plugins = {
   {
     "akinsho/bufferline.nvim",
     config = function()
-      require("lvim.core.bufferline").setup()
+      require("lvim.core.builtins").setup_builtin "bufferline"
     end,
     branch = "main",
     event = "User FileOpened",
@@ -236,7 +234,7 @@ local core_plugins = {
   {
     "mfussenegger/nvim-dap",
     config = function()
-      require("lvim.core.dap").setup()
+      require("lvim.core.builtins").setup_builtin "dap"
     end,
     lazy = true,
     enabled = lvim.builtin.dap.active,
@@ -256,7 +254,7 @@ local core_plugins = {
   {
     "goolord/alpha-nvim",
     config = function()
-      require("lvim.core.alpha").setup()
+      require("lvim.core.builtins").setup_builtin "alpha"
     end,
     enabled = lvim.builtin.alpha.active,
     event = "VimEnter",
@@ -268,7 +266,7 @@ local core_plugins = {
     event = "VeryLazy",
     branch = "main",
     config = function()
-      require("lvim.core.terminal").setup()
+      require("lvim.core.builtins").setup_builtin "terminal"
     end,
     enabled = lvim.builtin.terminal.active,
   },
@@ -282,7 +280,7 @@ local core_plugins = {
   {
     "RRethy/vim-illuminate",
     config = function()
-      require("lvim.core.illuminate").setup()
+      require("lvim.core.builtins").setup_builtin "illuminate"
     end,
     event = "User FileOpened",
     enabled = lvim.builtin.illuminate.active,
@@ -291,7 +289,7 @@ local core_plugins = {
   {
     "lukas-reineke/indent-blankline.nvim",
     config = function()
-      require("lvim.core.indentlines").setup()
+      require("lvim.core.builtins").setup_builtin "indentlines"
     end,
     event = "User FileOpened",
     enabled = lvim.builtin.indentlines.active,