Compare commits

..

No commits in common. "5ed359d561abcafcf4648e57d01285a4826f0595" and "498a48c50032e732453a0e83b83c6df14ad4de52" have entirely different histories.

View File

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