about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2022-08-06T20·44-0700
committerclbot <clbot@tvl.fyi>2022-08-06T20·50+0000
commitcdb4ecf5c03e146a6dd44545a016528e03157ced (patch)
tree9f72bf5c234a090e49871a789b8e4567a3fba4b1
parent9203531abe31e4d9f6cb74d8bd366d9e438dd867 (diff)
fix(wpcarro/marcus): Fix fstab r/4389
Labels `NIXROOT` and `NIXBOOT` don't exist, but `nixos` and `boot` do...

Change-Id: I14296f1e03ed4b8953b360977921c3930c8907a6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6045
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>
Tested-by: BuildkiteCI
-rw-r--r--users/wpcarro/nixos/marcus/hardware.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/users/wpcarro/nixos/marcus/hardware.nix b/users/wpcarro/nixos/marcus/hardware.nix
index 329926269ae6..8a2672206b50 100644
--- a/users/wpcarro/nixos/marcus/hardware.nix
+++ b/users/wpcarro/nixos/marcus/hardware.nix
@@ -11,18 +11,18 @@
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXROOT";
+    device = "/dev/disk/by-label/nixos";
     fsType = "ext4";
   };
 
   fileSystems."/boot" = {
-    device = "/dev/disk/by-label/NIXBOOT";
+    device = "/dev/disk/by-label/boot";
     fsType = "vfat";
   };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/b87e2b8f-c835-4179-a428-fe466a846df0"; }
-  ];
+  swapDevices = lib.singleton {
+    device = "/dev/disk/by-label/swap";
+  };
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;