feat: enable dap

fix: git push

lua/plugins/dap.lua

@@ -1,6 +1,5 @@
 return {
 	"jayp0521/mason-nvim-dap.nvim",
-	enabled = false,
 	opts = {
 		ensure_installed = {
 			"python",

lua/plugins/fugitive.lua

@@ -4,5 +4,33 @@ return {
 	keys = {
 		{ "<leader>gg", vim.cmd.G, desc = "[G]it" },
 		{ "<leader>gd", vim.cmd.Gdiffsplit, desc = "[G]it [D]iff" },
+		{
+			"<leader>gh",
+			function()
+				vim.cmd.diffget("//2")
+			end,
+			desc = "[G]it Select Left",
+		},
+		{
+			"<leader>gl",
+			function()
+				vim.cmd.diffget("//3")
+			end,
+			desc = "[G]it Select Right",
+		},
+		{
+			"<leader>gp",
+			function()
+				vim.cmd.Git("pull --rebase")
+			end,
+			desc = "[G]it [P]ull",
+		},
+		{
+			"<leader>gP",
+			function()
+				vim.cmd.Git("push -u origin")
+			end,
+			desc = "[G]it [P]ush",
+		},
 	},
 }

lua/plugins/harpoon.lua

@@ -11,7 +11,7 @@ return {
 			desc = "Harpoon [A]dd File",
 		},
 		{
-			"<C-i>",
+			"<C-e>",
 			function()
 				local harpoon = require("harpoon")
 				harpoon.ui:toggle_quick_menu(harpoon:list())

lua/plugins/lspconfig.lua

@@ -6,6 +6,7 @@ return {
 		"hrsh7th/cmp-nvim-lsp",
 		"folke/neodev.nvim",
 		"nvim-telescope/telescope.nvim",
+		"folke/trouble.nvim",
 	},
 
 	config = function()
@@ -44,11 +45,25 @@ return {
 				)
 				nmap("<leader>wa", vim.lsp.buf.add_workspace_folder, "[W]orkspace [A]dd Folder")
 				nmap("<leader>wr", vim.lsp.buf.remove_workspace_folder, "[W]orkspace [R]emove Folder")
+				nmap("<leader>ws", vim.lsp.buf.workspace_symbol, "[W]orkspace [S]ymbol")
+				nmap("<leader>wd", vim.diagnostic.open_float, "[W]orkspace [D]iagnostic")
 				nmap("<leader>wl", function()
 					print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
 				end, "[W]orkspace [L]ist Folders")
 				nmap("<leader>lD", vim.lsp.buf.type_definition, "Type [D]efinition")
 				nmap("<leader>lr", vim.lsp.buf.rename, "[R]ename")
+				nmap("<leader>lj", vim.diagnostic.goto_next, "Diagnostic Next")
+				nmap("<leader>lk", vim.diagnostic.goto_prev, "Diagnostic Prev")
+				nmap("]d", function()
+					local trouble = require("trouble")
+					trouble.open("workspace_diagnostics")
+					trouble.next({ skip_groups = true, jump = true })
+				end, "Trouble Next")
+				nmap("[d", function()
+					local trouble = require("trouble")
+					trouble.open("workspace_diagnostics")
+					trouble.previous({ skip_groups = true, jump = true })
+				end, "Trouble Prev")
 				vim.keymap.set(
 					{ "n", "v" },
 					"<leader>la",
@@ -76,7 +91,7 @@ return {
 			vim.fn.sign_define(sign.name, { texthl = sign.name, text = sign.text, numhl = "" })
 		end
 
-		local config = {
+		vim.diagnostic.config({
 			virtual_text = true, -- virtual text
 			signs = {
 				active = signs, -- show signs
@@ -92,9 +107,7 @@ return {
 				header = "",
 				prefix = "",
 			},
-		}
-
-		vim.diagnostic.config(config)
+		})
 
 		vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {
 			border = "rounded",

lua/plugins/rust_tools.lua

@@ -18,13 +18,16 @@ return {
 		tools = {
 			-- on_initialized = nil,
 			on_initialized = function()
-				vim.api.nvim_create_autocmd({ "BufEnter", "CursorHold", "InsertLeave", "BufWritePost" }, {
-					group = vim.api.nvim_create_augroup("InitializeRustAnalyzer", { clear = true }),
-					pattern = { "*.rs" },
-					callback = function()
-						vim.lsp.codelens.refresh()
-					end,
-				})
+				vim.api.nvim_create_autocmd(
+					{ "BufEnter", "CursorHold", "InsertLeave", "BufWritePost", "InsertEnter" },
+					{
+						group = vim.api.nvim_create_augroup("InitializeRustAnalyzer", { clear = true }),
+						pattern = { "*.rs" },
+						callback = function()
+							vim.lsp.codelens.refresh()
+						end,
+					}
+				)
 			end,
 			reload_workspace_from_cargo_toml = true,
 			inlay_hints = {

lua/plugins/tmux_navigator.lua

@@ -1 +1,17 @@
-return { "christoomey/vim-tmux-navigator" }
+return {
+	"christoomey/vim-tmux-navigator",
+	cmds = {
+		"TmuxNavigateLeft",
+		"TmuxNavigateDown",
+		"TmuxNavigateUp",
+		"TmuxNavigateRight",
+		"TmuxNavigatePrevious",
+	},
+	keys = {
+		{ "<C-h>", vim.cmd.TmuxNavigateLeft, desc = "Focus window left", mode = { "n", "t" } },
+		{ "<C-j>", vim.cmd.TmuxNavigateDown, desc = "Focus window down", mode = { "n", "t" } },
+		{ "<C-k>", vim.cmd.TmuxNavigateUp, desc = "Focus window up", mode = { "n", "t" } },
+		{ "<C-l>", vim.cmd.TmuxNavigateRight, desc = "Focus window right", mode = { "n", "t" } },
+		{ "<C-\\>", vim.cmd.TmuxNavigatePrevious, desc = "Focus window previous", mode = { "n", "t" } },
+	},
+}

lua/plugins/treesitter.lua

@@ -3,9 +3,11 @@ return {
 	build = ":TSUpdate",
 	dependencies = {
 		"p00f/nvim-ts-rainbow",
+		"nvim-treesitter/nvim-treesitter-context",
 		"mechatroner/rainbow_csv",
 		"JoosepAlviste/nvim-ts-context-commentstring",
 		"nvim-treesitter/nvim-treesitter-textobjects",
+		"luckasRanarison/tree-sitter-hyprlang",
 	},
 	config = function()
 		local ts_repeat_move = require("nvim-treesitter.textobjects.repeatable_move")
@@ -42,7 +44,7 @@ return {
 				-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
 				-- Using this option may slow down your editor, and you may see some duplicate highlights.
 				-- Instead of true it can also be a list of languages
-				additional_vim_regex_highlighting = { "markdown" },
+				additional_vim_regex_highlighting = true,
 
 				disable = function(lang, buf)
 					local max_filesize = 100 * 1024 -- 100 KB
@@ -177,5 +179,7 @@ return {
 				},
 			},
 		})
+		vim.cmd.highlight("TreesitterContext guibg=None")
+		vim.cmd.highlight("TreesitterContextLineNumberBottom gui=underline guisp=Grey")
 	end,
 }

lua/plugins/trouble.lua

@@ -23,20 +23,6 @@ return {
 			end,
 			desc = "[D]ocument Diagnostics",
 		},
-		{
-			"[d",
-			function()
-				require("trouble").next({ skip_groups = true, jump = true })
-			end,
-			desc = "Trouble Next",
-		},
-		{
-			"]d",
-			function()
-				require("trouble").previous({ skip_groups = true, jump = true })
-			end,
-			desc = "Trouble Prev",
-		},
 	},
 	opts = {
 		position = "bottom", -- position of the list can be: bottom, top, left, right

lua/solo/keymaps.lua

@@ -29,11 +29,6 @@ nmap("g#", "g#zz")
 vim.keymap.set({ "n" }, "j", "gj", { desc = "Allows to navigate though wrapped lines", noremap = true })
 vim.keymap.set({ "n" }, "k", "gk", { desc = "Allows to navigate though wrapped lines", noremap = true })
 
-vim.keymap.set({ "n", "t" }, "<C-h>", vim.cmd.TmuxNavigateLeft, { desc = "Focus window left", noremap = true })
-vim.keymap.set({ "n", "t" }, "<C-j>", vim.cmd.TmuxNavigateDown, { desc = "Focus window down", noremap = true })
-vim.keymap.set({ "n", "t" }, "<C-k>", vim.cmd.TmuxNavigateUp, { desc = "Focus window up", noremap = true })
-vim.keymap.set({ "n", "t" }, "<C-l>", vim.cmd.TmuxNavigateRight, { desc = "Focus window right", noremap = true })
-
 nmap("<C-Up>", "<cmd>resize -2<cr>", "Resize window up")
 nmap("<C-Down>", "<cmd>resize +2<cr>", "Resize window down")
 nmap("<C-Left>", "<cmd>vertical resize -2<cr>", "Resize window left")
@@ -71,7 +66,7 @@ vmap("<", "<gv", "Left Indent")
 vmap("<A-k>", ":m '<-2<cr>gv=gv", "Move lines up")
 vmap("<A-j>", ":m '>+1<cr>gv=gv", "Move lines down")
 
-tmap("t", "<C-h>", "<C-\\><C-N><C-w>h")
-tmap("t", "<C-j>", "<C-\\><C-N><C-w>j")
-tmap("t", "<C-k>", "<C-\\><C-N><C-w>k")
-tmap("t", "<C-l>", "<C-\\><C-N><C-w>l")
+-- tmap("t", "<C-h>", "<C-\\><C-N><C-w>h")
+-- tmap("t", "<C-j>", "<C-\\><C-N><C-w>j")
+-- tmap("t", "<C-k>", "<C-\\><C-N><C-w>k")
+-- tmap("t", "<C-l>", "<C-\\><C-N><C-w>l")