lappy: switch back to the existing fs uuids

machines/lappy/default.nix

@@ -4,7 +4,7 @@
     ./fs.nix
   ];
 
-  # colinsane.gui.sway.enable = true;
+  colinsane.gui.sway.enable = true;
   colinsane.impermanence.enable = true;
   colinsane.extlinux.enable = true;
 

machines/lappy/fs.nix

@@ -1,40 +1,6 @@
 { lib, ... }:
 
 {
-  # fileSystems."/" = lib.mkDefault {
-  #   device = "none";
-  #   fsType = "tmpfs";
-  #   options = [
-  #     "mode=755"
-  #     "size=1G"
-  #     "defaults"
-  #   ];
-  # };
-
-  # fileSystems."/nix" = lib.mkDefault {
-  #   device = "/dev/disk/by-uuid/75230e56-2c69-4e41-b03e-68475f119980";
-  #   fsType = "btrfs";
-  #   options = [
-  #     "compress=zstd"
-  #     "defaults"
-  #   ];
-  # };
-
-  # fileSystems."/boot" = {
-  #   device = lib.mkDefault "/dev/disk/by-uuid/BD79-D6BB";
-  #   fsType = "vfat";
-  # };
-
-  fileSystems."/nix" = {
-    device = "/dev/disk/by-uuid/5a7fa69c-9394-8144-a74c-6726048b129f";
-    fsType = "btrfs";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/4302-1685";
-    fsType = "vfat";
-  };
-
   fileSystems."/" = {
     device = "none";
     fsType = "tmpfs";
@@ -44,4 +10,38 @@
       "defaults"
     ];
   };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/75230e56-2c69-4e41-b03e-68475f119980";
+    fsType = "btrfs";
+    options = [
+      "compress=zstd"
+      "defaults"
+    ];
+  };
+
+  fileSystems."/boot" = {
+    device = lib.mkDefault "/dev/disk/by-uuid/BD79-D6BB";
+    fsType = "vfat";
+  };
+
+  # fileSystems."/nix" = {
+  #   device = "/dev/disk/by-uuid/5a7fa69c-9394-8144-a74c-6726048b129f";
+  #   fsType = "btrfs";
+  # };
+
+  # fileSystems."/boot" = {
+  #   device = "/dev/disk/by-uuid/4302-1685";
+  #   fsType = "vfat";
+  # };
+
+  # fileSystems."/" = {
+  #   device = "none";
+  #   fsType = "tmpfs";
+  #   options = [
+  #     "mode=755"
+  #     "size=1G"
+  #     "defaults"
+  #   ];
+  # };
 }

modules/impermanence.nix

@@ -10,6 +10,7 @@ let
 in
 {
   imports = [
+    # TODO: move to flake.nix?
     impermanence.nixosModule
   ];
   options = {