2023-02-02

4 files changed, 38 insertions, 30 deletions

diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix
index 19eb8b1..3bd7230 100644
--- a/nixosConfigurations/eonwe/default.nix
+++ b/nixosConfigurations/eonwe/default.nix
@@ -70,6 +70,8 @@ with lib; {
 
     # The boot drive is Samsung SSD 980 PRO 2TB.
     initrd.kernelModules = ["nvme"];
+
+    zfs.extraPools = ["vdata"];
   };
 
   # Filesystem creation:
@@ -82,10 +84,6 @@ with lib; {
   # -O acltype=posixacl
   # -O xattr=sa
   # -O compression=zstd
-  # -O atime=off
-  # -O relatime=off
-  # -O devices=off
-  # -O canmount=off
   # -O mountpoint=none
   # nixos
   # /dev/nvmeXnYpZ
@@ -94,10 +92,9 @@ with lib; {
   # nixos/root
   #
   # zfs create
-  # -o mountpoint=legacy
-  # -o relatime=on
-  # -o encryption=on
+  # -o encryption=aes-256-gcm
   # -o keyformat=passphrase
+  # -o mountpoint=legacy
   # nixos/root/ark
   #
   # zfs create
@@ -105,26 +102,37 @@ with lib; {
   # nixos/root/nix
   # ```
   fileSystems = {
-    "/boot" = {
-      device = "/dev/disk/by-uuid/1363-02E6";
-      fsType = "vfat";
-    };
-
     "/" = {
       device = "none";
       fsType = "tmpfs";
       options = ["size=8G" "mode=755"];
     };
 
-    "/ark" = {
-      device = "nixos/root/ark";
-      fsType = "zfs";
-      neededForBoot = true;
+    "/boot" = {
+      device = "/dev/disk/by-uuid/1363-02E6";
+      fsType = "vfat";
     };
 
     "/nix" = {
       device = "nixos/root/nix";
       fsType = "zfs";
+      options = ["noatime"];
+    };
+
+    ${config.ark.path} = {
+      device = "nixos/root/ark";
+      fsType = "zfs";
+      neededForBoot = true; # Required by impermanence.
+    };
+
+    # Required[1] when using impermanence with agenix. Filesystem itself is
+    # defined as an `ark.directory` in `nixos/common/users.nix`.
+    #
+    # [1]: https://github.com/ryantm/agenix/issues/45#issuecomment-847852593
+    # [1]: https://github.com/nix-community/impermanence/issues/22
+    # [1]: https://github.com/NixOS/nixpkgs/pull/86967#pullrequestreview-667929259
+    "/home/${my.username}" = {
+      depends = [config.ark.path];
       neededForBoot = true;
     };
   };
diff --git a/nixosConfigurations/manwe/default.nix b/nixosConfigurations/manwe/default.nix
index a079579..2262501 100644
--- a/nixosConfigurations/manwe/default.nix
+++ b/nixosConfigurations/manwe/default.nix
@@ -58,14 +58,14 @@ with lib; {
   };
 
   fileSystems = {
-    "/boot" = {
-      device = "/dev/sda1";
+    "/" = {
+      device = "/dev/sda2";
       fsType = "xfs";
       options = ["noatime"];
     };
 
-    "/" = {
-      device = "/dev/sda2";
+    "/boot" = {
+      device = "/dev/sda1";
       fsType = "xfs";
       options = ["noatime"];
     };
diff --git a/nixosConfigurations/melian/default.nix b/nixosConfigurations/melian/default.nix
index d7563d7..f4efcd9 100644
--- a/nixosConfigurations/melian/default.nix
+++ b/nixosConfigurations/melian/default.nix
@@ -72,16 +72,16 @@ with lib; {
   };
 
   fileSystems = {
-    "/boot" = {
-      device = "/dev/disk/by-uuid/1083-C8A0";
-      fsType = "vfat";
-    };
-
     "/" = {
       device = "/dev/disk/by-uuid/bb8b09dc-cc67-47e5-8280-532b17a9e62a";
       fsType = "xfs";
       options = ["noatime"];
     };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/1083-C8A0";
+      fsType = "vfat";
+    };
   };
 
   # NOTE This makes hibernation pretty much impossible because the partition is
diff --git a/nixosConfigurations/varda/default.nix b/nixosConfigurations/varda/default.nix
index e3a0d60..db4d86e 100644
--- a/nixosConfigurations/varda/default.nix
+++ b/nixosConfigurations/varda/default.nix
@@ -32,16 +32,16 @@ with lib; {
   };
 
   fileSystems = {
-    "/boot" = {
-      device = "/dev/disk/by-uuid/03FD-B6C0";
-      fsType = "vfat";
-    };
-
     "/" = {
       device = "/dev/disk/by-uuid/b07e8273-915a-424c-8c55-cdc2bd482f49";
       fsType = "xfs";
       options = ["noatime"];
     };
+
+    "/boot" = {
+      device = "/dev/disk/by-uuid/03FD-B6C0";
+      fsType = "vfat";
+    };
   };
 
   swapDevices = [