diff --git a/hosts/firefly/system/hardware/default.nix b/hosts/firefly/system/hardware/default.nix
index 038c02a..2edf666 100644
--- a/hosts/firefly/system/hardware/default.nix
+++ b/hosts/firefly/system/hardware/default.nix
@@ -91,48 +91,8 @@
     };
 
     # Network mounts
-    "/home/jimbo/JimboNFS/Downloads" = {
-      device = "${config.ips.server}:/export/JimboNFS/Downloads";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-    "/home/jimbo/JimboNFS/Documents" = {
-      device = "${config.ips.server}:/export/JimboNFS/Documents";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-    "/home/jimbo/JimboNFS/Photos" = {
-      device = "${config.ips.server}:/export/JimboNFS/Photos";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-    "/home/jimbo/JimboNFS/Videos/Random" = {
-      device = "${config.ips.server}:/export/JimboNFS/Videos/Random";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-    "/home/jimbo/JimboNFS/Videos/Media" = {
-      device = "${config.ips.server}:/export/JimboNFS/Videos/Media";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-    "/home/jimbo/JimboNFS/Music/Synced" = {
-      device = "${config.ips.server}:/export/JimboNFS/Music/Synced";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-    "/home/jimbo/JimboNFS/Music/Unsynced" = {
-      device = "${config.ips.server}:/export/JimboNFS/Music/Unsynced";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-    "/home/jimbo/JimboNFS/Projects" = {
-      device = "${config.ips.server}:/export/JimboNFS/Projects";
-      fsType = "nfs4";
-      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
-    };
-    "/home/jimbo/JimboNFS/School" = {
-      device = "${config.ips.server}:/export/JimboNFS/School";
+    "/home/jimbo/JimboNFS" = {
+      device = "${config.ips.server}:/export/JimboNFS";
       fsType = "nfs4";
       options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
     };
diff --git a/hosts/lacros/system/hardware/default.nix b/hosts/lacros/system/hardware/default.nix
index 4b3b692..f04fcd6 100644
--- a/hosts/lacros/system/hardware/default.nix
+++ b/hosts/lacros/system/hardware/default.nix
@@ -49,7 +49,7 @@
     "/home/jimbo/JimboNFS" = {
       device = "${config.ips.wgSpan}.1:/export/JimboNFS";
       fsType = "nfs4";
-      options = ["x-systemd.automount" "_netdev" "nofail" "noauto"];
+      options = [ "x-systemd.automount" "_netdev" "nofail" "noauto" ];
     };
   };