update:restructure

nvim/lua/plugins/ai.lua

@@ -1,6 +1,6 @@
 local M = {}
 
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 function M.setup()
 	vim.api.nvim_create_autocmd("InsertEnter", {

nvim/lua/plugins/autotag.lua

@@ -1,6 +1,6 @@
 local M = {}
 
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 function M.setup()
 	vim.api.nvim_create_autocmd("FileType", {

nvim/lua/plugins/catppuccin.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 local ui = require("utils.ui")
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 local function apply_theme_overrides()
 	local transparent_groups = {

nvim/lua/plugins/cmp.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 local ui = require("utils.ui")
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 function M.setup()
 	pack.add({ "nvim-cmp", "cmp-nvim-lsp", "cmp-buffer", "cmp-path", "luasnip", "cmp_luasnip" })

nvim/lua/plugins/error-viewer.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 local lazy = require("utils.lazy")
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 local function with_trouble(fn)
 	lazy.load_once("trouble", pack.registry({ "trouble.nvim" }), function()

nvim/lua/plugins/lsp.lua

@@ -1,8 +1,8 @@
 local M = {}
 
-local pack = require("utils.pack")
-local mason_utils = require("utils.mason")
-local lsp_tools = require("plugins.lsp_tools")
+local pack = require("commands.pack")
+local mason_utils = require("commands.mason")
+local lsp_tools = require("plugins.lsp-manager")
 
 function M.setup()
 	pack.add({ "mason", "nvim-lspconfig", "conform", "symbol-usage" })

nvim/lua/plugins/mini.lua

@@ -1,6 +1,6 @@
 local M = {}
 
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 function M.setup()
 	pack.add({ "mini.nvim" })

nvim/lua/plugins/search-replace.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 local lazy = require("utils.lazy")
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 -- grug guide
 -- navigate splits: <C+w><Left> or <Right>

nvim/lua/plugins/telescope.lua

@@ -1,7 +1,7 @@
 local M = {}
 
 local lazy = require("utils.lazy")
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 local function with_telescope(fn)
 	lazy.load_once("telescope", pack.registry({ "plenary.nvim", "telescope.nvim" }), function()

nvim/lua/plugins/tools.lua

@@ -1,60 +0,0 @@
-local M = {}
-
-local lazy = require("utils.lazy")
-local pack = require("utils.pack")
-
-local function with_trouble(fn)
-	lazy.load_once("trouble", pack.registry({ "trouble.nvim" }), function()
-		require("trouble").setup({})
-	end)
-	fn()
-end
-
--- grug guide
--- navigate splits: <C+w><Left> or <Right>
-local function with_grug(fn)
-	lazy.load_once("grug-far", pack.registry({ "grug-far.nvim" }), function()
-		require("grug-far").setup({})
-	end)
-	fn(require("grug-far"))
-end
-
-function M.setup()
-	vim.keymap.set("n", "<leader>xx", function()
-		with_trouble(function()
-			vim.cmd("Trouble diagnostics toggle")
-		end)
-	end, { desc = "Diagnostics (Trouble)" })
-
-	vim.keymap.set("n", "<leader>xX", function()
-		with_trouble(function()
-			vim.cmd("Trouble diagnostics toggle filter.buf=0")
-		end)
-	end, { desc = "Buffer diagnostics" })
-
-	vim.keymap.set("n", "<leader>xQ", function()
-		with_trouble(function()
-			vim.cmd("Trouble qflist toggle")
-		end)
-	end, { desc = "Quickfix list" })
-
-	vim.keymap.set("n", "<leader>S", function()
-		with_grug(function()
-			vim.cmd("GrugFar")
-		end)
-	end, { desc = "Search/replace project" })
-
-	vim.keymap.set("n", "<leader>s", function()
-		with_grug(function(grug)
-			grug.open({ prefills = { paths = vim.fn.expand("%") } })
-		end)
-	end, { desc = "Search/replace current file" })
-
-	vim.keymap.set("x", "<leader>s", function()
-		with_grug(function(grug)
-			grug.open({ visualSelectionUsage = "operate-within-range" })
-		end)
-	end, { desc = "Search/replace in selection" })
-end
-
-return M

nvim/lua/plugins/treesitter.lua

@@ -1,6 +1,6 @@
 local M = {}
 
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 function M.setup()
 	pack.add({ "nvim-treesitter" })

nvim/lua/plugins/ui.lua

@@ -1,6 +1,6 @@
 local M = {}
 
-local pack = require("utils.pack")
+local pack = require("commands.pack")
 
 function M.setup()
 	pack.add({ "nvim-web-devicons", "indent-blankline.nvim", "lualine.nvim", "bufferline.nvim" })