neovim plugin cleanup

config/nvim/lazy-lock.json

@@ -16,27 +16,24 @@
   "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" },
   "copilot-lualine": { "branch": "main", "commit": "f40450c3e138766026327e7807877ea860618258" },
   "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" },
-  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
   "dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
   "friendly-snippets": { "branch": "main", "commit": "45a1b96e46efe5fce8af325d4bed45feb9d29d0f" },
   "gitsigns.nvim": { "branch": "main", "commit": "e9c4187c3774a46df2d086a66cf3a7e6bea4c432" },
   "grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
   "lazy.nvim": { "branch": "main", "commit": "56ead98e05bb37a4ec28930a54d836d033cf00f2" },
-  "lazygit.nvim": { "branch": "main", "commit": "dc56df433bfbf107fee0139e187eb9750878fa84" },
+  "lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
   "lualine.nvim": { "branch": "master", "commit": "6a40b530539d2209f7dc0492f3681c8c126647ad" },
+  "luvit-meta": { "branch": "main", "commit": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
   "mason.nvim": { "branch": "main", "commit": "f96a31855fa8aea55599cea412fe611b85a874ed" },
   "mini.clue": { "branch": "main", "commit": "08f792869781b4bfdfcaa55eb905b9635c0a243f" },
   "mini.comment": { "branch": "main", "commit": "c8406379987c321ecdef9f53e1ca741a55002104" },
   "mini.surround": { "branch": "main", "commit": "3cb5b509ad34f2402df4b977be607a614c8c7524" },
-  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
   "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" },
-  "neogit": { "branch": "master", "commit": "a20031fb5d7d12148764764059243135085e5c9b" },
   "noice.nvim": { "branch": "main", "commit": "6263b6696811f0b11c88d8d2371134b1cc1762fc" },
   "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
   "nvim-autopairs": { "branch": "master", "commit": "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d" },
-  "nvim-bqf": { "branch": "main", "commit": "1b24dc6050c34e8cd377b6b4cd6abe40509e0187" },
   "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
   "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" },
   "nvim-lspconfig": { "branch": "master", "commit": "216deb2d1b5fbf24398919228208649bbf5cbadf" },
@@ -53,7 +50,7 @@
   "render-markdown": { "branch": "main", "commit": "123048b428eb85618780fcef9ea9f4d68b5d2508" },
   "smart-splits.nvim": { "branch": "master", "commit": "95833675cd92538bf9cded1d2d58d1fc271c5428" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
-  "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "todo-comments.nvim": { "branch": "main", "commit": "d61567557e2ff5c548c74e96b2d9f8d33e5fcb34" },
   "treesj": { "branch": "main", "commit": "6e8bd008bacd5ad001c3953017c1dca20709e915" },
   "trouble.nvim": { "branch": "main", "commit": "03c1fbf518bef683422a3be9643c3da190903488" },
@@ -65,6 +62,5 @@
   "vim-dadbod-ui": { "branch": "master", "commit": "f74a31e8c6c5a9dccc63450a09d5cd64a9294330" },
   "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
-  "yazi.nvim": { "branch": "main", "commit": "faa03e9acb894533b91c811d0dafd816b995088f" },
+  "yazi.nvim": { "branch": "main", "commit": "faa03e9acb894533b91c811d0dafd816b995088f" }
-  "zk-nvim": { "branch": "main", "commit": "dbf4eeab55b08856c9d6b6722dbff39630bb35eb" }
 }

config/nvim/lua/aleidk/plugins-core/lualine.lua

@@ -66,6 +66,18 @@ return {
 			end
 		end
 
+		local trouble = require("trouble")
+		local symbols = trouble.statusline({
+			mode = "lsp_document_symbols",
+			groups = {},
+			title = false,
+			filter = { range = true },
+			format = "{kind_icon}{symbol.name:Normal}",
+			-- The following line is needed to fix the background color
+			-- Set it to the lualine section you want to use
+			hl_group = "lualine_c_normal",
+		})
+
 		return {
 			options = {
 				theme = "catppuccin",
@@ -115,18 +127,12 @@ return {
 						},
 					},
 					{ codecompanion_status },
-					{ "aerial" },
 					{
-						"overseer",
+						symbols.get,
+						cond = symbols.has,
 					},
 					{
-						-- Macro recording status
+						"overseer",
-						function()
-							return require("noice").api.status.mode.get()
-						end,
-						cond = function()
-							return package.loaded["noice"] and require("noice").api.status.mode.has()
-						end,
 					},
 				},
 				lualine_x = {
@@ -137,6 +143,15 @@ return {
 					},
 				},
 				lualine_y = {
+					{
+						-- Macro recording status
+						function()
+							return require("noice").api.status.mode.get()
+						end,
+						cond = function()
+							return package.loaded["noice"] and require("noice").api.status.mode.has()
+						end,
+					},
 					{ "searchcount" },
 					{ "location" },
 					{

config/nvim/lua/aleidk/plugins-core/telescope.lua

@@ -35,12 +35,8 @@ return {
 						["<ESC>"] = actions.close,
 						["<C-q>"] = actions.send_to_qflist + actions.open_qflist,
 						["<M-q>"] = actions.send_selected_to_qflist + actions.open_qflist,
-						["<c-t>"] = function(...)
+						["<c-t>"] = require("trouble.sources.telescope").open,
-							return require("trouble.providers.telescope").open_with_trouble(...)
+						["<a-t>"] = require("trouble.sources.telescope").open,
-						end,
-						["<a-t>"] = function(...)
-							return require("trouble.providers.telescope").open_selected_with_trouble(...)
-						end,
 					},
 				},
 			},

config/nvim/lua/aleidk/plugins-ide/color-picker.lua

@@ -2,7 +2,6 @@ return {
 	{
 		-- Color Picker
 		"uga-rosa/ccc.nvim",
-		event = "VeryLazy",
 		opts = {
 			auto_enable = true,
 			lsp = true,

config/nvim/lua/aleidk/plugins-ide/formatter.lua

@@ -1,6 +1,7 @@
 return {
 	"stevearc/conform.nvim",
-	event = "VeryLazy",
+	event = { "BufWritePre" },
+	cmd = { "ConformInfo" },
 	opts = {
 		-- log_level = vim.log.levels.DEBUG,
 
@@ -13,13 +14,13 @@ return {
 			-- have other formatters configured.
 			["_"] = { "trim_whitespace" },
 			blade = { "blade-formatter" },
-			css = { "prettierd", "prettier" },
+			css = { "biome" },
 			go = { "gofumpt", "goimports_reviser", "golines" },
 			html = { "djlint", "prettierd", stop_after_first = true },
-			javascript = { "prettierd", "prettier", stop_after_first = true },
+			javascript = { "biome" },
-			javascriptreact = { "prettierd", "prettier", stop_after_first = true },
+			javascriptreact = { "biome" },
-			json = { "prettierd", "prettier", stop_after_first = true },
+			json = { "biome" },
-			jsonc = { "prettierd", "prettier", stop_after_first = true },
+			jsonc = { "biome" },
 			lua = { "stylua" },
 			markdown = { "markdownlint" },
 			nim = { "nimpretty" },
@@ -27,8 +28,8 @@ return {
 			python = { "ruff_format", "ruff_organize_imports" },
 			scss = { "prettierd", "prettier", stop_after_first = true },
 			sh = { "shfmt" },
-			typescript = { "prettierd", "prettier", stop_after_first = true },
+			typescript = { "biome" },
-			typescriptreact = { "prettierd", "prettier", stop_after_first = true },
+			typescriptreact = { "biome" },
 			xml = { "lemminx" },
 			zsh = { "shfmt" }
 		},

config/nvim/lua/aleidk/plugins-ide/git.lua

@@ -32,66 +32,4 @@ return {
 			end,
 		},
 	},
-	{
-		"kdheepak/lazygit.nvim",
-		event = "VeryLazy",
-		dependencies = {
-			"nvim-lua/plenary.nvim",
-		},
-		keys = {
-			{ "<leader>gG", ":LazyGit<CR>", desc = "Lazygit" },
-		},
-	},
-	{
-		"NeogitOrg/neogit",
-		dependencies = {
-			"nvim-lua/plenary.nvim",      -- required
-			"nvim-telescope/telescope.nvim", -- optional
-			"sindrets/diffview.nvim",     -- optional
-		},
-		config = true,
-		opts = {
-			disable_line_numbers = false,
-			console_timeout = 8000,
-			graph_style = "unicode",
-			kind = "tab",
-			ignored_settings = {
-				"NeogitPushPopup--force",
-				"NeogitPullPopup--rebase",
-				"NeogitCommitPopup--allow-empty",
-				"NeogitCommitPopup--reuse-message",
-				"NeogitRevertPopup--no-edit",
-			},
-		},
-		keys = {
-			{
-				"<leader>gg",
-				function()
-					require("neogit").open()
-				end,
-				desc = "Neogit",
-			},
-			{
-				"<leader>gc",
-				function()
-					require("neogit").open({ "commit" })
-				end,
-				desc = "Commit",
-			},
-			{
-				"<leader>gp",
-				function()
-					require("neogit").open({ "pull" })
-				end,
-				desc = "Pull",
-			},
-			{
-				"<leader>gP",
-				function()
-					require("neogit").open({ "push" })
-				end,
-				desc = "Push",
-			},
-		},
-	},
 }

config/nvim/lua/aleidk/plugins-ide/init.lua

@@ -2,12 +2,10 @@ return {
 	{
 		"ckolkey/ts-node-action",
 		dependencies = { "nvim-treesitter" },
-		event = "VeryLazy",
+		opts = {},
-		config = function()
+		keys = {
-			require("ts-node-action").setup({})
+			{ "<leader>ls", function() require("ts-node-action").node_action() end, desc = "Node Action" }
-
+		}
-			vim.keymap.set({ "n" }, "<leader>lA", require("ts-node-action").node_action, { desc = "Node Action" })
-		end,
 	},
 	{
 		"Wansmer/treesj",

config/nvim/lua/aleidk/plugins-ide/linters.lua

@@ -8,10 +8,10 @@ return {
 		lint.linters.gitlint.args = { "--contrib", "contrib-title-conventional-commits", "--msg-filename", "-" }
 
 		lint.linters_by_ft = {
-			javascript = { "eslint_d" },
+			javascript = { "biomejs" },
-			typescript = { "eslint_d" },
+			typescript = { "biomejs" },
-			javascriptreact = { "eslint_d" },
+			javascriptreact = { "biomejs" },
-			typescriptreact = { "eslint_d" },
+			typescriptreact = { "biomejs" },
 			-- astro = { "eslint_d" },
 			python = { "ruff" },
 			sh = { "shellcheck" },

config/nvim/lua/aleidk/plugins-ide/lsp.lua

@@ -1,13 +1,26 @@
-return { {
+return {
+	-- LSP Plugins
+	{
+		-- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins
+		-- used for completion, annotations and signatures of Neovim apis
+		'folke/lazydev.nvim',
+		ft = 'lua',
+		opts = {
+			library = {
+				-- Load luvit types when the `vim.uv` word is found
+				{ path = 'luvit-meta/library', words = { 'vim%.uv' } },
+			},
+		},
+	},
+	{ "Bilal2453/luvit-meta", lazy = true }, -- optional `vim.uv` typings
+	{
 		-- LSP Configuration & Plugins
 		"neovim/nvim-lspconfig",
 		event = { "BufReadPost", "BufNewFile", "BufWritePre" },
 		dependencies = {
 			-- Automatically install LSPs to stdpath for neovim
-		{ "williamboman/mason.nvim" },
+			{ "williamboman/mason.nvim", config = true },
 			"williamboman/mason-lspconfig.nvim",
-		-- Additional lua configuration, makes nvim stuff amazing!
-		{ "folke/neodev.nvim",      opts = {} },
 		},
 
 		config = function()
@@ -82,7 +95,6 @@ return { {
 					},
 				},
 				html = {},
-			["nil_ls"] = {},
 				marksman = {},
 				pyright = {},
 				phpactor = {},
@@ -120,30 +132,13 @@ return { {
 				},
 				sqlls = {},
 				yamlls = {},
-			tsserver = {
-				init_options = {
-					preferences = {
-						disableSuggestions = true,
-					},
-				},
-			},
 				lua_ls = {
 					settings = {
 						Lua = {
-						runtime = {
+							completion = {
-							-- Tell the language server which version of Lua you're using
+								callSnippet = 'Replace',
-							-- (most likely LuaJIT in the case of Neovim)
-							version = "LuaJIT",
-						},
-						-- Make the server aware of Neovim runtime files
-						workspace = {
-							checkThirdParty = false,
-							library = {
-								vim.env.VIMRUNTIME,
-								-- "${3rd}/luv/library"
-								-- "${3rd}/busted/library",
-							},
 							},
+							diagnostics = { disable = { 'missing-fields' } },
 						},
 					},
 				},
@@ -158,7 +153,6 @@ return { {
 
 			mason_lspconfig.setup({
 				ensure_installed = vim.tbl_keys(servers),
-			-- automatic_installation = { exclude = { "astro", "phpactor", "rust_analyzer", "sqlls" } },
 				automatic_installation = false,
 			})
 
@@ -216,38 +210,5 @@ return { {
 				vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
 			end
 		end,
-},
-
-	{
-		'stevearc/aerial.nvim',
-		-- Optional dependencies
-		dependencies = {
-			"nvim-treesitter/nvim-treesitter",
-			"nvim-tree/nvim-web-devicons"
 	},
-		opts = {
-			close_on_select = false,
-			show_guides = true,
-			autojump = true,
-			highlight_on_hover = true,
-			layout = {
-				default_direction = "float",
-			},
-			float = {
-				relative = "editor",
-			},
-			nav = {
-				preview = true,
-				keymaps = {
-					["q"] = "actions.close",
-				},
-			},
-		},
-
-		keys = {
-			{ "<leader>ll", function() require("aerial").toggle() end,     desc = "Open syntax tree" },
-			{ "<leader>lL", function() require("aerial").nav_toggle() end, desc = "Open syntax tree navigation" },
-			{ "<leader>fl", "<CMD>Telescope aerial<CR>",                   desc = "Find in syntax tree" },
-		}
-	}
 }

config/nvim/lua/aleidk/plugins-ide/mason.lua

@@ -1,8 +0,0 @@
-return {
-	"williamboman/mason.nvim",
-	cmd = "Mason",
-	build = ":MasonUpdate",
-	opts = {
-		ensure_installed = {},
-	},
-}

config/nvim/lua/aleidk/plugins-ide/remote-sshfs.lua

@@ -1,6 +1,7 @@
 return {
 	"nosduco/remote-sshfs.nvim",
 	dependencies = { "nvim-telescope/telescope.nvim" },
+	cmd = { "RemoteSSHFSConnec" },
 	config = function()
 		require("remote-sshfs").setup({})
 		require("telescope").load_extension("remote-sshfs")

config/nvim/lua/aleidk/plugins-ide/task-runner.lua

@@ -19,13 +19,11 @@ local scroll_to_end = function(winid)
 	winid = winid or 0
 	local bufnr = vim.api.nvim_win_get_buf(winid)
 	local lnum = vim.api.nvim_buf_line_count(bufnr)
-	local last_line = vim.api.nvim_buf_get_lines(bufnr, -2, -1, true)[1]
 	-- Hack: terminal buffers add a bunch of empty lines at the end. We need to ignore them so that
 	-- we don't end up scrolling off the end of the useful output.
 	local not_much_output = lnum < vim.o.lines + 6
 	if vim.bo[bufnr].buftype == "terminal" and not_much_output then
 		lnum = term_get_effective_line_count(bufnr)
-		last_line = vim.api.nvim_buf_get_lines(bufnr, lnum - 1, lnum, true)[1]
 	end
 	local scrolloff = vim.api.nvim_get_option_value("scrolloff", { scope = "local", win = winid })
 	vim.api.nvim_set_option_value("scrolloff", 0, { scope = "local", win = winid })

config/nvim/lua/aleidk/plugins-ide/trouble.lua

@@ -1,24 +1,80 @@
 return {
 	"folke/trouble.nvim",
 	dependencies = { "nvim-tree/nvim-web-devicons" },
-	cmd = { "TroubleToggle", "Trouble" },
+	cmd = { "Trouble" },
 	keys = {
-		{ "<leader>fq", "<CMD>TroubleToggle<CR>", desc = "Toggle trouble" },
-		{ "<leader>fd", "<CMD>TroubleToggle workspace_diagnostics<CR>", desc = "Find diagnostics" },
 		{
 			"<leader>fD",
-			"<CMD>TroubleToggle document_diagnostics<CR>",
+			"<cmd>Trouble diagnostics open<cr>",
-			desc = "Find diagnostics in workspace",
+			desc = "Find diagnostics (Trouble)",
+		},
+		{
+			"<leader>fd",
+			"<cmd>Trouble diagnostics open filter.buf=0<cr>",
+			desc = "Find buffer diagnostics (Trouble)",
+		},
+		{
+			"<leader>ll",
+			"<cmd>Trouble symbols open<cr>",
+			desc = "Symbols (Trouble)",
+		},
+		{
+			"<leader>li",
+			"<cmd>Trouble lsp open<cr>",
+			desc = "LSP info of node (Trouble)",
+		},
+		{
+			"<leader>fq",
+			"<cmd>Trouble qflist open<cr>",
+			desc = "Quickfix List (Trouble)",
 		},
 	},
-	config = function()
+	opts = function()
-		require("trouble").setup({
+		---@type trouble.Window.opts
-			mode = "document_diagnostics",
+		local win_opts = {
-			action_keys = {
+			-- size = { width = 30, height = 0.5 },
-				open_split = "s",
+			minimal = true,
-				open_vsplit = "v",
+			border = "rounded",
-				open_tab = "t",
+			position = "bottom",
+		}
+
+		---@type trouble.Config
+		return {
+			focus = false,
+
+			---@type trouble.Window.opts
+			preview = {
+				type = "split",
+				relative = "win",
+				position = "top",
 			},
-		})
+
-	end,
+			---@type table<string, trouble.Action.spec|false>
+			keys = {
+				["<cr>"] = "jump_close",
+				["<2-leftmouse>"] = "jump_close",
+				["<c-v>"] = "jump_split_close",
+				["<c-s>"] = "jump_vsplit_close",
+				["v"] = "jump_split_close",
+				["s"] = "jump_vsplit_close",
+				["<c-k>"] = "cancel", -- hack to fool myself into thinking I move to the avobe window
+			},
+			win = win_opts,
+			---@type table<string, trouble.Mode>
+			modes = {
+				symbols = {
+					focus = true,
+					win = win_opts
+				},
+				lsp_references = {
+					focus = true,
+					win = win_opts
+				},
+				lsp = {
+					focus = true,
+					win = win_opts
+				},
+			}
+		}
+	end
 }