diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index 0ee1769..399733a 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -44,6 +44,7 @@
   "mason-lspconfig.nvim": { "branch": "main", "commit": "828a538ac8419f586c010996aefa5df6eb7c250b" },
   "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" },
   "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" },
+  "neo-tree-diagnostics.nvim": { "branch": "main", "commit": "483019d251c31acd14102bc279f938f98d9a3de6" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" },
   "neoscopes": { "branch": "main", "commit": "88ca15efcc20b267789d74ca483cc8bac85b3083" },
   "nerdcommenter": { "branch": "master", "commit": "ab2ae4d502a26bc591db78a8548823ddd04bbc9c" },
diff --git a/vim/.vim/lua/plugins/neotree.lua b/vim/.vim/lua/plugins/neotree.lua
index fc3bbaf..1ec81e7 100644
--- a/vim/.vim/lua/plugins/neotree.lua
+++ b/vim/.vim/lua/plugins/neotree.lua
@@ -1,22 +1,31 @@
 return {
-	"nvim-neo-tree/neo-tree.nvim",
-	branch = "v2.x",
-	config = function()
-		require("neo-tree").setup({
-			hijack_netrw_behavior = "open_current",
-			window = {
-				mappings = {
-					["O"] = "expand_all_nodes",
+	{
+		"nvim-neo-tree/neo-tree.nvim",
+		branch = "v2.x",
+		config = function()
+			require("neo-tree").setup({
+				hijack_netrw_behavior = "open_current",
+				window = {
+					mappings = {
+						["O"] = "expand_all_nodes",
+					},
 				},
-			},
-		})
-	end,
-	dependencies = {
-		"nvim-lua/plenary.nvim",
-		"MunifTanjim/nui.nvim",
+			})
+		end,
+		dependencies = {
+			"nvim-lua/plenary.nvim",
+			"MunifTanjim/nui.nvim",
+		},
+		lazy = false,
+		keys = {
+			{ "<C-n>", ":Neotree filesystem reveal toggle reveal_force_cwd<cr>", desc = "Open NeoTree" },
+		},
 	},
-	lazy = false,
-	keys = {
-		{ "<C-n>", ":Neotree filesystem reveal toggle reveal_force_cwd<cr>", desc = "Open NeoTree" },
+	{
+		"mrbjarksen/neo-tree-diagnostics.nvim",
+		dependencies = { "nvim-neo-tree/neo-tree.nvim" },
+		keys = {
+			{ "<Leader>xd", "<Cmd>Neotree diagnostics reveal bottom<CR>" },
+		},
 	},
 }
diff --git a/vim/.vim/lua/plugins/trouble.lua b/vim/.vim/lua/plugins/trouble.lua
index c7f9110..ebcecf5 100644
--- a/vim/.vim/lua/plugins/trouble.lua
+++ b/vim/.vim/lua/plugins/trouble.lua
@@ -16,11 +16,6 @@ return {
 		})
 	end,
 	keys = {
-		{ "<Leader>xx", "<Cmd>Trouble<CR>" },
-		{ "<Leader>xw", "<Cmd>Trouble workspace_diagnostics<CR>" },
-		{ "<Leader>xd", "<Cmd>Trouble document_diagnostics<CR>" },
-		{ "<Leader>xl", "<Cmd>Trouble loclist<CR>" },
-		{ "<Leader>xq", "<Cmd>Trouble quickfix<CR>" },
 		{ "[g", "<cmd>lua vim.diagnostic.goto_prev()<CR>" },
 		{ "]g", "<cmd>lua vim.diagnostic.goto_next()<CR>" },
 	},