diff --git a/plugins/navigation.nix b/plugins/navigation.nix
index b4cf18b..0b36be1 100644
--- a/plugins/navigation.nix
+++ b/plugins/navigation.nix
@@ -1,11 +1,27 @@
-{...}: {
+{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)";}
diff --git a/plugins/snacks.nix b/plugins/snacks.nix
index 0c5a535..0481258 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 = "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";}
+          {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";}
         ];
       };
     };