diff --git a/modules/home/common/kitty.nix b/modules/home/common/kitty.nix
index 8fcf075..664095a 100644
--- a/modules/home/common/kitty.nix
+++ b/modules/home/common/kitty.nix
@@ -14,6 +14,7 @@ let
     hide_window_decorations yes
 
     map ctrl+shift+t new_tab_with_cwd
+    map ctrl+r send_text all \x15shellhistory\r
   '';
 in
 {
diff --git a/modules/home/common/shell.nix b/modules/home/common/shell.nix
index b16309a..9d628b6 100755
--- a/modules/home/common/shell.nix
+++ b/modules/home/common/shell.nix
@@ -60,11 +60,15 @@
       # Golang
       gr = "go run .";
       gmt = "go mod tidy";
-
     };
 
     # Additional bash configuration
     initContent = ''
+        function shellhistory() {
+          cmd=$(cat .zsh_history | grep -E ^: | sed "s/^: //" | sed "s|:0;| |" | sort --reverse | uniq | awk '{print substr($0, index($0, $2))}' | fzf)
+          eval "$cmd"
+        }
+
         function pape() {
           hyprctl hyprpaper preload $1 
           hyprctl hyprpaper wallpaper ", $1"
diff --git a/modules/system/nfs.nix b/modules/system/nfs.nix
index 278ce1d..55e43e8 100644
--- a/modules/system/nfs.nix
+++ b/modules/system/nfs.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, pkgs, ... }:
 
 let
   nasIp = "10.89.0.15";
@@ -41,8 +41,11 @@ in
     udisks2.enable = true;
   };
 
-  fileSystems = fsConfig;
+  # Add NFS utilities
+  environment.systemPackages = with pkgs; [
+    nfs-utils
+  ];
 
-  # # Optional: Create mount directories
-  # systemd.tmpfiles.rules = map (share: "d /mnt/${share} 0755 root root -") shares;
+  fileSystems = fsConfig;
+  systemd.tmpfiles.rules = map (share: "d /mnt/${share} 0755 root root -") shares;
 }
diff --git a/modules/system/nix-valet.nix b/modules/system/nix-valet.nix
index e71620a..324735c 100644
--- a/modules/system/nix-valet.nix
+++ b/modules/system/nix-valet.nix
@@ -60,24 +60,19 @@
       enable = true;
       globalConfig = ''
         auto_https off
-        admin off
+        frankenphp
+        order php_server before file_server 
       '';
       extraConfig = ''
-        *.test:80 {
-          root * /home/javi/projects/{labels.1}
+        # Specific subdomain first (more specific routes come first)
+        http://caddytest.test {
+            respond "We in caddyland"
+        }
 
-          # Try /public directory first (for Laravel)
-          @laravel file /home/javi/projects/{labels.1}/public/index.php
-          root @laravel /home/javi/projects/{labels.1}/public
-
-          # PHP FastCGI
-          php_fastcgi unix//run/phpfpm/www.sock
-
-          # File server for static assets
-          file_server
-
-          # Laravel specific - handle missing files
-          try_files {path} {path}/ /index.php?{query}
+        # Wildcard for other .test domains
+        http://*.test {
+            root * /home/javi/projects/{labels.1}/public
+            php_server
         }
       '';
     };