From 1293be93aa857bd25f79b1bb86da70f2af08b303 Mon Sep 17 00:00:00 2001 From: Oscar Wallberg Date: Wed, 15 Apr 2026 05:07:29 +0200 Subject: [PATCH] fix(pack): move plugins out from lua runtime path --- lua/pack.lua | 12 ++++++------ {lua/plugins => plugins}/comment.lua | 0 {lua/plugins => plugins}/fzf-lua.lua | 0 {lua/plugins => plugins}/gitsigns.lua | 0 {lua/plugins => plugins}/grug-far.lua | 0 {lua/plugins => plugins}/mason-auto-install.lua | 0 {lua/plugins => plugins}/mason.lua | 0 {lua/plugins => plugins}/nvim-dap.lua | 0 {lua/plugins => plugins}/nvim-lspconfig.lua | 0 {lua/plugins => plugins}/nvim-tree.lua | 0 {lua/plugins => plugins}/nvim-treesitter.lua | 0 {lua/plugins => plugins}/oil.lua | 0 {lua/plugins => plugins}/onedark.lua | 0 {lua/plugins => plugins}/outline.lua | 0 {lua/plugins => plugins}/undotree.lua | 0 {lua/plugins => plugins}/vim-fugitive.lua | 0 16 files changed, 6 insertions(+), 6 deletions(-) rename {lua/plugins => plugins}/comment.lua (100%) rename {lua/plugins => plugins}/fzf-lua.lua (100%) rename {lua/plugins => plugins}/gitsigns.lua (100%) rename {lua/plugins => plugins}/grug-far.lua (100%) rename {lua/plugins => plugins}/mason-auto-install.lua (100%) rename {lua/plugins => plugins}/mason.lua (100%) rename {lua/plugins => plugins}/nvim-dap.lua (100%) rename {lua/plugins => plugins}/nvim-lspconfig.lua (100%) rename {lua/plugins => plugins}/nvim-tree.lua (100%) rename {lua/plugins => plugins}/nvim-treesitter.lua (100%) rename {lua/plugins => plugins}/oil.lua (100%) rename {lua/plugins => plugins}/onedark.lua (100%) rename {lua/plugins => plugins}/outline.lua (100%) rename {lua/plugins => plugins}/undotree.lua (100%) rename {lua/plugins => plugins}/vim-fugitive.lua (100%) diff --git a/lua/pack.lua b/lua/pack.lua index e1d89f3..6adc59d 100644 --- a/lua/pack.lua +++ b/lua/pack.lua @@ -34,12 +34,12 @@ end ---@param name string ---@return string? local function normalize_name(name) - name = name:match("[^.]+") - if name then - return name:lower() + name = name:gsub("%.lua$", "") + name = name:gsub("%.nvim$", "") + if name == "" then + return nil end - - return nil + return name:lower() end ---@param plugin ow.Pack.Plugin @@ -49,7 +49,7 @@ local function load(plugin) log.error("Invalid plugin name: %s", plugin.name) return end - local path = string.format("%s/lua/plugins/%s.lua", config_dir, name) + local path = vim.fs.joinpath(config_dir, "plugins", name .. ".lua") if vim.uv.fs_stat(path) then local ok, err = exec(path) diff --git a/lua/plugins/comment.lua b/plugins/comment.lua similarity index 100% rename from lua/plugins/comment.lua rename to plugins/comment.lua diff --git a/lua/plugins/fzf-lua.lua b/plugins/fzf-lua.lua similarity index 100% rename from lua/plugins/fzf-lua.lua rename to plugins/fzf-lua.lua diff --git a/lua/plugins/gitsigns.lua b/plugins/gitsigns.lua similarity index 100% rename from lua/plugins/gitsigns.lua rename to plugins/gitsigns.lua diff --git a/lua/plugins/grug-far.lua b/plugins/grug-far.lua similarity index 100% rename from lua/plugins/grug-far.lua rename to plugins/grug-far.lua diff --git a/lua/plugins/mason-auto-install.lua b/plugins/mason-auto-install.lua similarity index 100% rename from lua/plugins/mason-auto-install.lua rename to plugins/mason-auto-install.lua diff --git a/lua/plugins/mason.lua b/plugins/mason.lua similarity index 100% rename from lua/plugins/mason.lua rename to plugins/mason.lua diff --git a/lua/plugins/nvim-dap.lua b/plugins/nvim-dap.lua similarity index 100% rename from lua/plugins/nvim-dap.lua rename to plugins/nvim-dap.lua diff --git a/lua/plugins/nvim-lspconfig.lua b/plugins/nvim-lspconfig.lua similarity index 100% rename from lua/plugins/nvim-lspconfig.lua rename to plugins/nvim-lspconfig.lua diff --git a/lua/plugins/nvim-tree.lua b/plugins/nvim-tree.lua similarity index 100% rename from lua/plugins/nvim-tree.lua rename to plugins/nvim-tree.lua diff --git a/lua/plugins/nvim-treesitter.lua b/plugins/nvim-treesitter.lua similarity index 100% rename from lua/plugins/nvim-treesitter.lua rename to plugins/nvim-treesitter.lua diff --git a/lua/plugins/oil.lua b/plugins/oil.lua similarity index 100% rename from lua/plugins/oil.lua rename to plugins/oil.lua diff --git a/lua/plugins/onedark.lua b/plugins/onedark.lua similarity index 100% rename from lua/plugins/onedark.lua rename to plugins/onedark.lua diff --git a/lua/plugins/outline.lua b/plugins/outline.lua similarity index 100% rename from lua/plugins/outline.lua rename to plugins/outline.lua diff --git a/lua/plugins/undotree.lua b/plugins/undotree.lua similarity index 100% rename from lua/plugins/undotree.lua rename to plugins/undotree.lua diff --git a/lua/plugins/vim-fugitive.lua b/plugins/vim-fugitive.lua similarity index 100% rename from lua/plugins/vim-fugitive.lua rename to plugins/vim-fugitive.lua