NyxErinys/Nix-Config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some issues

Browse source
This commit is contained in:
nyxerinys 2026-10-01 01:02:03 -05:00
parent 28b7f5550a
commit 2ec40813a7
1 changed files with 28 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

36
hosts/apollo/boot.nix
View file

@ -3,7 +3,22 @@
{ {
boot.initrd = { boot.initrd = {
supportedFilesystems = [ "ext4" "zfs" ]; supportedFilesystems = [ "ext4" "zfs" ];
systemd.enable = true; systemd = {
enable = true;
fido2.enable = true;
mounts = [
{
what = "/sysroot/keys";
where = "/keys";
type = "none";
options = "bind";
unitConfig.RequiresMountsFor = "/sysroot/keys";
requires = [ "sysroot-keys.mount" ];
after = [ "sysroot-keys.mount" ];
before = [ "zfs-import-nix-root.service" ];
}
];
};
luks.fido2Support = false; luks.fido2Support = false;
luks.devices."zfs-keys" = { luks.devices."zfs-keys" = {
@ -11,18 +26,18 @@
crypttabExtraOpts = [ "fido2-device=auto" ]; crypttabExtraOpts = [ "fido2-device=auto" ];
}; };
fileSystems."/keys" = {
device = "/dev/mapper/zfs-keys";
fsType = "ext4";
neededForBoot = true;
};
systemd.services."zfs-import-nix-root" = { systemd.services."zfs-import-nix-root" = {
wants = [ "keys.mount" ]; wants = [ "keys.mount" ];
after = [ "keys.mount" ]; after = [ "keys.mount" ];
}; };
}; };
fileSystems."/keys" = {
device = "/dev/mapper/zfs-keys";
fsType = "ext4";
neededForBoot = true;
};
boot.zfs.forceImportRoot = false; boot.zfs.forceImportRoot = false;
fileSystems."/" = { fileSystems."/" = {
device = "nix-root/root"; device = "nix-root/root";
@ -50,6 +65,11 @@
options = [ "fmask=0022" "dmask=0022" ]; options = [ "fmask=0022" "dmask=0022" ];
}; };
swapDevices = [ { device = "/dev/disk/by-id/nvme-CT1000P2SSD8_2138E5D5DA5A-part3"; } ]; swapDevices = [
{
device = "/dev/disk/by-id/nvme-CT1000P2SSD8_2138E5D5DA5A-part3";
randomEncryption.enable = true;
}
];
} }