diff --git a/flake.nix b/flake.nix
index 24e6c7d..72d7e57 100644
--- a/flake.nix
+++ b/flake.nix
@@ -69,7 +69,7 @@
 
         # custom packages
         (_: pkgs: {
-          autofmt = pkgs.callPackage ./packages/autofmt.nix { };
+          autofmt = pkgs.callPackage ./packages/autofmt { };
         })
       ];
 
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" -- "$@"
diff --git a/files/autofmt.js b/packages/autofmt/autofmt.js
similarity index 99%
rename from files/autofmt.js
rename to packages/autofmt/autofmt.js
index 4e2ff72..dc8481d 100755
--- a/files/autofmt.js
+++ b/packages/autofmt/autofmt.js
@@ -1,5 +1,6 @@
 #!/usr/bin/env node
-// autofmt v1 - https://paperclover.dev/nix/config/src/branch/main/files/autofmt.js
+// autofmt v1 by paper clover
+// https://paperclover.dev/nix/config/src/branch/main/packages/autofmt/autofmt.js
 //
 // Different codebases use different formatters. Autofmt looks for project
 // configuration to pick the correct formatter, allowing an editor to simply
diff --git a/packages/autofmt.nix b/packages/autofmt/default.nix
similarity index 79%
rename from packages/autofmt.nix
rename to packages/autofmt/default.nix
index 16ade37..54893c0 100644
--- a/packages/autofmt.nix
+++ b/packages/autofmt/default.nix
@@ -10,5 +10,5 @@ pkgs.writeShellApplication {
     zig
     clang-tools
   ];
-  text = ''exec deno run -A ${../files/autofmt.js} "$@"'';
+  text = ''exec deno run -A ${./autofmt.js} "$@"'';
 }
diff --git a/users/fish/cattop/configuration.nix b/users/fish/cattop/configuration.nix
index 35b2d32..8784eed 100644
--- a/users/fish/cattop/configuration.nix
+++ b/users/fish/cattop/configuration.nix
@@ -44,6 +44,25 @@
   # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true;
   services.xserver.desktopManager.gnome.enable = true;
+  environment.gnome.excludePackages = (
+    with pkgs;
+    [
+      atomix
+      cheese
+      epiphany
+      geary
+      gedit
+      gnome-characters
+      gnome-music
+      gnome-photos
+      gnome-terminal
+      gnome-tour
+      hitori
+      iagno
+      totem
+
+    ]
+  );
 
   # Configure keymap in X11
   # services.xserver.xkb.layout = "us";
@@ -66,7 +85,10 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.fish = {
     isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [
+      "wheel" # Enable ‘sudo’ for the user.
+      "dialout" # Enable serial access for the user.
+    ];
     packages = with pkgs; [
       tree
       git
@@ -77,6 +99,7 @@
   };
 
   programs.firefox.enable = true;
+  programs.neovim.defaultEditor.enable = true;
 
   # List packages installed in system profile.
   # You can use https://search.nixos.org/ to find more packages (and options).
diff --git a/users/fish/cattop/home.nix b/users/fish/cattop/home.nix
index e9b97ff..b6c57b9 100644
--- a/users/fish/cattop/home.nix
+++ b/users/fish/cattop/home.nix
@@ -17,23 +17,14 @@
       ghostty
       stremio
       julia
-      qbittorrent
       calibre
       mpv
       signal-desktop
       python3
       gh
+      spotify
 
       # Gaming
-      bottles
-      lutris
-      mangohud
-      dxvk_2
-      steam-run
-      vulkan-tools
-      path-of-building
-      wineWowPackages.stable
-      winetricks
       (prismlauncher.override { gamemodeSupport = true; })
 
       # System & desktop tools
@@ -47,18 +38,17 @@
       grub2
       efibootmgr
       distrobox
+      pqiv
 
       # Dev tools
       legcord
       hyfetch
-      arduino-cli
-      rust-bin.stable.latest.default
-      tytools
-      inputs.zls.packages.x86_64-linux.zls
-      platformio
-      usbutils
-      teensy-loader-cli
-      teensyduino
+      kicad
+
+      # Unsorted
+      ripgrep
+      busybox
+      imagemagick
     ];
   };
 
diff --git a/users/fish/user.nix b/users/fish/user.nix
index f515195..5d83383 100644
--- a/users/fish/user.nix
+++ b/users/fish/user.nix
@@ -1,7 +1,7 @@
 rec {
   username = "fish"; # username
   name = "Fish"; # name/identifier
-  email = "fish@fishcat.fish"; # email (used for certain configurations)
+  email = "77413091+JulianBarbera@users.noreply.github.com"; # email (used for certain configurations)
   dotfilesDir = "~/config"; # absolute path of the local repo
   theme = "catppuccin-mocha"; # name of theme that stylix will use
   browser = "firefox"; # Default browser; must select one from ./user/app/browser/