re-structure neovim plugins

also delete unused ones

config/nvim/lua/aleidk/plugins-base/auto-pairs.lua

@@ -0,0 +1,5 @@
+return {
+	"windwp/nvim-autopairs",
+	event = "InsertEnter",
+	opts = {}, -- this is equalent to setup({}) function
+}

config/nvim/lua/aleidk/plugins-base/bookmarks.lua

@@ -0,0 +1,34 @@
+local function select_or_create(search)
+	local grapple = require("grapple")
+
+	if grapple.exists(search) then
+		grapple.select(search)
+	else
+		grapple.tag()
+	end
+end
+
+return {
+	"cbochs/grapple.nvim",
+	dependencies = {
+		{ "nvim-tree/nvim-web-devicons", lazy = true },
+	},
+	lazy = false,
+	cmd = "Grapple",
+	keys = {
+		{ "<leader><leader>a", "<cmd>Grapple toggle<cr>",                      desc = "Toggle bookmark for current file" },
+		{ "<leader><leader>D", "<cmd>Grapple reset<cr>",                       desc = "Delete all bookmarks" },
+		{ "<leader><leader>t", "<cmd>Grapple toggle_tags<cr>",                 desc = "Toggle bookmarks window" },
+		{ "<leader><leader>T", "<cmd>Grapple toggle_scopes<cr>",               desc = "Toggle scopes window" },
+		{ "<leader><leader>n", "<cmd>Grapple cycle forward<cr>",               desc = "Next bookmark" },
+		{ "<leader><leader>N", "<cmd>Grapple cycle backward<cr>",              desc = "Prev bookmark" },
+		{ "<leader><leader>j", function() select_or_create({ index = 1 }) end, desc = "Go or create bookmark 1" },
+		{ "<leader><leader>k", function() select_or_create({ index = 2 }) end, desc = "Go or create bookmark 2" },
+		{ "<leader><leader>l", function() select_or_create({ index = 3 }) end, desc = "Go or create bookmark 3" },
+		{ "<leader><leader>ñ", function() select_or_create({ index = 4 }) end, desc = "Go or create bookmark 4" },
+		{ "<leader><leader>J", "<cmd>Grapple tag index=1<cr>",                 desc = "Override bookmark 1" },
+		{ "<leader><leader>K", "<cmd>Grapple tag index=2<cr>",                 desc = "Override bookmark 2" },
+		{ "<leader><leader>L", "<cmd>Grapple tag index=3<cr>",                 desc = "Override bookmark 3" },
+		{ "<leader><leader>Ñ", "<cmd>Grapple tag index=4<cr>",                 desc = "Override bookmark 4" },
+	},
+}

config/nvim/lua/aleidk/plugins-base/comments.lua

@@ -0,0 +1,34 @@
+return {
+	{
+		"echasnovski/mini.comment",
+		version = "*",
+		event = "VeryLazy",
+		dependencies = {
+			{ "nvim-treesitter/nvim-treesitter-context" },
+		},
+		opts = {
+			options = {
+				custom_commentstring = function()
+					return require("ts_context_commentstring.internal").calculate_commentstring()
+							or vim.bo.commentstring
+				end,
+			},
+		},
+	},
+	{
+		"LudoPinelli/comment-box.nvim",
+		event = "VeryLazy",
+		config = function()
+			require("comment-box").setup({
+				outer_blank_lines = true,
+			})
+
+			local cb = require("comment-box")
+
+			-- left aligned fixed size box with left aligned text
+			MAP({ "n", "v" }, "gcb", cb.lcbox, "Create a comment box")
+			-- centered adapted box with centered text
+			MAP({ "n", "v" }, "gcl", cb.llline, "Create a comment line")
+		end,
+	},
+}

config/nvim/lua/aleidk/plugins-base/dressing.lua

@@ -0,0 +1,10 @@
+return {
+	-- better imputs
+	"stevearc/dressing.nvim",
+	opts = {
+		input = {
+			-- handle by noice
+			enabled = false,
+		},
+	},
+}

config/nvim/lua/aleidk/plugins-base/file-explorer.lua

@@ -0,0 +1,44 @@
+---@type LazySpec
+return {
+	"mikavilpas/yazi.nvim",
+	-- event = "VeryLazy",
+	keys = {
+		-- 👇 in this section, choose your own keymappings!
+		{
+			"<leader>e",
+			"<cmd>Yazi<cr>",
+			desc = "Open yazi at the current file",
+		},
+		{
+			-- Open in the current working directory
+			"<leader>E",
+			"<cmd>Yazi cwd<cr>",
+			desc = "Open the file manager in nvim's working directory",
+		},
+		-- {
+		--   -- NOTE: this requires a version of yazi that includes
+		--   -- https://github.com/sxyazi/yazi/pull/1305 from 2024-07-18
+		--   '<c-up>',
+		--   "<cmd>Yazi toggle<cr>",
+		--   desc = "Resume the last yazi session",
+		-- },
+	},
+	---@type YaziConfig
+	opts = {
+		-- if you want to open yazi instead of netrw, see below for more info
+		open_for_directories = true,
+		open_multiple_tabs = true,
+		floating_window_scaling_factor = 1,
+		keymaps = {
+			show_help = '<f1>',
+			open_file_in_vertical_split = '<c-v>',
+			open_file_in_horizontal_split = '<c-s>',
+			open_file_in_tab = '<c-t>',
+			grep_in_directory = '<c-w>',
+			cycle_open_buffers = '<tab>',
+			copy_relative_path_to_selected_files = '<c-y>',
+			send_to_quickfix_list = '<c-q>',
+			change_working_directory = "<c-\\>",
+		},
+	},
+}

config/nvim/lua/aleidk/plugins-base/indent-blankline.lua

@@ -0,0 +1,30 @@
+return {
+	-- Add indentation guides even on blank lines
+	"lukas-reineke/indent-blankline.nvim",
+	event = { "BufReadPost", "BufNewFile" },
+	main = "ibl",
+	opts = {
+		-- char = "▏",
+		indent = {
+			char = "│",
+			tab_char = "│",
+		},
+		scope = {
+			enabled = true,
+		},
+		exclude = {
+			filetypes = {
+				"help",
+				"alpha",
+				"dashboard",
+				"neo-tree",
+				"Trouble",
+				"lazy",
+				"mason",
+				"notify",
+				"toggleterm",
+				"lazyterm",
+			},
+		},
+	},
+}

config/nvim/lua/aleidk/plugins-base/noice.lua

@@ -0,0 +1,123 @@
+return {
+	"folke/noice.nvim",
+	event = "VeryLazy",
+	dependencies = {
+		-- if you lazy-load any plugin below, make sure to add proper `module="..."` entries
+		"MunifTanjim/nui.nvim",
+	},
+	opts = {
+		presets = {
+			bottom_search = true,
+			-- command_palette = true,
+			long_message_to_split = true,
+			inc_rename = true,
+		},
+		lsp = {
+			override = {
+				["vim.lsp.util.convert_input_to_markdown_lines"] = true,
+				["vim.lsp.util.stylize_markdown"] = true,
+				["cmp.entry.get_documentation"] = true,
+			},
+		},
+		routes = {
+			{
+				filter = {
+					event = "msg_show",
+					any = {
+						{ find = "%d+L, %d+B" },
+						{ find = "; after #%d+" },
+						{ find = "; before #%d+" },
+					},
+				},
+				view = "mini",
+			},
+			{
+				filter = {
+					event = "msg_show",
+					kind = "search_count",
+				},
+				opts = { skip = true },
+			},
+		},
+		views = {
+			cmdline_popup = {
+				position = {
+					row = 5,
+					col = "50%",
+				},
+				size = {
+					width = 60,
+					height = "auto",
+				},
+			},
+			popupmenu = {
+				relative = "editor",
+				position = {
+					row = 8,
+					col = "50%",
+				},
+				size = {
+					width = 60,
+					height = 10,
+				},
+				border = {
+					style = "rounded",
+					padding = { 0, 1 },
+				},
+				win_options = {
+					winhighlight = { Normal = "Normal", FloatBorder = "DiagnosticInfo" },
+				},
+			},
+			notify = {
+				enabled = false,
+			},
+			messages = {
+				enabled = false,
+			},
+		},
+	},
+  -- stylua: ignore
+  keys = {
+    {
+      "<S-Enter>",
+      function() require("noice").redirect(vim.fn.getcmdline()) end,
+      mode = "c",
+      desc =
+      "Redirect Cmdline"
+    },
+    {
+      "<leader>unl",
+      function() require("noice").cmd("last") end,
+      desc =
+      "Noice Last Message"
+    },
+    {
+      "<leader>unh",
+      function() require("noice").cmd("history") end,
+      desc =
+      "Noice History"
+    },
+    { "<leader>una", function() require("noice").cmd("all") end,     desc = "Noice All" },
+    { "<leader>und", function() require("noice").cmd("dismiss") end, desc = "Dismiss All" },
+    {
+      "<c-f>",
+      function() if not require("noice.lsp").scroll(4) then return "<c-f>" end end,
+      silent = true,
+      expr = true,
+      desc =
+      "Scroll forward",
+      mode = {
+        "i", "n", "s" }
+    },
+    {
+      "<c-b>",
+      function() if not require("noice.lsp").scroll(-4) then return "<c-b>" end end,
+      silent = true,
+      expr = true,
+      desc =
+      "Scroll backward",
+      mode = {
+        "i", "n", "s" }
+    },
+  },
+}

config/nvim/lua/aleidk/plugins-base/quickfix.lua

@@ -0,0 +1,89 @@
+return {
+	{
+		"kevinhwang91/nvim-bqf",
+		event = "VeryLazy",
+		dependencies = {},
+		config = function()
+			local fn = vim.fn
+
+			function _G.qftf(info)
+				local items
+				local ret = {}
+				-- The name of item in list is based on the directory of quickfix window.
+				-- Change the directory for quickfix window make the name of item shorter.
+				-- It's a good opportunity to change current directory in quickfixtextfunc :)
+				--
+				-- local alterBufnr = fn.bufname('#') -- alternative buffer is the buffer before enter qf window
+				-- local root = getRootByAlterBufnr(alterBufnr)
+				-- vim.cmd(('noa lcd %s'):format(fn.fnameescape(root)))
+				--
+				if info.quickfix == 1 then
+					items = fn.getqflist({ id = info.id, items = 0 }).items
+				else
+					items = fn.getloclist(info.winid, { id = info.id, items = 0 }).items
+				end
+				local limit = 31
+				local fnameFmt1, fnameFmt2 = "%-" .. limit .. "s", "…%." .. (limit - 1) .. "s"
+				local validFmt = "%s │%5d:%-3d│%s %s"
+				for i = info.start_idx, info.end_idx do
+					local e = items[i]
+					local fname = ""
+					local str
+					if e.valid == 1 then
+						if e.bufnr > 0 then
+							fname = fn.bufname(e.bufnr)
+							if fname == "" then
+								fname = "[No Name]"
+							else
+								fname = fname:gsub("^" .. vim.env.HOME, "~")
+							end
+							-- char in fname may occur more than 1 width, ignore this issue in order to keep performance
+							if #fname <= limit then
+								fname = fnameFmt1:format(fname)
+							else
+								fname = fnameFmt2:format(fname:sub(1 - limit))
+							end
+						end
+						local lnum = e.lnum > 99999 and -1 or e.lnum
+						local col = e.col > 999 and -1 or e.col
+						local qtype = e.type == "" and "" or " " .. e.type:sub(1, 1):upper()
+						str = validFmt:format(fname, lnum, col, qtype, e.text)
+					else
+						str = e.text
+					end
+					table.insert(ret, str)
+				end
+				return ret
+			end
+
+			vim.o.qftf = "{info -> v:lua._G.qftf(info)}"
+
+			-- Adapt fzf's delimiter in nvim-bqf
+			require("bqf").setup({
+				filter = {
+					fzf = {
+						extra_opts = { "--bind", "ctrl-o:toggle-all", "--delimiter", "│" },
+					},
+				},
+			})
+
+			local toggle_qf = function()
+				local qf_open = false
+				for _, win in pairs(vim.fn.getwininfo()) do
+					if win["quickfix"] == 1 then
+						qf_open = true
+					end
+				end
+				if qf_open == true then
+					vim.cmd("cclose")
+					return
+				end
+				if not vim.tbl_isempty(vim.fn.getqflist()) then
+					vim.cmd("copen")
+				end
+			end
+
+			MAP("n", "<Leader>fQ", toggle_qf, "Toggle quickfix")
+		end,
+	},
+}

config/nvim/lua/aleidk/plugins-base/treesitter.lua

@@ -0,0 +1,91 @@
+return {
+	-- Highlight, edit, and navigate code
+	"nvim-treesitter/nvim-treesitter",
+	event = { "BufReadPost", "BufNewFile", "BufWritePre", "VeryLazy" },
+	dependencies = {
+		"nvim-treesitter/nvim-treesitter-textobjects",
+		"JoosepAlviste/nvim-ts-context-commentstring",
+		"nvim-treesitter/nvim-treesitter-context",
+		{ "windwp/nvim-ts-autotag", opts = {} },
+	},
+	build = ":TSUpdate",
+	config = function()
+		---@diagnostic disable-next-line: missing-fields
+		require("nvim-treesitter.configs").setup({
+			-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
+			auto_install = true,
+			highlight = { enable = true },
+			indent = { enable = true },
+			incremental_selection = {
+				enable = true,
+			},
+			textobjects = {
+				select = {
+					enable = true,
+					lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
+					keymaps = {
+						-- You can use the capture groups defined in textobjects.scm
+						["aa"] = "@parameter.outer",
+						["ia"] = "@parameter.inner",
+						["af"] = "@function.outer",
+						["if"] = "@function.inner",
+						["ac"] = "@class.outer",
+						["ic"] = "@class.inner",
+					},
+				},
+				move = {
+					enable = true,
+					set_jumps = true, -- whether to set jumps in the jumplist
+					goto_next_start = {
+						["]m"] = "@function.outer",
+						["]]"] = "@class.outer",
+					},
+					goto_next_end = {
+						["]M"] = "@function.outer",
+						["]["] = "@class.outer",
+					},
+					goto_previous_start = {
+						["[m"] = "@function.outer",
+						["[["] = "@class.outer",
+					},
+					goto_previous_end = {
+						["[M"] = "@function.outer",
+						["[]"] = "@class.outer",
+					},
+				},
+				swap = {
+					enable = true,
+					swap_next = {
+						["<leader>a"] = "@parameter.inner",
+					},
+					swap_previous = {
+						["<leader>A"] = "@parameter.inner",
+					},
+				},
+			},
+			-- autotag = { enable = true },
+		})
+
+		require('ts_context_commentstring').setup {
+			enable_autocmd = false,
+		}
+
+		vim.opt.foldmethod = "expr"
+		vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
+
+		-- Uncoment this line to disable auto folding on file open
+		vim.cmd("set nofoldenable")
+
+		-- TODO: remove this when blade treesitter is added to nvim-treesitter repo
+		-- Also remove the "config/nvim/after/queries/blade" folder.
+		local parser_config = require("nvim-treesitter.parsers").get_parser_configs()
+		parser_config.blade = {
+			install_info = {
+				url = "https://github.com/EmranMR/tree-sitter-blade",
+				files = { "src/parser.c" },
+				branch = "main",
+			},
+			filetype = "blade",
+		}
+	end,
+}

config/nvim/lua/aleidk/plugins-base/undo-tree.lua

@@ -0,0 +1,13 @@
+return {
+	{
+		"mbbill/undotree",
+		config = function()
+			vim.g.undotree_WindowLayout = 2
+			vim.g.undotree_ShortIndicators = 1
+			vim.g.undotree_SetFocusWhenToggle = 1
+		end,
+		keys = {
+			{ "<leader>fu", vim.cmd.UndotreeToggle, desc = "Undo tree" },
+		},
+	},
+}