From 23126290f38f8efb276d1d4c81d25b32155f1a20 Mon Sep 17 00:00:00 2001
From: Seth Etter <mail@sethetter.com>
Date: Sun, 28 Dec 2025 21:29:47 -0600
Subject: [PATCH] nvim: drop whichkey, add trouble

---
 nvim/lazy-lock.json         |   2 +
 nvim/lua/config/keys.lua    | 274 ++++++++++++++++--------------------
 nvim/lua/plugins/config.lua |  13 +-
 nvim/lua/plugins/lsp.lua    |  12 ++
 nvim/lua/plugins/ui.lua     |  12 --
 5 files changed, 146 insertions(+), 167 deletions(-)

diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index d5f9055..107eff2 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -7,6 +7,7 @@
   "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
   "gitsigns.nvim": { "branch": "main", "commit": "130beacf8a51f00aede9c31064c749136679a321" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" },
   "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
   "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
@@ -23,6 +24,7 @@
   "schemastore.nvim": { "branch": "main", "commit": "60f1b3d1bde39396cdfb1362dd207970ec57e731" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
   "toggleterm.nvim": { "branch": "main", "commit": "9a88eae817ef395952e08650b3283726786fb5fb" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" },
   "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }
 }
diff --git a/nvim/lua/config/keys.lua b/nvim/lua/config/keys.lua
index ed8363b..46cf45e 100644
--- a/nvim/lua/config/keys.lua
+++ b/nvim/lua/config/keys.lua
@@ -1,5 +1,3 @@
-local wk = require("which-key")
-
 local function qflist_is_open()
   local is_open = false
   for _, win in ipairs(vim.fn.getwininfo()) do
@@ -10,6 +8,7 @@ local function qflist_is_open()
   end
   return is_open
 end
+
 local function toggle_qf_list()
   if qflist_is_open() then
     vim.cmd("cclose")
@@ -18,153 +17,124 @@ local function toggle_qf_list()
   end
 end
 
-wk.add({
-  { "<C-h>",      "<C-w>h",                            desc = "Move focus to left pane" },
-  { "<C-j>",      "<C-w>j",                            desc = "Move focus to below pane" },
-  { "<C-k>",      "<C-w>k",                            desc = "Move focus to above pane" },
-  { "<C-l>",      "<C-w>l",                            desc = "Move focus to right pane" },
-
-  { "<M-h>",      "5zh",                               desc = "Scroll left" },
-  { "<M-l>",      "5zl",                               desc = "Scroll right" },
-
-  { "H",          ":bp<cr>",                           desc = "Switch to previous buffer" },
-  { "L",          ":bn<cr>",                           desc = "Switch to next buffer" },
-
-  -- Prevents the pane from being removed when closing a buffer
-  { "<leader>d",  "<cmd>bp<bar>sp<bar>bn<bar>bd<cr>",  desc = "Close buffer" },
-  { "<leader>D",  "<cmd>bp<bar>sp<bar>bn<bar>bd!<cr>", desc = "Close buffer (force)" },
-  -- { "<leader>d", "<cmd>bd<cr>", desc = "Close buffer" },
-  -- { "<leader>D", "<cmd>bd!<cr>", desc = "Close buffer (force)" },
-  { "<leader>BD", "<cmd>bufdo bd<cr>",                 desc = "Close all buffers" },
-
-  { "<leader>n",  "<cmd>vnew<CR>",                     desc = "New buffer" },
-
-  { "<C-t>",      "<cmd>tabnext<cr>",                  desc = "Next tab",                 group = "tab" },
-  { "<leader>tn", "<cmd>tabnew<cr>",                   desc = "New Tab",                  group = "tab" },
-  { "<leader>td", "<cmd>tabclose<cr>",                 desc = "Close Tab",                group = "tab" },
-
-  { "<leader>LC", "<cmd>ConfigLocalEdit<cr>",          desc = "Edit local nvim config" },
-  -- { "<leader>N", "<cmd>vsp<cr><C-w>l<cmd>e NOTES.sethetter.md<cr>", desc = "Open personal notes" },
-  { "<leader>N",  "<cmd>e NOTES.sethetter.md<cr>",     desc = "Open personal notes" },
-
-  {
-    "<leader>/",
-    "<cmd>CommentToggle<cr>",
-    desc = "Toggle comment",
-    mode = { "n" },
-  },
-  {
-    "<leader>/",
-    ":'<,'>CommentToggle<cr>",
-    desc = "Toggle comment",
-    mode = { "v" },
-  },
-
-  -- { "E", "<cmd>Neotree position=current toggle reveal<cr>", desc = "Open file explorer" },
-  { "E",          "<cmd>Neotree toggle reveal position=current<cr>", desc = "Open file explorer" },
-  { "<leader>e",  "<cmd>Neotree toggle position=current<cr>",        desc = "Open file explorer" },
-  -- { "<leader>E", "<cmd>Neotree focus reveal position=current<cr>", desc = "Open file explorer" },
-
-  { "<leader>h",  "<cmd>noh<cr>",                                    desc = "Clear highlight" },
-  { "<leader>v/", "<cmd>vsp<cr>",                                    desc = "Split vertical",    group = "split" },
-  { "<leader>v?", "<cmd>sp<cr>",                                     desc = "Split horizontal",  group = "split" },
-
-  {
-    "<leader>f",
-    "<cmd>Telescope find_files find_command=rg,--ignore,--hidden,--files,--iglob=!.git sort_mru=true<cr>",
-    desc = "Find files",
-  },
-  { "<leader>b",  "<cmd>Telescope buffers<cr>",   desc = "Buffers" },
-  { "<leader>sp", "<cmd>Telescope live_grep<cr>", desc = "Live grep" },
-  { "<leader>sh", "<cmd>Telescope help_tags<cr>", desc = "Help tags" },
-  { "<leader>sc", "<cmd>Telescope commands<cr>",  desc = "Commands" },
-
-  {
-    "<leader>cl",
-    toggle_qf_list,
-    desc = "Toggle quickfix list",
-    group = "quickfix",
-  },
-  { "<leader>cn", "<cmd>cnext<cr>", desc = "Next QF item", group = "quickfix" },
-  { "<leader>cp", "<cmd>cprev<cr>", desc = "Prev QF item", group = "quickfix" },
-
-  {
-    "<leader>m",
-    function()
-      vim.diagnostic.setqflist({ open = true, focus = true })
-    end,
-    desc = "Diagnostics in qf list",
-  },
-
-  { "<leader>M", "<cmd>messages<cr>",     desc = "Messages" },
-
-  { "<leader>T", ":term ",                desc = "Run a terminal command" },
-
-  { "<leader>o", "<cmd>AerialToggle<cr>", desc = "Symbols outline" },
-
-  { "<leader>Z", "<cmd>Goyo<cr>",         desc = "Goyo toggle" },
-
-  { "<leader>w", "<cmd>w<cr>",            desc = "Save" },
-  { "<leader>X", "<cmd>x<cr>",            desc = "Save and close" },
-  { "<leader>q", "<cmd>q<cr>",            desc = "Quit" },
-  { "<leader>Q", "<cmd>qa<cr>",           desc = "Quit all" },
-
-  {
-    "<leader>y",
-    function()
-      local filepath = vim.fn.expand('%:.')
-      local line = vim.fn.line('.')
-      local ref = filepath .. ':' .. line
-      vim.fn.system('pbcopy', ref)
-      vim.notify('Copied: ' .. ref, vim.log.levels.INFO)
-    end,
-    desc = "Copy filepath:line to clipboard"
-  },
-
-  { "[d",         "<cmd>lua vim.diagnostic.goto_prev()<cr>",          desc = "Previous diagnostic" },
-  { "]d",         "<cmd>lua vim.diagnostic.goto_next()<cr>",          desc = "Next diagnostic" },
-  { "[g",         "<cmd>Gitsigns prev_hunk<cr>",                      desc = "Previous change" },
-  { "]g",         "<cmd>Gitsigns next_hunk<cr>",                      desc = "Next change" },
-
-  { "K",          "<cmd>lua vim.lsp.buf.hover()<cr>",                 desc = "Hover" },
-
-  { "g",          group = "goto" },
-  { "gs",         "<cmd>Telescope lsp_document_symbols<cr>",          desc = "Document symbols" },
-  { "gS",         "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>", desc = "Workspace symbols" },
-  { "gD",         "<cmd>lua vim.lsp.buf.declaration()<cr>",           desc = "Declaration" },
-  { "gd",         "<cmd>lua vim.lsp.buf.definition()<cr>",            desc = "Definition" },
-  { "gi",         "<cmd>lua vim.lsp.buf.implementation()<cr>",        desc = "Implementation" },
-  { "gr",         "<cmd>lua vim.lsp.buf.references()<cr>",            desc = "References" },
-  { "g.",         "<cmd>lua vim.lsp.buf.code_action()<cr>",           desc = "Code action" },
-  { "<leader>R",  "<cmd>lua vim.lsp.buf.rename()<cr>",                desc = "Rename symbol" },
-  { "<leader>F",  "<cmd>Format<CR>",                                  desc = "Format buffer" },
-
-  { "<leader>gg", "<cmd>LazyGit<cr>",                                 desc = "Lazygit",                group = "git" },
-  { "<leader>gs", "<cmd>Telescope git_status<cr>",                    desc = "Git status",             group = "git" },
-  { "<leader>gd", "<cmd>Gitsigns diffthis vertical=true HEAD<cr>",    desc = "File diff",              group = "git" },
-  { "<leader>Gd", ":Gitsigns diffthis vertical=true ",                desc = "File diff provided ref", group = "git" },
-  { "<leader>GD", ":DiffviewOpen ",                                   desc = "Diff provided ref",      group = "git" },
-  { "<leader>gh", "<cmd>DiffviewFileHistory %<cr>",                   desc = "File history",           group = "git" },
-  { "<leader>gH", "<cmd>DiffviewFileHistory<cr>",                     desc = "Git history",            group = "git" },
-  { "<leader>gb", "<cmd>Gitsigns toggle_current_line_blame<cr>",      desc = "Git history",            group = "git" },
-  {
-    "<leader>gl",
-    '<cmd>lua require("gitlinker").get_buf_range_url("n", {action_callback = require("gitlinker.actions").copy_to_clipboard})<cr>',
-    desc = "Copy git url",
-    mode = "n",
-    silent = true,
-  },
-  {
-    "<leader>gl",
-    '<cmd>lua require("gitlinker").get_buf_range_url("v", {action_callback = require("gitlinker.actions").copy_to_clipboard})<cr>',
-    desc = "Copy git url",
-    mode = "v",
-    -- TODO: make this actually silent
-    silent = true,
-  },
-
-  { "<leader>PP", "<cmd>Lazy<cr>",          desc = "Manage plugins",        group = "plugin" },
-
-  { "<leader>CI", ":CodeCompanion<CR>",     desc = "Code Companion inline", mode = { "n", "v" }, group = "codecompanion" },
-  { "<leader>CC", ":CodeCompanionChat<CR>", desc = "Claude edit selection", mode = { "n", "v" }, group = "codecompanion" },
-})
+-- movement
+vim.keymap.set("n", "<C-h>", "<C-w>h")
+vim.keymap.set("n", "<C-j>", "<C-w>j")
+vim.keymap.set("n", "<C-k>", "<C-w>k")
+vim.keymap.set("n", "<C-l>", "<C-w>l")
+vim.keymap.set("n", "<M-l>", "5zl")
+vim.keymap.set("n", "<M-h>", "5zh")
+vim.keymap.set("n", "H", ":bp<cr>")
+vim.keymap.set("n", "L", ":bn<cr>")
+
+vim.keymap.set("n", "E", "<cmd>Neotree toggle reveal position=current<cr>")
+
+-- buffers
+vim.keymap.set("n", "<leader>BD", "<cmd>bufdo bd<cr>")
+vim.keymap.set("n", "<leader>n", "<cmd>vnew<CR>")
+-- Prevents the pane from being removed when closing a buffer
+vim.keymap.set("n", "<leader>d", "<cmd>bp<bar>sp<bar>bn<bar>bd<cr>")
+vim.keymap.set("n", "<leader>D", "<cmd>bp<bar>sp<bar>bn<bar>bd!<cr>")
+vim.keymap.set("n", "<leader>v/", "<cmd>vsp<cr>")
+vim.keymap.set("n", "<leader>v?", "<cmd>sp<cr>")
+
+-- tabs
+vim.keymap.set("n", "<C-t>", "<cmd>tabnext<cr>")
+vim.keymap.set("n", "<leader>tn", "<cmd>tabnew<cr>")
+vim.keymap.set("n", "<leader>td", "<cmd>tabclose<cr>")
+
+-- comments
+vim.keymap.set("n", "<leader>/", "<cmd>CommentToggle<cr>")
+vim.keymap.set("v", "<leader>/", ":'<,'>CommentToggle<cr>")
+
+
+-- telescope
+vim.keymap.set("n",
+  "<leader>f",
+  "<cmd>Telescope find_files find_command=rg,--ignore,--hidden,--files,--iglob=!.git sort_mru=true<cr>"
+)
+vim.keymap.set("n", "<leader>b", "<cmd>Telescope buffers<cr>")
+vim.keymap.set("n", "<leader>sp", "<cmd>Telescope live_grep<cr>")
+vim.keymap.set("n", "<leader>sh", "<cmd>Telescope help_tags<cr>")
+vim.keymap.set("n", "<leader>sc", "<cmd>Telescope commands<cr>")
+
+vim.keymap.set("n", "<leader>h", "<cmd>noh<cr>")
+
+vim.keymap.set("n", "<leader>M", "<cmd>messages<cr>")
+
+vim.keymap.set("n", "<leader>T", ":term ")
+
+vim.keymap.set("n", "<leader>m", function()
+  vim.diagnostic.setqflist({ open = true, focus = true })
+end)
+vim.keymap.set("n", "<leader>cc", toggle_qf_list)
+vim.keymap.set("n", "<leader>cn", "<cmd>cnext<cr>")
+vim.keymap.set("n", "<leader>cp", "<cmd>cprev<cr>")
+
+-- write/quit
+vim.keymap.set("n", "<leader>w", "<cmd>w<cr>")
+vim.keymap.set("n", "<leader>X", "<cmd>x<cr>")
+vim.keymap.set("n", "<leader>q", "<cmd>q<cr>")
+vim.keymap.set("n", "<leader>Q", "<cmd>qa<cr>")
+
+-- lsp
+vim.keymap.set("n", "[d", "<cmd>lua vim.diagnostic.goto_prev()<cr>")
+vim.keymap.set("n", "]d", "<cmd>lua vim.diagnostic.goto_next()<cr>")
+vim.keymap.set("n", "K", "<cmd>lua vim.lsp.buf.hover()<cr>")
+vim.keymap.set("n", "gs", "<cmd>Telescope lsp_document_symbols<cr>")
+vim.keymap.set("n", "gS", "<cmd>Telescope lsp_dynamic_workspace_symbols<cr>")
+vim.keymap.set("n", "gD", "<cmd>lua vim.lsp.buf.declaration()<cr>")
+vim.keymap.set("n", "gd", "<cmd>lua vim.lsp.buf.definition()<cr>")
+vim.keymap.set("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<cr>")
+vim.keymap.set("n", "gr", "<cmd>lua vim.lsp.buf.references()<cr>")
+vim.keymap.set("n", "g.", "<cmd>lua vim.lsp.buf.code_action()<cr>")
+vim.keymap.set("n", "<leader>R", "<cmd>lua vim.lsp.buf.rename()<cr>")
+vim.keymap.set("n", "<leader>F", "<cmd>Format<CR>")
+
+-- trouble
+vim.keymap.set("n", "<leader>xx", "<cmd>Trouble diagnostics toggle<cr>", { desc = "Diagnostics (Trouble)" })
+vim.keymap.set("n", "<leader>xX", "<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
+  { desc = "Buffer Diagnostics (Trouble)" })
+vim.keymap.set("n", "<leader>cs", "<cmd>Trouble symbols toggle focus=false win.position=bottom<cr>",
+  { desc = "Symbols (Trouble)" })
+vim.keymap.set("n", "<leader>cl", "<cmd>Trouble lsp toggle focus=false<cr>",
+  { desc = "LSP Definitions / references / ... (Trouble)" })
+vim.keymap.set("n", "<leader>xL", "<cmd>Trouble loclist toggle<cr>", { desc = "Location List (Trouble)" })
+vim.keymap.set("n", "<leader>xQ", "<cmd>Trouble qflist toggle<cr>", { desc = "Quickfix List (Trouble)" })
+
+-- git
+vim.keymap.set("n", "[g", "<cmd>Gitsigns prev_hunk<cr>")
+vim.keymap.set("n", "]g", "<cmd>Gitsigns next_hunk<cr>")
+vim.keymap.set("n", "<leader>gg", "<cmd>LazyGit<cr>")
+vim.keymap.set("n", "<leader>gs", "<cmd>Telescope git_status<cr>")
+vim.keymap.set("n", "<leader>gd", "<cmd>Gitsigns diffthis vertical=true HEAD<cr>")
+vim.keymap.set("n", "<leader>Gd", ":Gitsigns diffthis vertical=true ")
+vim.keymap.set("n", "<leader>GD", ":DiffviewOpen ")
+vim.keymap.set("n", "<leader>gh", "<cmd>DiffviewFileHistory %<cr>")
+vim.keymap.set("n", "<leader>gH", "<cmd>DiffviewFileHistory<cr>")
+vim.keymap.set("n", "<leader>gb", "<cmd>Gitsigns toggle_current_line_blame<cr>")
+
+vim.keymap.set("v", "<leader>gl", function()
+  require("gitlinker").get_buf_range_url("n", {
+    action_callback = require("gitlinker.actions").copy_to_clipboard
+  })
+end, { silent = true })
+
+vim.keymap.set("v", "<leader>gl", function()
+  require("gitlinker").get_buf_range_url("v", {
+    action_callback = require("gitlinker.actions").copy_to_clipboard
+  })
+end, { silent = true })
+
+vim.keymap.set("n", "<leader>y", function()
+  local filepath = vim.fn.expand('%:.')
+  local line = vim.fn.line('.')
+  local ref = filepath .. ':' .. line
+  vim.fn.system('pbcopy', ref)
+  vim.notify('Copied: ' .. ref, vim.log.levels.INFO)
+end, { desc = "Copy filepath:line to clipboard" })
+
+vim.keymap.set("n", "<leader>PP", "<cmd>Lazy<cr>")
+
+vim.keymap.set("n", "<leader>LC", "<cmd>ConfigLocalEdit<cr>")
+vim.keymap.set("n", "<leader>N", "<cmd>e NOTES.sethetter.md<cr>")
diff --git a/nvim/lua/plugins/config.lua b/nvim/lua/plugins/config.lua
index 7007baa..271236d 100644
--- a/nvim/lua/plugins/config.lua
+++ b/nvim/lua/plugins/config.lua
@@ -9,9 +9,16 @@ return {
       hashfile = vim.fn.stdpath("data") .. "/config-local",
 
       autocommands_create = true, -- Create autocommands (VimEnter, DirectoryChanged)
-      commands_create = true, -- Create commands (ConfigLocalSource, ConfigLocalEdit, ConfigLocalTrust, ConfigLocalIgnore)
-      silent = false, -- Disable plugin messages (Config loaded/ignored)
-      lookup_parents = false, -- Lookup config files in parent directories
+      commands_create = true,     -- Create commands (ConfigLocalSource, ConfigLocalEdit, ConfigLocalTrust, ConfigLocalIgnore)
+      silent = false,             -- Disable plugin messages (Config loaded/ignored)
+      lookup_parents = false,     -- Lookup config files in parent directories
     })
   end,
+  keys = {
+    {
+      "<leader>LC",
+      "<cmd>ConfigLocalEdit<cr>",
+      desc = "Edit local config",
+    },
+  },
 }
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index d85d4d9..8719408 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -158,6 +158,18 @@ return {
       })
     end,
   },
+  {
+    "folke/lazydev.nvim",
+    ft = "lua", -- only load on lua files
+    opts = {},
+  },
+  {
+    "folke/trouble.nvim",
+    opts = {
+      icons = {},
+    },
+    cmd = "Trouble",
+  },
   {
     "antosha417/nvim-lsp-file-operations",
     dependencies = {
diff --git a/nvim/lua/plugins/ui.lua b/nvim/lua/plugins/ui.lua
index e58ae1b..838bbf2 100644
--- a/nvim/lua/plugins/ui.lua
+++ b/nvim/lua/plugins/ui.lua
@@ -32,18 +32,6 @@ return {
       },
     },
   },
-  {
-    "stevearc/aerial.nvim",
-    opts = {
-      -- default starts with treesitter, but I like lsp
-      backends = { "lsp", "markdown", "asciidoc", "man" },
-      filter_kind = false,
-      layout = {
-        max_width = { 40, 0.2 },
-        min_width = 30,
-      },
-    },
-  },
   {
     "nvim-telescope/telescope.nvim",
     tag = "0.1.8",
-- 
2.51.2