diff --git a/appserver/configuration.nix b/appserver/configuration.nix
index 4126b17..79a9f47 100644
--- a/appserver/configuration.nix
+++ b/appserver/configuration.nix
@@ -34,7 +34,7 @@
 
   # Mount remote filesystem
   fileSystems."/mnt/remote/media" = {
-    device = "files:/mnt/storage/";
+    device = "files:/mnt/storage";
     fsType = "nfs";
   };
 
diff --git a/laptop/hardware-configuration.nix b/laptop/hardware-configuration.nix
index 9a88065..15a0446 100644
--- a/laptop/hardware-configuration.nix
+++ b/laptop/hardware-configuration.nix
@@ -19,6 +19,11 @@
     { device = "/dev/disk/by-uuid/28E2-7988";
       fsType = "vfat";
     };
+  fileSystems."/home/geir/nfs" =
+    { device = "files:/mnt/storage";
+      fsType = "nfs";
+      options = [ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" ];
+    };	
 
   swapDevices = [ ];