diff --git a/hosts/desktop/filesystems.nix b/hosts/desktop/filesystems.nix
index 699259e..88d458e 100755
--- a/hosts/desktop/filesystems.nix
+++ b/hosts/desktop/filesystems.nix
@@ -2,6 +2,7 @@
 let
   defaultNetworkShareOptions = [
     "sec=none"
+    "nofail"
     "x-systemd.automount"
     "auto"
     "rw"
@@ -10,23 +11,49 @@ let
     "uid=matt"
     "gid=wheel"
   ];
+  defaultLocalOptions = [
+    "compress=zstd"
+    "autodefrag"
+    "nofail"
+    "x-systemd.automount"
+    "auto"
+    "rw"
+  ];
 in
 {
-  fileSystems."/media/nas/backup" = {
-    device = "//10.0.1.18/Backup";
-    fsType = "cifs";
-    options = defaultNetworkShareOptions;
-  };
+  fileSystems = {
+    "/home/matt/Steam" = {
+      device = "/dev/storage/logical-storage";
+      options = [
+        "subvol=Steam"
+        "noatime"
+      ] ++ defaultLocalOptions;
+    };
+    "/home/matt/Heroic" = {
+      device = "/dev/storage/logical-storage";
+      options = [
+        "subvol=Heroic"
+        "noatime"
+      ] ++ defaultLocalOptions;
+    };
 
-  fileSystems."/media/nas/isos" = {
-    device = "//10.0.1.18/isos";
-    fsType = "cifs";
-    options = defaultNetworkShareOptions;
-  };
+    # Network shares
+    "/media/nas/backup" = {
+      device = "//10.0.1.18/Backup";
+      fsType = "cifs";
+      options = defaultNetworkShareOptions;
+    };
 
-  fileSystems."/media/nas/3d_printer" = {
-    device = "//10.0.1.18/3d_printer";
-    fsType = "cifs";
-    options = defaultNetworkShareOptions;
+    "/media/nas/isos" = {
+      device = "//10.0.1.18/isos";
+      fsType = "cifs";
+      options = defaultNetworkShareOptions;
+    };
+
+    "/media/nas/3d_printer" = {
+      device = "//10.0.1.18/3d_printer";
+      fsType = "cifs";
+      options = defaultNetworkShareOptions;
+    };
   };
 }
diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index 31492ad..65dcf71 100755
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -82,15 +82,6 @@ in
     }
   ];
 
-  fileSystems."/home/matt/Games" = {
-    device = "/dev/disk/by-uuid/1adb3161-ef9e-45d9-be5f-dd718186f1b3";
-    fsType = "ext4";
-  };
-  fileSystems."/home/matt/1TB" = {
-    device = "/dev/disk/by-uuid/7f9c2d1e-64ee-d901-2084-2d1e64eed901";
-    fsType = "ext4";
-  };
-
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
   # still possible to use this option, but it's recommended to use it in conjunction