From 600f931ec6046fa0d8dc10bd32bb60f0b9ce5eaa Mon Sep 17 00:00:00 2001
From: John Grant <john.grant9497@gmail.com>
Date: Thu, 4 Jun 2026 08:52:06 -0400
Subject: [PATCH] latest + fix bug in harpoon

---
 lazy-lock.json          | 6 +++---
 lua/plugins/folke.lua   | 8 ++++++++
 lua/plugins/harpoon.lua | 8 ++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lazy-lock.json b/lazy-lock.json
index 85cb680..affb36f 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -1,7 +1,7 @@
 {
   "LazyVim": { "branch": "main", "commit": "c10948c50b18fae7f256433afdef09e432410480" },
   "Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "19936230448bfb3dfd4314070e8bc499ceb55928" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "fce1d90e76c59337b6d3778c272c1b972a658269" },
   "auto-session": { "branch": "main", "commit": "3e145ee9af42eb6764908a1a481f53fe7f0bdbe5" },
   "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
   "catppuccin": { "branch": "main", "commit": "0303a7208dba448c459767486a38a6ec05c4216b" },
@@ -11,7 +11,7 @@
   "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
   "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
   "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "dd3f588bacbeb041be6facf1742e42097f62165d" },
+  "gitsigns.nvim": { "branch": "main", "commit": "25050e4ed39e628282831d4cbecb1850454ce915" },
   "grug-far.nvim": { "branch": "main", "commit": "5506c2f59dc9ab2ed6c233585412b24d31d51521" },
   "harpoon": { "branch": "harpoon2", "commit": "87b1a3506211538f460786c23f98ec63ad9af4e5" },
   "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
@@ -29,7 +29,7 @@
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
   "nvim-lint": { "branch": "master", "commit": "d48f3a76189d03b2239f6df1b2f7e3fa8353743b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "07dff35e7c95288861200b788ef32d6103f107f0" },
+  "nvim-lspconfig": { "branch": "master", "commit": "229b79051b380377664edc4cbd534930154921a1" },
   "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" },
   "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
   "nvim-treesitter-context": { "branch": "master", "commit": "b311b30818951d01f7b4bf650521b868b3fece16" },
diff --git a/lua/plugins/folke.lua b/lua/plugins/folke.lua
index df3eb69..a8dbf8e 100644
--- a/lua/plugins/folke.lua
+++ b/lua/plugins/folke.lua
@@ -49,6 +49,14 @@ return {
       },
     },
     keys = {
+      {
+        "<leader>ba",
+        function()
+          vim.cmd("%bdelete")
+          Snacks.dashboard({ win = 0, buf = 0 })
+        end,
+        desc = "Delete All Buffers",
+      },
       {
         "<leader>fF",
         function()
diff --git a/lua/plugins/harpoon.lua b/lua/plugins/harpoon.lua
index 4aacfe5..a9ffad2 100644
--- a/lua/plugins/harpoon.lua
+++ b/lua/plugins/harpoon.lua
@@ -28,8 +28,12 @@ return {
           select = function(list_item)
             vim.cmd("edit " .. list_item.context.file_path)
 
-            -- Jump to the line
-            vim.api.nvim_win_set_cursor(0, { list_item.context.line_number, 0 })
+            -- Jump to the line, clamped to the buffer's current size.
+            local line = list_item.context.line_number or 1
+            local last = vim.api.nvim_buf_line_count(0)
+            if line < 1 then line = 1 end
+            if line > last then line = last end
+            vim.api.nvim_win_set_cursor(0, { line, 0 })
           end,
         },
       })