Merge branch 'alpine/master' into framework/master, and update

This commit is contained in:
tristan 2025-06-24 14:33:01 +01:00
commit cfee0454fd
9 changed files with 177 additions and 157 deletions

View file

@ -86,6 +86,7 @@ in {
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.graphics.enable = true;
system.stateVersion = "24.05"; # don't change.
home-manager.users.${user}.imports = [

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" = {