hosts/nullbox/impermanence.nix

@@ -39,11 +39,11 @@ let
   root_vol = "/dev/archdesktop/root";
 in {
   config = lib.mkIf (!(config.virtualisation ? qemu)) {
-    fileSystems."/persist" = {
+    fileSystems."/persistent" = {
       neededForBoot = true;
       device = root_vol;
       fsType = "btrfs";
-      options = [ "subvol=/nixos/@persist" ];
+      options = [ "subvol=/nixos/@persistent" ];
     };
 
     boot.initrd.postDeviceCommands = lib.mkAfter (mkBtrfsInit { prefix = "nixos"; volume = root_vol; });
@@ -53,12 +53,11 @@ in {
       options = [ "subvol=/nixos/volatile" ];
     };
     environment.persistence = {
-      "/persist/nobackup" = {
+      "/persistent/nobackup" = {
         hideMounts = true;
         directories = [
           "/var/lib/systemd/coredump"
           "/var/lib/flatpak"
-          "/var/log"
         ];
 
         files = [
@@ -66,7 +65,7 @@ in {
         ];
       };
 
-      "/persist/backup" = {
+      "/persistent/backup" = {
         hideMounts = true;
         directories = [
           # this affects generation/consistency of uids and gids, and should
@@ -94,6 +93,7 @@ in {
           { directory = "/var/lib/tailscale"; mode = "0700"; }
           "/var/lib/unbound"
           "/var/db/sudo/lectured"
+          "/var/log"
 
           # remember login stuff
           "/var/cache/tuigreet"
@@ -106,8 +106,8 @@ in {
     };
 
     users.mutableUsers = false;
-    users.users.nullbite.hashedPasswordFile = "/persist/passfile/nullbite";
+    users.users.nullbite.hashedPasswordFile = "/persistent/passfile/nullbite";
     users.users.nullbite.initialPassword = null;
-    users.users.root.hashedPasswordFile = "/persist/passfile/root";
+    users.users.root.hashedPasswordFile = "/persistent/passfile/root";
   };
 }