bruh
This commit is contained in:
@@ -12,6 +12,7 @@ in
|
||||
imports = [
|
||||
./boot.nix
|
||||
./apps.nix
|
||||
./disabled.nix
|
||||
# ./nas-pool.nix
|
||||
./users.nix
|
||||
./services.nix
|
||||
@@ -285,7 +286,12 @@ in
|
||||
device = "UUID=adf7b4e1-dfed-4c10-a9ab-2741c1055552";
|
||||
fsType = "bcachefs";
|
||||
};
|
||||
# "/media/nas/test" = {
|
||||
# device = "UUID=621706d6-e3a8-48d6-9560-58b01129a846";
|
||||
# fsType = "bcachefs";
|
||||
# };
|
||||
};
|
||||
fileSystems."/etc".neededForBoot = true;
|
||||
|
||||
environment.etc = {
|
||||
"crypttab".text = ''
|
||||
@@ -300,43 +306,55 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices = {
|
||||
hdd1-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/295d4c78-41f0-4792-bd97-ac88b2455cdc";
|
||||
};
|
||||
hdd2-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/7c9c2179-351c-40a5-9257-e9ee2a1e794a";
|
||||
};
|
||||
ssd1-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/d78fa862-212c-4d4f-ad86-bfeead5cc054";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd2-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/1661c173-3809-4517-9ab8-ad94c229048d";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd3-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/cfea125e-90b1-4248-834d-16dcaf310783";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd4-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/96055401-6d1a-4308-9e4e-2211e1e23635";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd5-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/055e27e0-c96a-4899-8ee7-cb1cd5f21476";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd6-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/6e830abd-2555-4558-81a3-4a990507b5a7";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
boot.initrd = {
|
||||
luks.devices = {
|
||||
# "621706d6-e3a8-48d6-9560-58b01129a846" = {
|
||||
# device = "/dev/disk/by-uuid/621706d6-e3a8-48d6-9560-58b01129a846";
|
||||
# };
|
||||
hdd1-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/295d4c78-41f0-4792-bd97-ac88b2455cdc";
|
||||
};
|
||||
hdd2-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/7c9c2179-351c-40a5-9257-e9ee2a1e794a";
|
||||
};
|
||||
ssd1-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/d78fa862-212c-4d4f-ad86-bfeead5cc054";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd2-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/1661c173-3809-4517-9ab8-ad94c229048d";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd3-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/cfea125e-90b1-4248-834d-16dcaf310783";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd4-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/96055401-6d1a-4308-9e4e-2211e1e23635";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd5-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/055e27e0-c96a-4899-8ee7-cb1cd5f21476";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
ssd6-cryptroot = {
|
||||
device = "/dev/disk/by-uuid/6e830abd-2555-4558-81a3-4a990507b5a7";
|
||||
allowDiscards = true;
|
||||
bypassWorkqueues = true;
|
||||
};
|
||||
};
|
||||
|
||||
# clevis = {
|
||||
# enable = true;
|
||||
# devices = {
|
||||
# "621706d6-e3a8-48d6-9560-58b01129a846".secretFile = ../../../test.jwe;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
# boot.initrd.luks.devices.cryptroot.device = "/dev/disk/by-partlabel/disk-main-jallen-nas-cryptroot";
|
||||
@@ -360,7 +378,6 @@ in
|
||||
protonmail-bridge
|
||||
protonvpn-gui
|
||||
qrencode
|
||||
rcon
|
||||
sbctl
|
||||
tigervnc
|
||||
tpm2-tools
|
||||
|
||||
Reference in New Issue
Block a user