new plugins

vim/.vim/lua/plugins/cmp.lua

@@ -18,21 +18,22 @@ return {
 		"hrsh7th/nvim-cmp",
 		event = { "InsertEnter", "CmdlineEnter" },
 		dependencies = {
+			"Exafunction/codeium.nvim",
+			"FelipeLema/cmp-async-path",
+			"amarakon/nvim-cmp-buffer-lines",
+			"chrisgrieser/cmp-nerdfont",
+			"dmitmel/cmp-cmdline-history",
 			"f3fora/cmp-spell",
 			"hrsh7th/cmp-buffer",
-			"amarakon/nvim-cmp-buffer-lines",
 			"hrsh7th/cmp-calc",
-			"onsails/lspkind.nvim",
 			"hrsh7th/cmp-cmdline",
-			"Exafunction/codeium.nvim",
 			"hrsh7th/cmp-emoji",
 			"hrsh7th/cmp-nvim-lsp",
 			"hrsh7th/cmp-nvim-lsp-document-symbol",
 			"hrsh7th/cmp-nvim-lsp-signature-help",
-			"dmitmel/cmp-cmdline-history",
 			"hrsh7th/cmp-nvim-lua",
-			"FelipeLema/cmp-async-path",
 			"lukas-reineke/cmp-under-comparator",
+			"onsails/lspkind.nvim",
 			"ray-x/cmp-treesitter",
 		},
 		config = function()
@@ -77,6 +78,7 @@ return {
 					{ name = "luasnip", priority = 8 },
 					{ name = "nvim_lsp", priority = 7 },
 					{ name = "async_path" },
+					{ name = "nerdfont" },
 					{ name = "treesitter" },
 					{ name = "buffer" },
 					{ name = "calc" },
@@ -103,16 +105,18 @@ return {
 					format = lspkind.cmp_format({
 						menu = {
 							async_path = " path",
-							buffer = " Buf",
+							buffer = " Buf",
 							cmdline = " cmd",
 							codeium = "󰚩 Codeium",
-							crates = " rust",
+							crates = " rust",
 							luasnip = " snip",
+							buganizer = " Buganizer",
+							nerdfont = "󰊪 nerdfont",
 							nvim_ciderlsp = "󰚩 Cider",
-							analysislsp = "? analysislsp",
+							analysislsp = "󰟌 analysislsp",
-							nvim_lsp = " LSP",
+							nvim_lsp = " LSP",
 							nvim_lua = " lua",
-							treesitter = " ts",
+							treesitter = "󰙅 ts",
 						},
 					}),
 				},

vim/.vim/lua/plugins/dap.lua

@@ -1,84 +1,113 @@
 return {
-	"mfussenegger/nvim-dap",
+	{
-	dependencies = {
+		"mfussenegger/nvim-jdtls",
-		"rcarriga/nvim-dap-ui",
+		config = function() end,
-		"nvim-telescope/telescope-dap.nvim",
 	},
-	keys = {
+	{
-		{ "<leader>do", ":lua require'dapui'.open()<CR>" },
+		"mfussenegger/nvim-dap",
-		-- { "<F5>", ":lua require'dap'.continue()<CR>" },
+		dependencies = {
-		{ "<leader>dl", ":lua require'dap'.run_last()<CR>" },
+			"rcarriga/nvim-dap-ui",
-		{ "<leader>db", ":lua require'dap'.toggle_breakpoint()<CR>" },
+			"nvim-telescope/telescope-dap.nvim",
-		{ "<leader>dB", ":lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>" },
+		},
-		{ "<leader>dlp", ":lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>" },
+		keys = {
-		{ "<leader>dr", ":lua require'dap'.repl.open()<CR>" },
+			{ "<leader>do", ":lua require'dapui'.open()<CR>" },
-		{ "<leader>dt", ":Telescope dap configurations<CR>" },
+			-- { "<F5>", ":lua require'dap'.continue()<CR>" },
-	},
+			{ "<leader>dl", ":lua require'dap'.run_last()<CR>" },
-	config = function()
+			{ "<leader>db", ":lua require'dap'.toggle_breakpoint()<CR>" },
-		require("telescope").load_extension("dap")
+			{ "<leader>dB", ":lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>" },
-		local dap = require("dap")
+			{ "<leader>dlp", ":lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>" },
-		dap.adapters.java = function(callback)
+			{ "<leader>dr", ":lua require'dap'.repl.open()<CR>" },
-			-- FIXME:
+			{ "<leader>dt", ":Telescope dap configurations<CR>" },
-			-- Here a function needs to trigger the `vscode.java.startDebugSession` LSP command
+		},
-			-- The response to the command must be the `port` used below
+		config = function()
-			callback({
+			require("telescope").load_extension("dap")
+			local dap = require("dap")
+			dap.adapters.java = {}
+
+			dap.adapters.godot = {
 				type = "server",
 				host = "127.0.0.1",
-				port = port,
+				port = 6006,
+			}
+
+			dap.configurations.java = {
+				{
+					type = "java",
+					request = "attach",
+					mode = "remote",
+					name = "Java - Attach Remote",
+					cwd = "${workspaceFolder}",
+					hostName = "127.0.0.1",
+					port = 5005,
+				},
+			}
+			dap.configurations.gdscript = {
+				{
+					name = "Godot - Launch Project",
+					type = "godot",
+					request = "launch",
+					project = "${workspaceFolder}",
+					additional_options = "",
+				},
+				{
+					name = "Godot - Launch Current File",
+					type = "godot",
+					request = "launch",
+					scene = "current",
+					project = "${workspaceFolder}",
+					additional_options = "",
+				},
+				{
+					name = "Godot - Attach to Godot",
+					type = "godot",
+					request = "attach",
+					address = "127.0.0.1",
+					port = 6007,
+				},
+			}
+
+			dap.configurations.lua = {
+				{
+					type = "nlua",
+					request = "attach",
+					name = "Attach to running Neovim instance",
+					host = function()
+						local value = vim.fn.input("Host [127.0.0.1]: ")
+						if value ~= "" then
+							return value
+						end
+						return "127.0.0.1"
+					end,
+					port = function()
+						local val = tonumber(vim.fn.input("Port: "))
+						assert(val, "Please provide a port number")
+						return val
+					end,
+				},
+			}
+
+			-- vim.fn.sign_define('DapBreakpoint', { text = ' ', texthl = 'DapBreakpoint' })
+			-- 	vim.fn.sign_define('DapBreakpointCondition', { text = ' ', texthl = 'DapBreakpointCondition' })
+			-- 	vim.fn.sign_define('DapBreakpointRejected', { text = ' ', texthl = 'DapBreakpointRejected' })
+			vim.fn.sign_define("DapLogPoint", { text = " ", texthl = "DapLogPoint" })
+			vim.fn.sign_define("DapStopped", {
+				text = " ",
+				texthl = "DapStopped",
+				linehl = "DapStoppedLine",
 			})
-		end
 
-		dap.adapters.godot = {
+			local dapui = require("dapui")
-			type = "server",
+			vim.cmd("set mouse=n")
-			host = "127.0.0.1",
+			dapui.setup()
-			port = 6006,
+			dap.listeners.after.event_initialized["dapui_config"] = function()
-		}
+				dapui.open()
-
+			end
-		dap.configurations.java = {
+			dap.listeners.before.event_terminated["dapui_config"] = function()
-			{
+				dapui.close()
-				type = "java",
+			end
-				request = "attach",
+			dap.listeners.before.event_exited["dapui_config"] = function()
-				name = "Java - Attach Remote",
+				dapui.close()
-				hostName = "127.0.0.1",
+			end
-				port = 5005,
+		end,
-			},
+	},
-		}
-		dap.configurations.gdscript = {
-			{
-				name = "Godot - Launch Project",
-				type = "godot",
-				request = "launch",
-				project = "${workspaceFolder}",
-				additional_options = "",
-			},
-			{
-				name = "Godot - Launch Current File",
-				type = "godot",
-				request = "launch",
-				scene = "current",
-				project = "${workspaceFolder}",
-				additional_options = "",
-			},
-			{
-				name = "Godot - Attach to Godot",
-				type = "godot",
-				request = "attach",
-				address = "127.0.0.1",
-				port = 6007,
-			},
-		}
-
-		local dapui = require("dapui")
-		vim.cmd("set mouse=n")
-		dapui.setup()
-		dap.listeners.after.event_initialized["dapui_config"] = function()
-			dapui.open()
-		end
-		dap.listeners.before.event_terminated["dapui_config"] = function()
-			dapui.close()
-		end
-		dap.listeners.before.event_exited["dapui_config"] = function()
-			dapui.close()
-		end
-	end,
 }

vim/.vim/lua/plugins/harpoon.lua

@@ -0,0 +1,30 @@
+return {
+	"ThePrimeagen/harpoon",
+	-- branch = "harpoon2"
+	dependencies = { "nvim-lua/plenary.nvim" },
+	config = function()
+		local harpoon = require("harpoon")
+
+		-- REQUIRED
+		harpoon:setup()
+		vim.keymap.set("n", "<leader>h", function()
+			harpoon:list():append()
+		end)
+		vim.keymap.set("n", "<C-e>", function()
+			harpoon.ui:toggle_quick_menu(harpoon:list())
+		end)
+
+		-- vim.keymap.set("n", "<C-h>", function()
+		-- 	harpoon:list():select(1)
+		-- end)
+		-- vim.keymap.set("n", "<C-t>", function()
+		-- 	harpoon:list():select(2)
+		-- end)
+		-- vim.keymap.set("n", "<C-n>", function()
+		-- 	harpoon:list():select(3)
+		-- end)
+		-- vim.keymap.set("n", "<C-s>", function()
+		-- 	harpoon:list():select(4)
+		-- end)
+	end,
+}

vim/.vim/lua/plugins/mason.lua

@@ -25,6 +25,7 @@ return {
 				"omnisharp_mono",
 				"tsserver",
 				"gopls",
+				"markdown_lint",
 				"docker_compose_language_service",
 				"dockerls",
 				"graphql",

vim/.vim/lua/plugins/nvim-treesitter.lua

@@ -5,10 +5,10 @@ return {
 		config = function()
 			require("treesitter-context").setup({
 				enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
-				max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
+				max_lines = 7, -- How many lines the window should span. Values <= 0 mean no limit.
 				min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
 				line_numbers = true,
-				multiline_threshold = 20, -- Maximum number of lines to show for a single context
+				multiline_threshold = 7, -- Maximum number of lines to show for a single context
 				trim_scope = "outer", -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
 				mode = "cursor", -- Line used to calculate context. Choices: 'cursor', 'topline'
 				-- Separator between context and content. Should be a single character string, like '-'.

vim/.vim/lua/plugins/telescope.lua

@@ -32,6 +32,7 @@ end
 
 local keys = {
 	{ "<leader>ts", "<cmd>lua live_grep()<CR>", desc = "Search in CWD" },
+	{ "<leader>tk", "<cmd>Telescope Keymaps<CR>", desc = "Search Keymaps" },
 	{ "<C-P>", "<cmd>lua find_files()<CR>", desc = "Find Files in CWD" },
 	{ "<leader>tf", "<cmd>lua find_files()<CR>", desc = "Find Files in CWD" },
 	{ "<leader>tf.", "<cmd>lua vim.error('use <leader>e')<CR>", desc = "Find Files in Buffer Directory" },