jan-leila/nix-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

made impermanence work

Browse source
This commit is contained in:
Leyla Becker 2024-12-09 16:57:13 -06:00
parent 131f730caf
commit c28731a1a7
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configurations/nixos/defiant/disko-config.nix
View file

@ -48,6 +48,9 @@ in {
hd_18_tb_a = zfsDisk "/dev/disk/by-id/ata-ST18000NE000-3G6101_ZVTCXVEB"; hd_18_tb_a = zfsDisk "/dev/disk/by-id/ata-ST18000NE000-3G6101_ZVTCXVEB";
hd_18_tb_b = zfsDisk "/dev/disk/by-id/ata-ST18000NE000-3G6101_ZVTCXWSC"; hd_18_tb_b = zfsDisk "/dev/disk/by-id/ata-ST18000NE000-3G6101_ZVTCXWSC";
hd_18_tb_c = zfsDisk "/dev/disk/by-id/ata-ST18000NE000-3G6101_ZVTD10EH"; hd_18_tb_c = zfsDisk "/dev/disk/by-id/ata-ST18000NE000-3G6101_ZVTD10EH";
hd_18_tb_d = zfsDisk "/dev/disk/by-id/ata-ST18000NT001-3NF101_ZVTE0S3Q";
hd_18_tb_e = zfsDisk "/dev/disk/by-id/ata-ST18000NT001-3NF101_ZVTEF27J";
hd_18_tb_f = zfsDisk "/dev/disk/by-id/ata-ST18000NT001-3NF101_ZVTEZACV";
ssd_4_tb_a = cacheDisk "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_4TB_S7KGNU0X907881F"; ssd_4_tb_a = cacheDisk "/dev/disk/by-id/nvme-Samsung_SSD_990_PRO_4TB_S7KGNU0X907881F";
}; };
@ -59,12 +62,14 @@ in {
type = "topology"; type = "topology";
vdev = [ vdev = [
{ {
# should this only mirror for this inital config with 3 drives we will used raidz2 for future configs??? mode = "raidz2";
mode = "mirror";
members = [ members = [
"hd_18_tb_a" "hd_18_tb_a"
"hd_18_tb_b" "hd_18_tb_b"
"hd_18_tb_c" "hd_18_tb_c"
"hd_18_tb_d"
"hd_18_tb_e"
"hd_18_tb_f"
]; ];
} }
]; ];
@ -113,6 +118,15 @@ in {
canmount = "on"; canmount = "on";
}; };
}; };
"local/system/sops" = {
type = "zfs_fs";
mountpoint = import ../../../const/sops_age_key_directory.nix;
options = {
atime = "off";
relatime = "off";
canmount = "on";
};
};
"local/system/root" = { "local/system/root" = {
type = "zfs_fs"; type = "zfs_fs";
mountpoint = "/"; mountpoint = "/";

8
configurations/nixos/defiant/impermanence.nix
View file

@ -1,8 +1,4 @@
{ {lib, ...}: {
lib,
config,
...
}: {
boot.initrd.postResumeCommands = lib.mkAfter '' boot.initrd.postResumeCommands = lib.mkAfter ''
zfs rollback -r rpool/local/system/root@blank zfs rollback -r rpool/local/system/root@blank
zfs rollback -r rpool/local/home/leyla@blank zfs rollback -r rpool/local/home/leyla@blank
@ -51,6 +47,7 @@
fileSystems."/home/leyla".neededForBoot = true; fileSystems."/home/leyla".neededForBoot = true;
fileSystems."/persist/system/root".neededForBoot = true; fileSystems."/persist/system/root".neededForBoot = true;
fileSystems."/persist/home/leyla".neededForBoot = true; fileSystems."/persist/home/leyla".neededForBoot = true;
fileSystems.${import ../../../const/sops_age_key_directory.nix}.neededForBoot = true;
environment.persistence."/persist/system/root" = { environment.persistence."/persist/system/root" = {
enable = true; enable = true;
@ -79,7 +76,6 @@
]; ];
files = [ files = [
"/etc/machine-id" "/etc/machine-id"
config.environment.sessionVariables.SOPS_AGE_KEY_FILE
]; ];
}; };