refactor(builtins): move builtins to lvim/builtinrefactor/builtins

34 files changed, 81 insertions, 81 deletions

diff --git a/lua/lvim/bootstrap.lua b/lua/lvim/bootstrap.lua
index d7357c92..9e0416be 100644
--- a/lua/lvim/bootstrap.lua
+++ b/lua/lvim/bootstrap.lua
@@ -101,7 +101,7 @@ function M:init(base_dir)
 
   require("lvim.config"):init()
 
-  require("lvim.core.builtins.mason").bootstrap()
+  require("lvim.builtin.mason").bootstrap()
 
   return self
 end
diff --git a/lua/lvim/core/builtins/alpha.lua b/lua/lvim/builtin/alpha.lua
index 3270d01b..f146e5d4 100644
--- a/lua/lvim/core/builtins/alpha.lua
+++ b/lua/lvim/builtin/alpha.lua
@@ -1,8 +1,8 @@
 local M = {}
 
 function M.config()
-  local lvim_dashboard = require "lvim.core.builtins.alpha.dashboard"
-  local lvim_startify = require "lvim.core.builtins.alpha.startify"
+  local lvim_dashboard = require "lvim.builtin.alpha.dashboard"
+  local lvim_startify = require "lvim.builtin.alpha.startify"
   lvim.builtin.alpha = {
     dashboard = {
       config = {},
diff --git a/lua/lvim/core/builtins/alpha/dashboard.lua b/lua/lvim/builtin/alpha/dashboard.lua
index 6a368924..6a368924 100644
--- a/lua/lvim/core/builtins/alpha/dashboard.lua
+++ b/lua/lvim/builtin/alpha/dashboard.lua
diff --git a/lua/lvim/core/builtins/alpha/startify.lua b/lua/lvim/builtin/alpha/startify.lua
index e9d10a07..e9d10a07 100644
--- a/lua/lvim/core/builtins/alpha/startify.lua
+++ b/lua/lvim/builtin/alpha/startify.lua
diff --git a/lua/lvim/core/builtins/autopairs.lua b/lua/lvim/builtin/autopairs.lua
index 97f405be..97f405be 100644
--- a/lua/lvim/core/builtins/autopairs.lua
+++ b/lua/lvim/builtin/autopairs.lua
diff --git a/lua/lvim/core/builtins/breadcrumbs.lua b/lua/lvim/builtin/breadcrumbs.lua
index 2ed0937e..2ed0937e 100644
--- a/lua/lvim/core/builtins/breadcrumbs.lua
+++ b/lua/lvim/builtin/breadcrumbs.lua
diff --git a/lua/lvim/core/builtins/bufferline.lua b/lua/lvim/builtin/bufferline.lua
index 768ed988..768ed988 100644
--- a/lua/lvim/core/builtins/bufferline.lua
+++ b/lua/lvim/builtin/bufferline.lua
diff --git a/lua/lvim/core/builtins/cmp.lua b/lua/lvim/builtin/cmp.lua
index 2bbb7ecc..2bbb7ecc 100644
--- a/lua/lvim/core/builtins/cmp.lua
+++ b/lua/lvim/builtin/cmp.lua
diff --git a/lua/lvim/core/builtins/comment.lua b/lua/lvim/builtin/comment.lua
index 677dfbb6..677dfbb6 100644
--- a/lua/lvim/core/builtins/comment.lua
+++ b/lua/lvim/builtin/comment.lua
diff --git a/lua/lvim/core/builtins/dap.lua b/lua/lvim/builtin/dap.lua
index bc5b8e9d..bc5b8e9d 100644
--- a/lua/lvim/core/builtins/dap.lua
+++ b/lua/lvim/builtin/dap.lua
diff --git a/lua/lvim/core/builtins/gitsigns.lua b/lua/lvim/builtin/gitsigns.lua
index 27f50562..27f50562 100644
--- a/lua/lvim/core/builtins/gitsigns.lua
+++ b/lua/lvim/builtin/gitsigns.lua
diff --git a/lua/lvim/core/builtins/illuminate.lua b/lua/lvim/builtin/illuminate.lua
index 75afa362..75afa362 100644
--- a/lua/lvim/core/builtins/illuminate.lua
+++ b/lua/lvim/builtin/illuminate.lua
diff --git a/lua/lvim/core/builtins/indentlines.lua b/lua/lvim/builtin/indentlines.lua
index 43f025c6..43f025c6 100644
--- a/lua/lvim/core/builtins/indentlines.lua
+++ b/lua/lvim/builtin/indentlines.lua
diff --git a/lua/lvim/builtin/init.lua b/lua/lvim/builtin/init.lua
new file mode 100644
index 00000000..21ae9c51
--- /dev/null
+++ b/lua/lvim/builtin/init.lua
@@ -0,0 +1,49 @@
+local M = {}
+
+local builtins = {
+  "lvim.builtin.which-key",
+  "lvim.builtin.gitsigns",
+  "lvim.builtin.cmp",
+  "lvim.builtin.dap",
+  "lvim.builtin.terminal",
+  "lvim.builtin.telescope",
+  "lvim.builtin.treesitter",
+  "lvim.builtin.nvimtree",
+  "lvim.builtin.lir",
+  "lvim.builtin.illuminate",
+  "lvim.builtin.indentlines",
+  "lvim.builtin.breadcrumbs",
+  "lvim.builtin.project",
+  "lvim.builtin.bufferline",
+  "lvim.builtin.autopairs",
+  "lvim.builtin.comment",
+  "lvim.builtin.lualine",
+  "lvim.builtin.alpha",
+  "lvim.builtin.mason",
+}
+
+---@class LvimBuiltin
+---@field active boolean is builtin enabled
+---@field on_config_done function function called after the builtin is set up
+
+function M.init(config)
+  ---@type {[string]: LvimBuiltin}
+  lvim.builtin = {}
+
+  for _, builtin_path in ipairs(builtins) do
+    local builtin = reload(builtin_path)
+
+    builtin.config(config)
+  end
+end
+
+function M.setup(modname)
+  local plugin = require("lvim.builtin." .. modname).setup()
+
+  local builtin_tbl = lvim.builtin[modname:gsub("-", "_")]
+  if plugin and type(builtin_tbl.on_config_done) == "function" then
+    builtin_tbl.on_config_done(plugin)
+  end
+end
+
+return M
diff --git a/lua/lvim/core/builtins/lir.lua b/lua/lvim/builtin/lir.lua
index 9c59a99c..9c59a99c 100644
--- a/lua/lvim/core/builtins/lir.lua
+++ b/lua/lvim/builtin/lir.lua
diff --git a/lua/lvim/core/builtins/lualine/colors.lua b/lua/lvim/builtin/lualine/colors.lua
index 4984cd1f..4984cd1f 100644
--- a/lua/lvim/core/builtins/lualine/colors.lua
+++ b/lua/lvim/builtin/lualine/colors.lua
diff --git a/lua/lvim/core/builtins/lualine/components.lua b/lua/lvim/builtin/lualine/components.lua
index 755c42af..2f8e8b37 100644
--- a/lua/lvim/core/builtins/lualine/components.lua
+++ b/lua/lvim/builtin/lualine/components.lua
@@ -1,5 +1,5 @@
-local conditions = require "lvim.core.builtins.lualine.conditions"
-local colors = require "lvim.core.builtins.lualine.colors"
+local conditions = require "lvim.builtin.lualine.conditions"
+local colors = require "lvim.builtin.lualine.colors"
 
 local function diff_source()
   local gitsigns = vim.b.gitsigns_status_dict
@@ -55,7 +55,7 @@ return {
   },
   python_env = {
     function()
-      local utils = require "lvim.core.builtins.lualine.utils"
+      local utils = require "lvim.builtin.lualine.utils"
       if vim.bo.filetype == "python" then
         local venv = os.getenv "CONDA_DEFAULT_ENV" or os.getenv "VIRTUAL_ENV"
         if venv then
diff --git a/lua/lvim/core/builtins/lualine/conditions.lua b/lua/lvim/builtin/lualine/conditions.lua
index 42d52a83..42d52a83 100644
--- a/lua/lvim/core/builtins/lualine/conditions.lua
+++ b/lua/lvim/builtin/lualine/conditions.lua
diff --git a/lua/lvim/core/builtins/lualine/init.lua b/lua/lvim/builtin/lualine/init.lua
index 102dd6e6..42859962 100644
--- a/lua/lvim/core/builtins/lualine/init.lua
+++ b/lua/lvim/builtin/lualine/init.lua
@@ -44,7 +44,7 @@ M.setup = function()
     return
   end
 
-  require("lvim.core.builtins.lualine.styles").update()
+  require("lvim.builtin.lualine.styles").update()
 
   lualine.setup(lvim.builtin.lualine)
 
diff --git a/lua/lvim/core/builtins/lualine/styles.lua b/lua/lvim/builtin/lualine/styles.lua
index 50b07bdd..22d69e12 100644
--- a/lua/lvim/core/builtins/lualine/styles.lua
+++ b/lua/lvim/builtin/lualine/styles.lua
@@ -1,5 +1,5 @@
 local M = {}
-local components = require "lvim.core.builtins.lualine.components"
+local components = require "lvim.builtin.lualine.components"
 
 local styles = {
   lvim = nil,
diff --git a/lua/lvim/core/builtins/lualine/utils.lua b/lua/lvim/builtin/lualine/utils.lua
index 3fd3c2d3..3fd3c2d3 100644
--- a/lua/lvim/core/builtins/lualine/utils.lua
+++ b/lua/lvim/builtin/lualine/utils.lua
diff --git a/lua/lvim/core/builtins/mason.lua b/lua/lvim/builtin/mason.lua
index 958b9e76..958b9e76 100644
--- a/lua/lvim/core/builtins/mason.lua
+++ b/lua/lvim/builtin/mason.lua
diff --git a/lua/lvim/core/builtins/nvimtree.lua b/lua/lvim/builtin/nvimtree.lua
index bf76407c..bf76407c 100644
--- a/lua/lvim/core/builtins/nvimtree.lua
+++ b/lua/lvim/builtin/nvimtree.lua
diff --git a/lua/lvim/core/builtins/project.lua b/lua/lvim/builtin/project.lua
index 10c4a71f..10c4a71f 100644
--- a/lua/lvim/core/builtins/project.lua
+++ b/lua/lvim/builtin/project.lua
diff --git a/lua/lvim/core/builtins/telescope.lua b/lua/lvim/builtin/telescope.lua
index 576c70e9..576c70e9 100644
--- a/lua/lvim/core/builtins/telescope.lua
+++ b/lua/lvim/builtin/telescope.lua
diff --git a/lua/lvim/core/builtins/terminal.lua b/lua/lvim/builtin/terminal.lua
index 2fc8ea9c..2fc8ea9c 100644
--- a/lua/lvim/core/builtins/terminal.lua
+++ b/lua/lvim/builtin/terminal.lua
diff --git a/lua/lvim/core/builtins/treesitter.lua b/lua/lvim/builtin/treesitter.lua
index c0cbb653..c0cbb653 100644
--- a/lua/lvim/core/builtins/treesitter.lua
+++ b/lua/lvim/builtin/treesitter.lua
diff --git a/lua/lvim/core/builtins/which-key.lua b/lua/lvim/builtin/which-key.lua
index 70a24a27..70a24a27 100644
--- a/lua/lvim/core/builtins/which-key.lua
+++ b/lua/lvim/builtin/which-key.lua
diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua
index 1f76b2ad..a5876d7f 100644
--- a/lua/lvim/config/init.lua
+++ b/lua/lvim/config/init.lua
@@ -17,7 +17,7 @@ function M:init()
 
   require("lvim.keymappings").load_defaults()
 
-  local builtins = require "lvim.core.builtins"
+  local builtins = require "lvim.builtin"
   builtins.init { user_config_file = user_config_file }
 
   require("lvim.core.theme").config()
diff --git a/lua/lvim/core/autocmds.lua b/lua/lvim/core/autocmds.lua
index 44a1e970..98444467 100644
--- a/lua/lvim/core/autocmds.lua
+++ b/lua/lvim/core/autocmds.lua
@@ -103,7 +103,7 @@ function M.load_defaults()
         group = "_lvim_colorscheme",
         callback = function()
           if lvim.builtin.breadcrumbs.active then
-            require("lvim.core.builtins.breadcrumbs").get_winbar()
+            require("lvim.builtin.breadcrumbs").get_winbar()
           end
           local statusline_hl = vim.api.nvim_get_hl_by_name("StatusLine", true)
           local cursorline_hl = vim.api.nvim_get_hl_by_name("CursorLine", true)
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
deleted file mode 100644
index cd2946ab..00000000
--- a/lua/lvim/core/builtins/init.lua
+++ /dev/null
@@ -1,49 +0,0 @@
-local M = {}
-
-local builtins = {
-  "lvim.core.builtins.which-key",
-  "lvim.core.builtins.gitsigns",
-  "lvim.core.builtins.cmp",
-  "lvim.core.builtins.dap",
-  "lvim.core.builtins.terminal",
-  "lvim.core.builtins.telescope",
-  "lvim.core.builtins.treesitter",
-  "lvim.core.builtins.nvimtree",
-  "lvim.core.builtins.lir",
-  "lvim.core.builtins.illuminate",
-  "lvim.core.builtins.indentlines",
-  "lvim.core.builtins.breadcrumbs",
-  "lvim.core.builtins.project",
-  "lvim.core.builtins.bufferline",
-  "lvim.core.builtins.autopairs",
-  "lvim.core.builtins.comment",
-  "lvim.core.builtins.lualine",
-  "lvim.core.builtins.alpha",
-  "lvim.core.builtins.mason",
-}
-
----@class LvimBuiltin
----@field active boolean is builtin enabled
----@field on_config_done function function called after the builtin is set up
-
-function M.init(config)
-  ---@type {[string]: LvimBuiltin}
-  lvim.builtin = {}
-
-  for _, builtin_path in ipairs(builtins) do
-    local builtin = reload(builtin_path)
-
-    builtin.config(config)
-  end
-end
-
-function M.setup(modname)
-  local plugin = require("lvim.core.builtins." .. modname).setup()
-
-  local builtin_tbl = lvim.builtin[modname:gsub("-", "_")]
-  if plugin and type(builtin_tbl.on_config_done) == "function" then
-    builtin_tbl.on_config_done(plugin)
-  end
-end
-
-return M
diff --git a/lua/lvim/core/commands.lua b/lua/lvim/core/commands.lua
index aa36d4b7..b97b824f 100644
--- a/lua/lvim/core/commands.lua
+++ b/lua/lvim/core/commands.lua
@@ -14,7 +14,7 @@ M.defaults = {
   {
     name = "BufferKill",
     fn = function()
-      require("lvim.core.builtins.bufferline").buf_kill "bd"
+      require("lvim.builtin.bufferline").buf_kill "bd"
     end,
   },
   {
diff --git a/lua/lvim/core/theme.lua b/lua/lvim/core/theme.lua
index e4e122d2..913b860c 100644
--- a/lua/lvim/core/theme.lua
+++ b/lua/lvim/core/theme.lua
@@ -86,10 +86,10 @@ M.setup = function()
   vim.cmd("colorscheme " .. lvim.colorscheme)
 
   if package.loaded.lualine then
-    require("lvim.core.builtins.lualine").setup()
+    require("lvim.builtin.lualine").setup()
   end
   if package.loaded.lir then
-    require("lvim.core.builtins.lir").icon_setup()
+    require("lvim.builtin.lir").icon_setup()
   end
 end
 
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index 1278ed01..59dee7f9 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -24,7 +24,7 @@ local core_plugins = {
   {
     "williamboman/mason.nvim",
     config = function()
-      require("lvim.core.builtins").setup "mason"
+      require("lvim.builtin").setup "mason"
     end,
     cmd = { "Mason", "MasonInstall", "MasonUninstall", "MasonUninstallAll", "MasonLog" },
     lazy = true,
@@ -46,7 +46,7 @@ local core_plugins = {
     "nvim-telescope/telescope.nvim",
     branch = "0.1.x",
     config = function()
-      require("lvim.core.builtins").setup "telescope"
+      require("lvim.builtin").setup "telescope"
     end,
     dependencies = { "telescope-fzf-native.nvim" },
     lazy = true,
@@ -58,7 +58,7 @@ local core_plugins = {
   {
     "hrsh7th/nvim-cmp",
     config = function()
-      require("lvim.core.builtins").setup "cmp"
+      require("lvim.builtin").setup "cmp"
     end,
     event = { "InsertEnter", "CmdlineEnter" },
     dependencies = {
@@ -112,7 +112,7 @@ local core_plugins = {
     "windwp/nvim-autopairs",
     event = "InsertEnter",
     config = function()
-      require("lvim.core.builtins").setup "autopairs"
+      require("lvim.builtin").setup "autopairs"
     end,
     enabled = lvim.builtin.autopairs.active,
   },
@@ -125,7 +125,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.builtins").setup "treesitter"
+      require("lvim.builtin").setup "treesitter"
     end,
     cmd = {
       "TSInstall",
@@ -148,7 +148,7 @@ local core_plugins = {
   {
     "kyazdani42/nvim-tree.lua",
     config = function()
-      require("lvim.core.builtins").setup "nvimtree"
+      require("lvim.builtin").setup "nvimtree"
     end,
     enabled = lvim.builtin.nvimtree.active,
     cmd = { "NvimTreeToggle", "NvimTreeOpen", "NvimTreeFocus", "NvimTreeFindFileToggle" },
@@ -158,7 +158,7 @@ local core_plugins = {
   {
     "tamago324/lir.nvim",
     config = function()
-      require("lvim.core.builtins").setup "lir"
+      require("lvim.builtin").setup "lir"
     end,
     enabled = lvim.builtin.lir.active,
     event = "User DirOpened",
@@ -166,7 +166,7 @@ local core_plugins = {
   {
     "lewis6991/gitsigns.nvim",
     config = function()
-      require("lvim.core.builtins").setup "gitsigns"
+      require("lvim.builtin").setup "gitsigns"
     end,
     event = "User FileOpened",
     cmd = "Gitsigns",
@@ -177,7 +177,7 @@ local core_plugins = {
   {
     "folke/which-key.nvim",
     config = function()
-      require("lvim.core.builtins").setup "which-key"
+      require("lvim.builtin").setup "which-key"
     end,
     cmd = "WhichKey",
     event = "VeryLazy",
@@ -188,7 +188,7 @@ local core_plugins = {
   {
     "numToStr/Comment.nvim",
     config = function()
-      require("lvim.core.builtins").setup "comment"
+      require("lvim.builtin").setup "comment"
     end,
     keys = { { "gc", mode = { "n", "v" } }, { "gb", mode = { "n", "v" } } },
     event = "User FileOpened",
@@ -199,7 +199,7 @@ local core_plugins = {
   {
     "ahmedkhalf/project.nvim",
     config = function()
-      require("lvim.core.builtins").setup "project"
+      require("lvim.builtin").setup "project"
     end,
     enabled = lvim.builtin.project.active,
     event = "VimEnter",
@@ -219,7 +219,7 @@ local core_plugins = {
     "nvim-lualine/lualine.nvim",
     -- "Lunarvim/lualine.nvim",
     config = function()
-      require("lvim.core.builtins").setup "lualine"
+      require("lvim.builtin").setup "lualine"
     end,
     event = "VimEnter",
     enabled = lvim.builtin.lualine.active,
@@ -229,7 +229,7 @@ local core_plugins = {
   {
     "SmiteshP/nvim-navic",
     config = function()
-      require("lvim.core.builtins").setup "breadcrumbs"
+      require("lvim.builtin").setup "breadcrumbs"
     end,
     event = "User FileOpened",
     enabled = lvim.builtin.breadcrumbs.active,
@@ -238,7 +238,7 @@ local core_plugins = {
   {
     "akinsho/bufferline.nvim",
     config = function()
-      require("lvim.core.builtins").setup "bufferline"
+      require("lvim.builtin").setup "bufferline"
     end,
     branch = "main",
     event = "User FileOpened",
@@ -249,7 +249,7 @@ local core_plugins = {
   {
     "mfussenegger/nvim-dap",
     config = function()
-      require("lvim.core.builtins").setup "dap"
+      require("lvim.builtin").setup "dap"
     end,
     lazy = true,
     enabled = lvim.builtin.dap.active,
@@ -269,7 +269,7 @@ local core_plugins = {
   {
     "goolord/alpha-nvim",
     config = function()
-      require("lvim.core.builtins").setup "alpha"
+      require("lvim.builtin").setup "alpha"
     end,
     enabled = lvim.builtin.alpha.active,
     event = "VimEnter",
@@ -281,7 +281,7 @@ local core_plugins = {
     event = "VeryLazy",
     branch = "main",
     config = function()
-      require("lvim.core.builtins").setup "terminal"
+      require("lvim.builtin").setup "terminal"
     end,
     enabled = lvim.builtin.terminal.active,
   },
@@ -295,7 +295,7 @@ local core_plugins = {
   {
     "RRethy/vim-illuminate",
     config = function()
-      require("lvim.core.builtins").setup "illuminate"
+      require("lvim.builtin").setup "illuminate"
     end,
     event = "User FileOpened",
     enabled = lvim.builtin.illuminate.active,
@@ -304,7 +304,7 @@ local core_plugins = {
   {
     "lukas-reineke/indent-blankline.nvim",
     config = function()
-      require("lvim.core.builtins").setup "indentlines"
+      require("lvim.builtin").setup "indentlines"
     end,
     event = "User FileOpened",
     enabled = lvim.builtin.indentlines.active,