hunner/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

going back to unencrypted swap for now

Browse source
This commit is contained in:
Hunter Haugen 2025-04-21 14:59:31 -07:00
parent 049dcfe5d5
commit deddb07de1
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
framework/configuration.nix
View file

@ -15,9 +15,9 @@ in
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true; loader.efi.canTouchEfiVariables = true;
#initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/cryptroot"; #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/cryptroot";
initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/cryptswap"; #initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/cryptswap";
resumeDevice = "/dev/mapper/cryptswap"; resumeDevice = "/dev/nvme0n1p2";
kernelParams = [ kernelParams = [
"resume_offset=0" "resume_offset=0"
"mem_sleep_default=deep" "mem_sleep_default=deep"
@ -31,8 +31,6 @@ in
options = [ "defaults" "size=4G" "mode=755" ]; options = [ "defaults" "size=4G" "mode=755" ];
}; };
"/persist" = { "/persist" = {
device = "/dev/disk/by-uuid/64d32a97-9d65-4562-9c3c-f19935c04be5";
fsType = "btrfs";
neededForBoot = true; neededForBoot = true;
}; };
}; };

9
framework/disko-btrfs.nix
View file

@ -21,19 +21,14 @@
mountOptions = [ "umask=0077" "defaults" ]; mountOptions = [ "umask=0077" "defaults" ];
}; };
}; };
cryptswap = { swap = {
size = "70G"; size = "70G";
type = "8300"; type = "8200";
content = {
type = "luks";
name = "cryptswap";
passwordFile = "/tmp/secret.key";
content = { content = {
type = "swap"; type = "swap";
resumeDevice = true; resumeDevice = true;
}; };
}; };
};
cryptroot = { cryptroot = {
size = "100%"; size = "100%";
content = { content = {