diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix index 93eb8518..adda4f94 100644 --- a/nixos/hosts/nixos-framework/default.nix +++ b/nixos/hosts/nixos-framework/default.nix @@ -2,11 +2,11 @@ imports = [ inputs.nixos-hardware.nixosModules.framework-13-7040-amd (modulesPath + "/installer/scan/not-detected.nix") - ./disks-gpt.nix + ./disks.nix ./syncthing.nix ../../common/services/tailscale-autoconnect.nix - ../../common/modules/secureboot.nix - # ../../common/modules/boot.nix + # ../../common/modules/secureboot.nix + ../../common/modules/boot.nix ../../common/modules/udev-rules.nix ../../common/services/podman.nix ]; diff --git a/nixos/hosts/nixos-framework/disks-gpt.nix b/nixos/hosts/nixos-framework/disks-gpt.nix index bffd8e36..e986ca1a 100644 --- a/nixos/hosts/nixos-framework/disks-gpt.nix +++ b/nixos/hosts/nixos-framework/disks-gpt.nix @@ -5,10 +5,10 @@ services.btrfs.autoScrub.interval = "weekly"; boot.resumeDevice = "/dev/mapper/ROOT"; - boot.kernelParams = [ "resume_offset=533760" ]; # https://sawyershepherd.org/post/hibernating-to-an-encrypted-swapfile-on-btrfs-with-nixos/ + boot.kernelParams = [ "resume_offset=533760" ]; - disko.devices.disk.nvme0 = { + disko.devices.disk.nvme0n1 = { type = "disk"; device = "/dev/nvme0n1"; content = {