diff --git a/clients/quadphone/fde.nix b/clients/quadphone/fde.nix new file mode 100644 index 0000000..7cf6c72 --- /dev/null +++ b/clients/quadphone/fde.nix @@ -0,0 +1,14 @@ +{ + # The image is built with an empty LUKS passphrase (systemd-repart can't take a + # key file through the NixOS image builder). After flashing, set a real passphrase + # and rotate the volume key, since the image's key is sitting in the nix store: + # run0 systemd-cryptenroll --password --wipe-slot=empty /dev/disk/by-partlabel/nixos + # run0 cryptsetup reencrypt /dev/disk/by-partlabel/nixos + image.repart.partitions."30-root".repartConfig.Encrypt = "key-file"; + + boot.initrd = { + luks.forceLuksSupportInInitrd = true; + availableKernelModules = [ "msm" ]; + unl0kr.enable = true; + }; +} diff --git a/clients/quadtop/disko.nix b/clients/quadtop/disko.nix new file mode 100644 index 0000000..22fd73e --- /dev/null +++ b/clients/quadtop/disko.nix @@ -0,0 +1,36 @@ +{ inputs, ... }: +{ + imports = [ inputs.disko.nixosModules.disko ]; + disko.devices.disk.main = { + type = "disk"; + device = "/dev/nvme0n1"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "1G"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "umask=0077" ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "cryptroot"; + settings.allowDiscards = true; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + }; + }; + }; + }; + }; +} diff --git a/clients/quadtop/hardware-configuration.nix b/clients/quadtop/hardware-configuration.nix index 1e051cc..b3e0eb8 100755 --- a/clients/quadtop/hardware-configuration.nix +++ b/clients/quadtop/hardware-configuration.nix @@ -14,17 +14,5 @@ extraModulePackages = [ ]; }; - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/15598217-e3e1-4922-b336-8e9f62fad939"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-uuid/C6EC-B430"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - }; - hardware.cpu.intel.updateMicrocode = true; }