Merge branch 'zenix/master' into alpine/master

This commit is contained in:
Tristan 2025-06-22 16:37:02 +01:00
commit 75fb589952
7 changed files with 175 additions and 165 deletions

View file

@ -31,19 +31,12 @@ in {
options = ["noatime"];
};
boot.initrd.luks.devices."usbkey" = {
device = "/dev/disk/by-label/usbkey1";
};
# boot.initrd.luks.devices."usbkey" = {
# device = "/dev/disk/by-label/usbkey1";
# };
boot.initrd.luks.devices."cryptroot" = {
device = "/dev/disk/by-uuid/cc0617df-8cbf-4618-abbc-df64c96de151";
keyFileSize = 4096;
preOpenCommands = ''
mkdir -m 0755 -p /key
mount -n -o ro /dev/mapper/usbkey /key
'';
keyFile = "/key/keyfile";
preLVM = false;
};
fileSystems."/home" = {