From 3f9313fa7d4c3803e849f4c108b820f924db1ed2 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Wed, 30 Jul 2025 22:21:30 +0200
Subject: athena: Adapt to wayland config changes

---
 host/hardware/athena.nix | 24 ++++++++++++++++++++----
 host/hardware/atlas.nix  |  1 -
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'host/hardware')

diff --git a/host/hardware/athena.nix b/host/hardware/athena.nix
index 508507a..53b36cf 100644
--- a/host/hardware/athena.nix
+++ b/host/hardware/athena.nix
@@ -8,10 +8,26 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-intel" "fuse" ];
-  boot.extraModulePackages = [ ];
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+    initrd.kernelModules = [ "dm-snapshot" ];
+    kernelModules = [ "kvm-intel" "fuse" ];
+    extraModulePackages = [ ];
+    kernelParams = [ "nvidia-drm.modeset=1" ];
+
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+
+    initrd.luks.devices = {
+      encrypted = {
+        device = "/dev/nvme0n1p2";
+        preLVM        = true;
+        allowDiscards = true;
+      };
+    };
+  };
 
   fileSystems."/" =
     { device = "/dev/disk/by-uuid/3af135f5-9bfe-4ab4-abb3-2e93caad08ea";
diff --git a/host/hardware/atlas.nix b/host/hardware/atlas.nix
index a2f2faf..c5a0382 100644
--- a/host/hardware/atlas.nix
+++ b/host/hardware/atlas.nix
@@ -8,7 +8,6 @@
     extraModulePackages = [ ];
     kernelParams = [ "nvidia-drm.modeset=1" ];
 
-
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
-- 
cgit v1.2.3