From b582a7d707cb6c8bc4d7b8b229bcade4c68eb86d Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Fri, 4 Apr 2025 19:31:08 -0400
Subject: [PATCH 1/3] Fix boot take 2

---
 nixos/machines/swarm/hardware.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/machines/swarm/hardware.nix b/nixos/machines/swarm/hardware.nix
index 4a4bb21..5e1a780 100644
--- a/nixos/machines/swarm/hardware.nix
+++ b/nixos/machines/swarm/hardware.nix
@@ -13,7 +13,7 @@
   ];
 
   boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = ["dm-snapshot" "cryptd" "pinctrl_icelake" "surface_aggregator" "surface_aggregator_registry" "surface_aggregator_hub" "surface_hid_core" "8250_dw" "surface_hid"];
+  boot.initrd.kernelModules = ["dm-snapshot" "cryptd" "pinctrl_icelake" "intel_lpss" "intel_lpss_pci" "surface_aggregator" "surface_aggregator_registry" "surface_aggregator_hub" "surface_hid_core" "8250_dw" "surface_hid"];
   boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/f16ca8aa-f596-4876-ba82-7427da9afaba";
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];

From 1414086642b220dc720453ad4a9fdb951299687b Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Fri, 4 Apr 2025 19:49:45 -0400
Subject: [PATCH 2/3] Another go at fixing the boot

---
 nixos/machines/swarm/hardware.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/nixos/machines/swarm/hardware.nix b/nixos/machines/swarm/hardware.nix
index 5e1a780..09610fe 100644
--- a/nixos/machines/swarm/hardware.nix
+++ b/nixos/machines/swarm/hardware.nix
@@ -12,8 +12,24 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"];
-  boot.initrd.kernelModules = ["dm-snapshot" "cryptd" "pinctrl_icelake" "intel_lpss" "intel_lpss_pci" "surface_aggregator" "surface_aggregator_registry" "surface_aggregator_hub" "surface_hid_core" "8250_dw" "surface_hid"];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "nvme"
+    "usb_storage"
+    "sd_mod"
+  ];
+  boot.initrd.kernelModules = [
+    "dm-snapshot"
+    "cryptd"
+    "intel_lpss"
+    "intel_lpss_pci"
+    "pinctrl_icelake"
+    "8250_dw"
+    "surface_hid_core"
+    "surface_hid"
+    "surface_aggregator_registry"
+    "surface_aggregator"
+  ];
   boot.initrd.luks.devices."crypt".device = "/dev/disk/by-uuid/f16ca8aa-f596-4876-ba82-7427da9afaba";
   boot.kernelModules = ["kvm-intel"];
   boot.extraModulePackages = [];

From 4f98c37286271a630e12009dfa1e97cc090bbdf3 Mon Sep 17 00:00:00 2001
From: Nathan McCarty <thatonelutenist@stranger.systems>
Date: Fri, 4 Apr 2025 19:53:05 -0400
Subject: [PATCH 3/3] TPM support

---
 nixos/machines/swarm/configuration.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/machines/swarm/configuration.nix b/nixos/machines/swarm/configuration.nix
index 07493f2..29c80e9 100644
--- a/nixos/machines/swarm/configuration.nix
+++ b/nixos/machines/swarm/configuration.nix
@@ -60,6 +60,7 @@
     plymouth = {
       enable = true;
     };
+    initrd.systemd.enable = true;
   };
 
   networking.hostName = "swarm"; # Define your hostname.
@@ -141,6 +142,8 @@
     iptsd
     surface-control
     wl-clipboard
+    # for tpm backed encryption
+    tpm2-tss
     # Podman
     podman-desktop
     podman-compose