style: rename systemdDevice into waitForDevice

hosts/redshift/default.nix

@@ -19,7 +19,7 @@
   ataraxia.filesystems.btrfs.enable = true;
   ataraxia.filesystems.btrfs.eraseOnBoot.enable = true;
   ataraxia.filesystems.btrfs.eraseOnBoot.device = "/dev/sda4";
-  ataraxia.filesystems.btrfs.eraseOnBoot.systemdDevice =
+  ataraxia.filesystems.btrfs.eraseOnBoot.waitForDevice =
     "sys-devices-pci0000:00-0000:00:05.0-0000:01:01.0-virtio3-host0-target0:0:0-0:0:0:0-block-sda.device";
   ataraxia.filesystems.btrfs.eraseOnBoot.eraseVolumes = [
     {

hosts/redshift/disk-config.nix

@@ -5,6 +5,12 @@
   disko.devices.disk.disk1 =
     let
       device = "/dev/sda";
+      defaultMountOpts = [
+        "compress=zstd"
+        "noatime"
+        "autodefrag"
+        "ssd"
+      ];
     in
     {
       inherit device;
@@ -58,94 +64,44 @@
                 "/snapshots" = { };
                 "/rootfs" = {
                   mountpoint = "/";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/homefs" = {
                   mountpoint = "/home";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/persist" = { };
                 "/persist/nix" = {
                   mountpoint = "/nix";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/persist/srv" = {
                   mountpoint = "/srv";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/persist/docker" = {
                   mountpoint = "/var/lib/docker";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/persist/podman" = {
                   mountpoint = "/var/lib/podman";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/persist/containers" = {
                   mountpoint = "/var/lib/containers";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/persist/libvirt" = {
                   mountpoint = "/var/lib/libvirt";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/persist/log" = {
                   mountpoint = "/var/log";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
                 "/persist/impermanence" = {
                   mountpoint = "/persist";
-                  mountOptions = [
+                  mountOptions = defaultMountOpts;
-                    "compress=zstd"
-                    "noatime"
-                    "autodefrag"
-                    "ssd"
-                  ];
                 };
               };
             };

modules/nixos/filesystems/btrfs.nix

@@ -48,15 +48,6 @@ in
         default = config.persist.enable;
         description = "Clean btrfs subvolumes on boot";
       };
-      device = mkOption {
-        type = str;
-        description = "Device on which is btrfs partititon";
-      };
-      systemdDevice = mkOption {
-        type = str;
-        description = "Escaped string with name of .device service";
-        example = "dev-disk-by\\x2did-ata\\x2dPhison_SATA_SSD_2165.device";
-      };
       eraseVolumes = mkOption {
         type = listOf (submodule eraseVolumesOpts);
         default = [ ];
@@ -70,6 +61,15 @@ in
           A list of subvolumes to erase on boot.
         '';
       };
+      device = mkOption {
+        type = str;
+        description = "Device on which is btrfs partititon";
+      };
+      waitForDevice = mkOption {
+        type = str;
+        description = "Escaped string with name of .device service";
+        example = "dev-disk-by\\x2did-ata\\x2dPhison_SATA_SSD_2165.device";
+      };
     };
   };
 
@@ -105,8 +105,8 @@ in
         systemd.services.rollback = mkIf config.boot.initrd.systemd.enable {
           description = "Rollback btrfs root subvolume to a pristine state on boot";
           wantedBy = [ "initrd.target" ];
-          requires = [ cfg.eraseOnBoot.systemdDevice ];
+          requires = [ cfg.eraseOnBoot.waitForDevice ];
-          after = [ cfg.eraseOnBoot.systemdDevice ];
+          after = [ cfg.eraseOnBoot.waitForDevice ];
           before = [ "sysroot.mount" ];
           path = [
             pkgs.btrfs-progs