From 8b25bc96a4ead131376af1dcc4372a0501576b0a Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Thu, 9 Nov 2023 00:15:30 +0000
Subject: [PATCH] rescue: enable root-on-tmpfs, and consolidate those
 definitions

---
 hosts/by-name/desko/fs.nix  | 1 -
 hosts/by-name/lappy/fs.nix  | 2 --
 hosts/by-name/moby/fs.nix   | 1 -
 hosts/by-name/rescue/fs.nix | 2 +-
 hosts/by-name/servo/fs.nix  | 1 -
 hosts/common/default.nix    | 1 +
 6 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/hosts/by-name/desko/fs.nix b/hosts/by-name/desko/fs.nix
index 22db863b..3494b32a 100644
--- a/hosts/by-name/desko/fs.nix
+++ b/hosts/by-name/desko/fs.nix
@@ -1,7 +1,6 @@
 { ... }:
 
 {
-  sane.persist.root-on-tmpfs = true;
   # increase /tmp space (defaults to 50% of RAM) for building large nix things.
   # a cross-compiled kernel, particularly, will easily use 30+GB of tmp
   fileSystems."/tmp".options = [ "size=64G" ];
diff --git a/hosts/by-name/lappy/fs.nix b/hosts/by-name/lappy/fs.nix
index d741816e..2ea53270 100644
--- a/hosts/by-name/lappy/fs.nix
+++ b/hosts/by-name/lappy/fs.nix
@@ -1,8 +1,6 @@
 { ... }:
 
 {
-  sane.persist.root-on-tmpfs = true;
-
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/75230e56-2c69-4e41-b03e-68475f119980";
     fsType = "btrfs";
diff --git a/hosts/by-name/moby/fs.nix b/hosts/by-name/moby/fs.nix
index d48c5889..0e190cf7 100644
--- a/hosts/by-name/moby/fs.nix
+++ b/hosts/by-name/moby/fs.nix
@@ -1,7 +1,6 @@
 { ... }:
 
 {
-  sane.persist.root-on-tmpfs = true;
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/1f1271f8-53ce-4081-8a29-60a4a6b5d6f9";
     fsType = "btrfs";
diff --git a/hosts/by-name/rescue/fs.nix b/hosts/by-name/rescue/fs.nix
index 548c3fb2..57f7102d 100644
--- a/hosts/by-name/rescue/fs.nix
+++ b/hosts/by-name/rescue/fs.nix
@@ -1,7 +1,7 @@
 { ... }:
 
 {
-  fileSystems."/" = {
+  fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/44445555-6666-7777-8888-999900001111";
     fsType = "ext4";
   };
diff --git a/hosts/by-name/servo/fs.nix b/hosts/by-name/servo/fs.nix
index fa20f824..9a2fc0a1 100644
--- a/hosts/by-name/servo/fs.nix
+++ b/hosts/by-name/servo/fs.nix
@@ -1,7 +1,6 @@
 { ... }:
 
 {
-  sane.persist.root-on-tmpfs = true;
   # increase /tmp space (defaults to 50% of RAM) for building large nix things.
   # even the stock `nixpkgs.linux` consumes > 16 GB of tmp
   fileSystems."/tmp".options = [ "size=32G" ];
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index c86b99d9..d7921a77 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -21,6 +21,7 @@
   sane.nixcache.enable-trusted-keys = true;
   sane.nixcache.enable = lib.mkDefault true;
   sane.persist.enable = lib.mkDefault true;
+  sane.root-on-tmpfs = lib.mkDefault true;
   sane.programs.sysadminUtils.enableFor.system = lib.mkDefault true;
   sane.programs.consoleUtils.enableFor.user.colin = lib.mkDefault true;