From a38736ed22e4df187417c45f26dd5b22a75062e7 Mon Sep 17 00:00:00 2001
From: Ben Kreeger <ben@kree.gr>
Date: Mon, 18 Aug 2025 13:35:55 -0500
Subject: [PATCH] Reenable errors inline

---
 nvim/lazy-lock.json            |  1 +
 nvim/lua/config/keymaps.lua    |  2 +-
 nvim/lua/plugins/40-lsp.lua    | 60 +++++++++++++++-------------------
 nvim/lua/plugins/45-errors.lua | 37 +++++++++++++++++++++
 4 files changed, 65 insertions(+), 35 deletions(-)
 create mode 100644 nvim/lua/plugins/45-errors.lua

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 41744f9..5054744 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -29,6 +29,7 @@
   "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
   "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
   "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
+  "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
   "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
   "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
 }
diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua
index 96ee73a..58c7c59 100644
--- a/nvim/lua/config/keymaps.lua
+++ b/nvim/lua/config/keymaps.lua
@@ -2,7 +2,7 @@ local keymap = vim.keymap.set
 
 -- Normal mode
 keymap("n", "<Esc>", "<cmd>nohlsearch<CR>")
-keymap("n", "<leader>f", vim.diagnostic.setloclist, { desc = "Open diagnostic quick[f]ix list" })
+keymap("n", "<leader>fd", vim.diagnostic.setloclist, { desc = "Open quick[f]ix [d]iagnostics" })
 keymap("n", "<leader>w", "<cmd>w!<CR>", { desc = "[w]rite current file", silent = true })
 keymap("n", "<leader>q", "<cmd>q<CR>", { desc = "[q]uit current buffer", silent = true })
 keymap("n", "<leader>Q", "<cmd>qa<CR>", { desc = "[Q]uit completely", silent = true })
diff --git a/nvim/lua/plugins/40-lsp.lua b/nvim/lua/plugins/40-lsp.lua
index 8fa7c85..6eea129 100644
--- a/nvim/lua/plugins/40-lsp.lua
+++ b/nvim/lua/plugins/40-lsp.lua
@@ -108,40 +108,32 @@ return {
 					end
 				end,
 			})
+			vim.diagnostic.config({
+				severity_sort = true,
+				float = { border = "rounded", source = "if_many" },
+				underline = { severity = vim.diagnostic.severity.ERROR },
+				signs = vim.g.have_nerd_font and {
+					text = {
+						[vim.diagnostic.severity.ERROR] = "󰅚 ",
+						[vim.diagnostic.severity.WARN] = "󰀪 ",
+						[vim.diagnostic.severity.INFO] = "󰋽 ",
+						[vim.diagnostic.severity.HINT] = "󰌶 ",
+					},
+				} or {},
+				virtual_text = {
+					source = "if_many",
+					spacing = 2,
+					format = function(diagnostic)
+						local diagnostic_message = {
+							[vim.diagnostic.severity.ERROR] = diagnostic.message,
+							[vim.diagnostic.severity.WARN] = diagnostic.message,
+							[vim.diagnostic.severity.INFO] = diagnostic.message,
+							[vim.diagnostic.severity.HINT] = diagnostic.message,
+						}
+						return diagnostic_message[diagnostic.severity]
+					end,
+				},
+			})
 		end,
 	},
 }
--- {
-
--- 	config = function()
-
--- 		-- Diagnostic Config
--- 		-- See :help vim.diagnostic.Opts
--- 		vim.diagnostic.config({
--- 			severity_sort = true,
--- 			float = { border = "rounded", source = "if_many" },
--- 			underline = { severity = vim.diagnostic.severity.ERROR },
--- 			signs = vim.g.have_nerd_font and {
--- 				text = {
--- 					[vim.diagnostic.severity.ERROR] = "󰅚 ",
--- 					[vim.diagnostic.severity.WARN] = "󰀪 ",
--- 					[vim.diagnostic.severity.INFO] = "󰋽 ",
--- 					[vim.diagnostic.severity.HINT] = "󰌶 ",
--- 				},
--- 			} or {},
--- 			virtual_text = {
--- 				source = "if_many",
--- 				spacing = 2,
--- 				format = function(diagnostic)
--- 					local diagnostic_message = {
--- 						[vim.diagnostic.severity.ERROR] = diagnostic.message,
--- 						[vim.diagnostic.severity.WARN] = diagnostic.message,
--- 						[vim.diagnostic.severity.INFO] = diagnostic.message,
--- 						[vim.diagnostic.severity.HINT] = diagnostic.message,
--- 					}
--- 					return diagnostic_message[diagnostic.severity]
--- 				end,
--- 			},
--- 		})
--- 	end,
--- },
diff --git a/nvim/lua/plugins/45-errors.lua b/nvim/lua/plugins/45-errors.lua
new file mode 100644
index 0000000..fc29597
--- /dev/null
+++ b/nvim/lua/plugins/45-errors.lua
@@ -0,0 +1,37 @@
+return {
+	"folke/trouble.nvim",
+	opts = {}, -- for default options, refer to the configuration section for custom setup.
+	cmd = "Trouble",
+	keys = {
+		{
+			"<leader>xx",
+			"<cmd>Trouble diagnostics toggle<cr>",
+			desc = "Diagnostics (Trouble)",
+		},
+		{
+			"<leader>xX",
+			"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+			desc = "Buffer Diagnostics (Trouble)",
+		},
+		{
+			"<leader>cs",
+			"<cmd>Trouble symbols toggle focus=false<cr>",
+			desc = "Symbols (Trouble)",
+		},
+		{
+			"<leader>cl",
+			"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
+			desc = "LSP Definitions / references / ... (Trouble)",
+		},
+		{
+			"<leader>xL",
+			"<cmd>Trouble loclist toggle<cr>",
+			desc = "Location List (Trouble)",
+		},
+		{
+			"<leader>xQ",
+			"<cmd>Trouble qflist toggle<cr>",
+			desc = "Quickfix List (Trouble)",
+		},
+	},
+}