diff options
Diffstat (limited to 'hosts/thinkpad')
| -rw-r--r-- | hosts/thinkpad/configuration.nix | 12 | ||||
| -rw-r--r-- | hosts/thinkpad/disko.nix | 18 |
2 files changed, 9 insertions, 21 deletions
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix index f9d3f6c..5dd5b8f 100644 --- a/hosts/thinkpad/configuration.nix +++ b/hosts/thinkpad/configuration.nix @@ -14,7 +14,7 @@ ../../os/default.nix ]; - hardware.facter.reportPath = /etc/nixos/hosts/thinkpad/facter.json; + hardware.facter.reportPath = ./facter.json; os = { core = { @@ -84,16 +84,6 @@ }; boot = { kernelParams = [ "iomem=relaxed" ]; - initrd = { - secrets = { - "/etc/cryptsetup-keys.d/root.key" = "/etc/cryptsetup-keys.d/root.key"; - }; - luks.devices."crypted" = { - device = "/dev/nvme0n1p2"; - keyFile = "/etc/cryptsetup-keys.d/root.key"; - allowDiscards = true; - }; - }; }; services.thinkfan.enable = true; } diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix index 3ab76f4..0f366e9 100644 --- a/hosts/thinkpad/disko.nix +++ b/hosts/thinkpad/disko.nix @@ -11,6 +11,14 @@ size = "1M"; type = "EF02"; }; + boot = { + size = "2G"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/boot"; + }; + }; luks = { size = "100%"; content = { @@ -33,16 +41,6 @@ "noatime" ]; }; - "boot" = { - mountpoint = "/boot"; - mountOptions = [ - "compress=none" - "discard=async" - "nosuid" - "nodev" - "noatime" - ]; - }; "nix" = { mountpoint = "/nix"; mountOptions = [ |