diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index 3dbb37b..d33e637 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -11,6 +11,7 @@
     "10.0.0.183" = [ "headscale.nickiel.net" ];
     "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ];
   };
+  # tailscale set --exit-node <SEVERNAME> to route through an exit node
   services.tailscale.enable = true;
   networking.firewall = {
     checkReversePath = "loose";
diff --git a/modules/neovim.nix b/modules/neovim.nix
index 06f019f..6aa24ab 100644
--- a/modules/neovim.nix
+++ b/modules/neovim.nix
@@ -32,11 +32,16 @@ in
     maps.normal = {
       "<leader>ot" = "<cmd>vs | te<cr>";
       "<leader>o." = "<cmd>Telescope file_browser<cr>";
+      "<leader>."  = "<cmd>Telescope find_file<cr>"; # cwd full sub-dir fuzzy find
+      "<leader>of" = "<cmd>Telescope live_grep<cr>"; # cwd search file
       "<leader>op" = "<cmd>NvimTreeToggle<cr>";
+      "<leader>am" = "<cmd>lua require(\"harpoon.mark\").add_file()<cr>"; # leader + add + mark
+      "<leader>m"  = "<cmd>Telescope harpoon marks<cr>"; # open harpoon marks in telescope
     };
 
     plugins = {
-      telescope = {
+
+      harpoon = {
         enable = true;
       };
 
@@ -45,8 +50,9 @@ in
         openOnSetup = true;
       };
 
-      presence-nvim = {
+      nvim-autopairs = {
         enable = true;
+        checkTs = true;
       };
 
       treesitter = {
@@ -59,9 +65,7 @@ in
           "lua"
         ];
       };
-      treesitter-rainbow = {
-        enable = true;
-      };
+      treesitter-rainbow.enable = true;
       treesitter-refactor = {
         enable = true;
         #highlightCurrentScope.enable = true;
@@ -85,6 +89,7 @@ in
         };
       };
 
+      telescope.enable = true;
       rust-tools.enable = true;
       nvim-cmp.enable = true;
 
@@ -92,13 +97,13 @@ in
       # Read settings  here: https://github.com/mfussenegger/nvim-dap#Usage
       # See :help dap.txt, :help dap-mapping and :help dap-api.
       cmp-dap.enable = true;
-
       cmp-vsnip.enable = true;
       cmp-buffer.enable = true;
       cmp-nvim-lsp-signature-help.enable = true;
       cmp-nvim-lua.enable = true;
       cmp-path.enable = true;
 
+      presence-nvim.enable = true;
       nix.enable = true;
       airline = {
         enable = true;
diff --git a/rsrcs/nvim.lua b/rsrcs/nvim.lua
index cccfa1f..b1f4268 100644
--- a/rsrcs/nvim.lua
+++ b/rsrcs/nvim.lua
@@ -8,7 +8,7 @@ rt.setup({
       -- Hover actions
       vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
       -- Code action groups
-      vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
+      vim.keymap.set("n", "<leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
     end,
   },
 })
@@ -130,6 +130,10 @@ vim.keymap.set('', '<leader>ff', function()
 end, {remap=true})
 
 
+require("telescope").load_extension "file_browser"
+require("telescope").load_extension("harpoon")
+
+-- Themeing
 require("monokai-pro").setup({
   transparent_background = true,
   terminal_colors = true,
@@ -178,6 +182,3 @@ require("monokai-pro").setup({
 })
 
 vim.cmd.colorscheme "monokai-pro-spectrum"
-
-require("telescope").load_extension "file_browser"
-