From 8a5540a26c5f59bd23af942f29d3330b2f21bd33 Mon Sep 17 00:00:00 2001
From: antoine <antoine.moran@protonmail.com>
Date: Sun, 19 Apr 2026 12:09:02 +0200
Subject: [PATCH 1/2] feat: remove harpoon2

---
 plugins/navigation.nix | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/plugins/navigation.nix b/plugins/navigation.nix
index 0b36be1..b4cf18b 100644
--- a/plugins/navigation.nix
+++ b/plugins/navigation.nix
@@ -1,27 +1,11 @@
-{pkgs, ...}: {
+{...}: {
   vim = {
-    extraPlugins = with pkgs.vimPlugins; {
-      harpoon2 = {
-        package = harpoon2;
-        setup = ''require("harpoon"):setup()'';
-      };
-    };
-
-
     session.nvim-session-manager = {
       enable = true;
       setupOpts.autoload_mode = "Disabled";
     };
 
     keymaps = [
-      # Harpoon
-      {key = "<leader>ha"; mode = ["n"]; lua = true; action = ''function() require("harpoon"):list():add() end''; desc = "Harpoon add";}
-      {key = "<leader>hh"; mode = ["n"]; lua = true; action = ''function() local h = require("harpoon") h.ui:toggle_quick_menu(h:list()) end''; desc = "Harpoon menu";}
-      {key = "<leader>1"; mode = ["n"]; lua = true; action = ''function() require("harpoon"):list():select(1) end''; desc = "Harpoon file 1";}
-      {key = "<leader>2"; mode = ["n"]; lua = true; action = ''function() require("harpoon"):list():select(2) end''; desc = "Harpoon file 2";}
-      {key = "<leader>3"; mode = ["n"]; lua = true; action = ''function() require("harpoon"):list():select(3) end''; desc = "Harpoon file 3";}
-      {key = "<leader>4"; mode = ["n"]; lua = true; action = ''function() require("harpoon"):list():select(4) end''; desc = "Harpoon file 4";}
-
       # Mini.files
       {key = "-"; mode = ["n"]; lua = true; action = ''function() MiniFiles.open() end''; desc = "Open file explorer";}
       {key = "<leader>-"; mode = ["n"]; lua = true; action = ''function() MiniFiles.open(vim.api.nvim_buf_get_name(0)) end''; desc = "Open file explorer (current file)";}

From 43c6a1a908b61ba7e201aacb55fa0defcbec81a4 Mon Sep 17 00:00:00 2001
From: antoine <antoine.moran@protonmail.com>
Date: Sun, 19 Apr 2026 12:09:46 +0200
Subject: [PATCH 2/2] fix: use single-key dashboard shortcuts to avoid
 which-key conflicts

---
 plugins/snacks.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/snacks.nix b/plugins/snacks.nix
index 0481258..0c5a535 100644
--- a/plugins/snacks.nix
+++ b/plugins/snacks.nix
@@ -15,12 +15,12 @@
           {section = "keys"; gap = 1; padding = 1;}
         ];
         preset.keys = [
-          {icon = " "; key = "e";   action = ":ene | startinsert";            desc = "New file";}
-          {icon = " "; key = ",ff"; action = ":lua Snacks.picker.files()";   desc = "Find file";}
-          {icon = " "; key = ",fo"; action = ":lua Snacks.picker.recent()";  desc = "Recently opened";}
-          {icon = " "; key = ",fg"; action = ":lua Snacks.picker.grep()";    desc = "Find word";}
-          {icon = " "; key = ",fp"; action = ":SessionManager load_session";  desc = "Open session";}
-          {icon = " "; key = "q";   action = ":qa";                           desc = "Quit";}
+          {icon = " "; key = "e"; action = ":ene | startinsert";           desc = "New file";}
+          {icon = " "; key = "f"; action = ":lua Snacks.picker.files()";   desc = "Find file";}
+          {icon = " "; key = "o"; action = ":lua Snacks.picker.recent()";  desc = "Recently opened";}
+          {icon = " "; key = "g"; action = ":lua Snacks.picker.grep()";    desc = "Find word";}
+          {icon = " "; key = "p"; action = ":SessionManager load_session"; desc = "Open session";}
+          {icon = " "; key = "q"; action = ":qa";                          desc = "Quit";}
         ];
       };
     };