host: Switch athena hardwarewayland

2 files changed, 22 insertions, 19 deletions

diff --git a/host/athena.nix b/host/athena.nix
index 8b86712..5f2f96d 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -23,7 +23,10 @@
         intelBusId  = "PCI:0:2:0";
         nvidiaBusId = "PCI:1:0:0";
       };
-      powerManagement.enable = true;
+      powerManagement = {
+        enable = true;
+        finegrained = false;
+      };
     };
 
     graphics.extraPackages = with pkgs; [
@@ -162,6 +165,5 @@
     };
   };
 
-
-  system.stateVersion = "21.11";
+  system.stateVersion = "25.05";
 }
diff --git a/host/hardware/athena.nix b/host/hardware/athena.nix
index f17d0cb..824f5aa 100644
--- a/host/hardware/athena.nix
+++ b/host/hardware/athena.nix
@@ -1,15 +1,10 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+    initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" ];
     initrd.kernelModules = [ "dm-snapshot" ];
     kernelModules = [ "kvm-intel" "fuse" "uinput" ];
     extraModulePackages = [ ];
@@ -21,28 +16,34 @@
     };
 
     initrd.luks.devices = {
-      encrypted = {
-        device = "/dev/nvme0n1p2";
-        preLVM        = true;
+      "luks-af20ad1e-9b06-41ec-b442-4b9f57db4f86" = {
+        device = "/dev/disk/by-uuid/af20ad1e-9b06-41ec-b442-4b9f57db4f86";
         allowDiscards = true;
       };
+      "luks-162de169-79b8-46e9-ac32-5b60f6e0fdb5" = {
+        device = "/dev/disk/by-uuid/162de169-79b8-46e9-ac32-5b60f6e0fdb5";
+        allowDiscards = true;
+        bypassWorkqueues = true;
+      };
     };
   };
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/3af135f5-9bfe-4ab4-abb3-2e93caad08ea";
+    { device = "/dev/disk/by-uuid/0e887aeb-a331-41c4-946e-167407349808";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/6290-9BB5";
+    { device = "/dev/disk/by-uuid/2B78-6617";
       fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/b3845af4-030a-4bba-bad8-89c548bde40f"; }
-    ];
+  swapDevices = [ { device = "/dev/mapper/luks-162de169-79b8-46e9-ac32-5b60f6e0fdb5"; } ];
+  boot.resumeDevice = "/dev/mapper/luks-162de169-79b8-46e9-ac32-5b60f6e0fdb5";
 
-  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  networking.useDHCP = lib.mkDefault true;
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.ipu6 = { enable = true; platform = "ipu6ep"; };
 }