diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 734dd03..446fe23 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -120,6 +120,9 @@
       enable = true;
       setupOpts = {
         fzf_colors = true;
+        keymap.fzf = {
+          "ctrl-q" = "select-all+accept";
+        };
       };
     };
     autocomplete.blink-cmp = {
diff --git a/modules/neovim/keybind.nix b/modules/neovim/keybind.nix
index f5b2d0f..42732a6 100644
--- a/modules/neovim/keybind.nix
+++ b/modules/neovim/keybind.nix
@@ -24,11 +24,12 @@ in
 
     # pickers
     pick-file = keyCmd "n" "<leader><leader>" "FzfLua files";
+    pick-buffer = keyCmd "n" "<leader>b" "FzfLua buffers";
     pick-mark = keyCmd "n" "<leader>'" "FzfLua marks";
-    #pick-buffer = keyCmd "n" "<leader>b" "FzfLua buffers";
-    pick-grep = keyCmd "n" "<leader>ff" "FzfLua grep_project";
     pick-recent-command = keyCmd "n" "<leader>fc" "FzfLua command_history";
-    pick-other = keyCmd "n" "<leader>f?" "FzfLua builtin"; # picker of Fzf pickers
+    pick-other = keyCmd "n" "<leader><tab>" "FzfLua builtin"; # picker of Fzf pickers
+    find-fuzzy = keyCmd "n" "<leader>ff" "FzfLua grep_project";
+    find-grep = keyCmd "n" "<leader>fg" "FzfLua live_grep";
 
     # lsp
     code-action =
@@ -38,7 +39,7 @@ in
     # subtle nice features
     visual-dedent = keyRemap "v" "<" "<gv"; # keep selection
     visual-indent = keyRemap "v" ">" ">gv"; # keep selection
-    clear-search-highlights = keyRemap "n" "<esc" ":noh<Return><esc>";
+    clear-search-highlights = keyRemap "n" "<esc>" ":noh<Return><esc>";
   };
 
   # implementation
diff --git a/nvim b/nvim
index 9301a34..607cc6c 100755
--- a/nvim
+++ b/nvim
@@ -11,4 +11,4 @@ if [ -z "$name" ]; then
   echo "Configure this wrapper script with your name." >&2
   exit 1
 fi
-exec nix run ".#nvim-$name" -- "$@"
+exec nix run "$(dirname "$0")#nvim-$name" -- "$@"