...

TwIStOy · Mar 29, 2024 · f00df19 · f00df19
1 parent 595bdae
commit f00df19
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 95 deletions.
diff --git a/lua/dotvim/core/package.lua b/lua/dotvim/core/package.lua
@@ -115,7 +115,7 @@ function M.load_package(name)
     return loaded_packages[name]
   end
 
-  local module = require(name)
+  local module = require(("dotvim.packages.%s"):format(name))
   if module == nil then
     vim.notify("Failed to load package module: " .. name, vim.log.levels.WARN)
     return nil

diff --git a/lua/dotvim/legacy/packages/lsp/init.lua b/lua/dotvim/legacy/packages/lsp/init.lua
diff --git a/lua/dotvim/packages/base/init.lua → lua/dotvim/pkgs/base/init.lua b/lua/dotvim/packages/base/init.lua → lua/dotvim/pkgs/base/init.lua
@@ -3,14 +3,14 @@ local Utils = require("dotvim.utils")
 
 ---@type dotvim.core.package.PackageOption
 return {
-  name = "dotvim.packages.base",
+  name = "base",
   setup = function()
-    require("dotvim.packages.base.setup.options")
-    require("dotvim.packages.base.setup.keymaps")
-    require("dotvim.packages.base.setup.autocmds")
+    require("dotvim.pkgs.base.setup.options")
+    require("dotvim.pkgs.base.setup.keymaps")
+    require("dotvim.pkgs.base.setup.autocmds")
   end,
   plugins = Utils.tbl.flatten_array {
-    require("dotvim.packages.base.plugins.init"),
+    require("dotvim.pkgs.base.plugins.init"),
     { "folke/lazy.nvim", lazy = true },
     {
       "dstein64/vim-startuptime",

diff --git a/lua/dotvim/packages/base/plugins/init.lua → lua/dotvim/pkgs/base/plugins/init.lua b/lua/dotvim/packages/base/plugins/init.lua → lua/dotvim/pkgs/base/plugins/init.lua
@@ -10,6 +10,6 @@ return {
     keys = { { "J", "<Plug>(jplus)", mode = { "n", "v" }, noremap = false } },
     gui = "all",
   },
-  require("dotvim.packages.base.plugins.mason"),
-  require("dotvim.packages.base.plugins.toggleterm"),
+  require("dotvim.pkgs.base.plugins.mason"),
+  require("dotvim.pkgs.base.plugins.toggleterm"),
 }
diff --git a/lua/dotvim/packages/base/plugins/mason.lua → lua/dotvim/pkgs/base/plugins/mason.lua b/lua/dotvim/packages/base/plugins/mason.lua → lua/dotvim/pkgs/base/plugins/mason.lua
diff --git a/...tvim/packages/base/plugins/toggleterm.lua → lua/dotvim/pkgs/base/plugins/toggleterm.lua b/...tvim/packages/base/plugins/toggleterm.lua → lua/dotvim/pkgs/base/plugins/toggleterm.lua
diff --git a/lua/dotvim/packages/base/setup/autocmds.lua → lua/dotvim/pkgs/base/setup/autocmds.lua b/lua/dotvim/packages/base/setup/autocmds.lua → lua/dotvim/pkgs/base/setup/autocmds.lua
diff --git a/lua/dotvim/packages/base/setup/keymaps.lua → lua/dotvim/pkgs/base/setup/keymaps.lua b/lua/dotvim/packages/base/setup/keymaps.lua → lua/dotvim/pkgs/base/setup/keymaps.lua
diff --git a/lua/dotvim/packages/base/setup/options.lua → lua/dotvim/pkgs/base/setup/options.lua b/lua/dotvim/packages/base/setup/options.lua → lua/dotvim/pkgs/base/setup/options.lua
diff --git a/lua/dotvim/packages/base/setup/shared.lua → lua/dotvim/pkgs/base/setup/shared.lua b/lua/dotvim/packages/base/setup/shared.lua → lua/dotvim/pkgs/base/setup/shared.lua
diff --git a/lua/dotvim/packages/lsp/init.lua → lua/dotvim/pkgs/lsp/init.lua b/lua/dotvim/packages/lsp/init.lua → lua/dotvim/pkgs/lsp/init.lua
@@ -1,7 +1,11 @@
 ---@type dotvim.core.package.PackageOption
 local M = {
-  name = "dotvim.packages.lsp",
-  plugins = {},
+  name = "lsp",
+  plugins = {
+    require("dotvim.pkgs.lsp.plugins.nvim-lspconfig"),
+    require("dotvim.pkgs.lsp.plugins.lspkind"),
+    require("dotvim.pkgs.lsp.plugins.glance"),
+  },
 }
 
 local methods = require("dotvim.core.lsp.methods")

diff --git a/lua/dotvim/packages/lsp/methods.lua → lua/dotvim/pkgs/lsp/methods.lua b/lua/dotvim/packages/lsp/methods.lua → lua/dotvim/pkgs/lsp/methods.lua
diff --git a/lua/dotvim/packages/lsp/plugins/glance.lua → lua/dotvim/pkgs/lsp/plugins/glance.lua b/lua/dotvim/packages/lsp/plugins/glance.lua → lua/dotvim/pkgs/lsp/plugins/glance.lua
diff --git a/lua/dotvim/packages/lsp/plugins/lspkind.lua → lua/dotvim/pkgs/lsp/plugins/lspkind.lua b/lua/dotvim/packages/lsp/plugins/lspkind.lua → lua/dotvim/pkgs/lsp/plugins/lspkind.lua
diff --git a/...m/packages/lsp/plugins/nvim-lspconfig.lua → ...otvim/pkgs/lsp/plugins/nvim-lspconfig.lua b/...m/packages/lsp/plugins/nvim-lspconfig.lua → ...otvim/pkgs/lsp/plugins/nvim-lspconfig.lua
diff --git a/lua/dotvim/packages/theme/init.lua → lua/dotvim/pkgs/theme/init.lua b/lua/dotvim/packages/theme/init.lua → lua/dotvim/pkgs/theme/init.lua
@@ -1,8 +1,8 @@
 ---@type dotvim.core.package.PackageOption
 return {
-  name = "dotvim.packages.theme",
+  name = "theme",
   plugins = {
-    require("dotvim.packages.theme.plugins.catppuccin"),
+    require("dotvim.pkgs.theme.plugins.catppuccin"),
   },
   setup = function()
     vim.cmd("colorscheme catppuccino")

diff --git a/...vim/packages/theme/plugins/catppuccin.lua → lua/dotvim/pkgs/theme/plugins/catppuccin.lua b/...vim/packages/theme/plugins/catppuccin.lua → lua/dotvim/pkgs/theme/plugins/catppuccin.lua