Update plugins

lazy-lock.json

@@ -4,22 +4,22 @@
   "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "crates.nvim": { "branch": "main", "commit": "5a24e3ba60e28e0cfde540696630b3c5a4db6dfd" },
+  "crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" },
   "dressing.nvim": { "branch": "master", "commit": "1b7921eecc65af1baf8ac1dc06f0794934cbcfb2" },
-  "formatter.nvim": { "branch": "master", "commit": "01d976117743876f1c102bda2a03d93c7a37d85f" },
-  "gitsigns.nvim": { "branch": "main", "commit": "1ef74b546732f185d0f806860fa5404df7614f28" },
+  "formatter.nvim": { "branch": "master", "commit": "73c1968c8da9fb635485cc6064b4ff2af9bc4452" },
+  "gitsigns.nvim": { "branch": "main", "commit": "863903631e676b33e8be2acb17512fdc1b80b4fb" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
   "lazy.nvim": { "branch": "main", "commit": "460e1cd8f24e364d54543a4b0e83f6f4ec1f65fb" },
-  "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" },
+  "lspkind.nvim": { "branch": "master", "commit": "59c3f419af48a2ffb2320cea85e44e5a95f71664" },
   "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "f0cd12f7a8a310c58cecebddb6b219ffad1cfd0f" },
   "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "mini.icons": { "branch": "main", "commit": "2d89252993fec829b24720097a687412d10f6c85" },
-  "neoconf.nvim": { "branch": "main", "commit": "4bba87a057867004e70596dafe7262bbaac38810" },
+  "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" },
+  "neoconf.nvim": { "branch": "main", "commit": "3b6db0a913258a91951f96b09c005522cca98f1f" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "neogit": { "branch": "master", "commit": "c4bf4a3d06c6001b10228bdbad325084fbd2d9f3" },
+  "neogit": { "branch": "master", "commit": "75ee709d18625a94aef90d94ccac4e562c9a0046" },
   "noice.nvim": { "branch": "main", "commit": "c1ba80ccf6b3bd8c7fc88fe2e61085131d44ad65" },
   "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
   "nvim-autopairs": { "branch": "master", "commit": "f158dcb865c36f72c92358f87787dab2c272eaf3" },
@@ -28,19 +28,19 @@
   "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
   "nvim-lspconfig": { "branch": "master", "commit": "a9bc587e9ae0cbcb3e90a2e9342f86b3b78c4408" },
   "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
-  "nvim-treesitter": { "branch": "master", "commit": "0c8a582e474e248f2a4406188e0c653f92a064cf" },
+  "nvim-treesitter": { "branch": "master", "commit": "36b78d112bddd69a05e24679241962e29e494d9e" },
   "nvim-treesitter-context": { "branch": "master", "commit": "3d5390c49e3f8fe457b376df2a49aa39d75b7911" },
   "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" },
   "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" },
-  "nvim-web-devicons": { "branch": "master", "commit": "26220156aafb198b2de6a4cf80c1b120a3768da0" },
+  "nvim-web-devicons": { "branch": "master", "commit": "1e5a2a796a88b5d696acb07dd5c285b13d13da21" },
   "oil.nvim": { "branch": "master", "commit": "1360be5fda9c67338331abfcd80de2afbb395bcd" },
   "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
   "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
   "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" },
-  "render-markdown.nvim": { "branch": "main", "commit": "37f52f02ab4ed98112477fe6a1c6320955ec40e6" },
+  "render-markdown.nvim": { "branch": "main", "commit": "d3a565eb4c46005a390d4b19f80f9ad719607df6" },
   "resession.nvim": { "branch": "master", "commit": "c4d92a57b3936a2d6e1c087dbd6b670da2b1b082" },
   "statuscol.nvim": { "branch": "main", "commit": "1022f922b77b44c36f8057ac29adbfd89ce86958" },
-  "telescope.nvim": { "branch": "master", "commit": "6b08cdcc22a630d19172b9db55f7b8db5f81d761" },
+  "telescope.nvim": { "branch": "master", "commit": "cb3f98d935842836cc115e8c9e4b38c1380fbb6b" },
   "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
   "vim-wakatime": { "branch": "master", "commit": "f699e30ca1ba0c7f316847316fd0ba19d3ee51c1" },
   "which-key.nvim": { "branch": "main", "commit": "fb070344402cfc662299d9914f5546d840a22126" },

lua/valeth/plugins/harpoon.lua

@@ -8,25 +8,55 @@ spec.dependencies = {
     "nvim-telescope/telescope.nvim",
 }
 
--- TODO: Add keybinds to remove mark from list and reorder them
-local function toggle_telescope(harpoon_files)
+--- @param harpoon Harpoon
+local function toggle_telescope(harpoon)
     local file_paths = {}
 
-    for _, item in ipairs(harpoon_files.items) do
-        table.insert(file_paths, item.value)
+    for idx, item in pairs(harpoon:list().items) do
+        table.insert(file_paths, { idx, item.value })
     end
 
     local config = require("telescope.config").values
     local pickers = require("telescope.pickers")
     local finders = require("telescope.finders")
+    local action_state = require("telescope.actions.state")
+
+    local function mappings(prompt_bufnr, map)
+        map("i", "<C-d>", function()
+            local cur_picker = action_state.get_current_picker(prompt_bufnr)
+            local sel_entry = action_state.get_selected_entry().value[2]
+            local sel_item = harpoon:list():get_by_value(sel_entry)
+
+            if sel_item == nil then
+                return
+            end
+
+            cur_picker:delete_selection(function(sel)
+                harpoon:list():remove(sel_item)
+            end)
+        end)
+
+        return true
+    end
+
+    local finder = finders.new_table({
+        results = file_paths,
+        entry_maker = function(entry)
+            return {
+                value = entry,
+                display = entry[1] .. ": " .. entry[2],
+                ordinal = entry[2],
+                path = entry[2],
+            }
+        end
+    })
 
     local picker = pickers.new({}, {
         prompt_title = "Harpoon",
-        finder = finders.new_table({
-            results = file_paths,
-        }),
+        finder = finder,
         previewer = config.file_previewer({}),
         sorter = config.generic_sorter({}),
+        attach_mappings = mappings,
     })
 
     picker:find()
@@ -38,9 +68,9 @@ spec.config = function()
 
     harpoon:setup()
 
-    keymap("n", "<Leader>hl", function()
-        toggle_telescope(harpoon:list())
-    end, { desc = "Show harpoon marks" })
+    keymap("n", "<Leader>fm", function()
+        toggle_telescope(harpoon)
+    end, { desc = "Show list of harpoon marks" })
 
     keymap("n", "<Leader>ha", function()
         harpoon:list():add()