2 files changed, 6 insertions, 2 deletions

diff --git a/hel.nix b/hel.nix
index 127367d4..15b7d4a2 100644
--- a/hel.nix
+++ b/hel.nix
@@ -510,8 +510,14 @@
         ];
     }
     { where = "/tmp";
+      what = "tmpfs";
+      type = "tmpfs";
       options = lib.concatStringsSep ","
         ["mode=1777" "strictatime" "nosuid" "nodev" "size=16G"];
+      after = [ "swap.target" ];
+      before = [ "local-fs.target" "umount.target" ];
+      conflicts = [ "umount.target" ];
+      wantedBy = [ "local-fs.target" ];
     }
   ];
 
diff --git a/hel/boot.nix b/hel/boot.nix
index 5320fcac..45fc5c2d 100644
--- a/hel/boot.nix
+++ b/hel/boot.nix
@@ -21,8 +21,6 @@
       enable = true;
     };
 
-    tmpOnTmpfs = true;
-
     kernelParams = [ "intel_pstate=no_hwp" "quiet" ];
 
     blacklistedKernelModules = [ "snd_soc_skl" ];