Update, tweak athena

4 files changed, 34 insertions, 21 deletions

diff --git a/flake.lock b/flake.lock
index 62b0bb4..0a20770 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761173472,
-        "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
+        "lastModified": 1764983851,
+        "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
+        "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index d2de617..7896b76 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "System environment of Adrian Kummerlaender";
 
   inputs = {
-    nixpkgs.url = github:NixOS/nixpkgs/nixos-25.05;
+    nixpkgs.url = github:NixOS/nixpkgs/nixos-25.11;
     pkgs-personal.url = github:KnairdA/pkgs/master;
   };
 
diff --git a/host/athena.nix b/host/athena.nix
index 5f2f96d..fc6c4ea 100644
--- a/host/athena.nix
+++ b/host/athena.nix
@@ -17,21 +17,29 @@
     nvidia = {
       open = true;
       package = pkgs.linuxPackages.nvidia_x11;
+      nvidiaSettings = true;
+
       prime = {
-        offload.enable = true;
+        offload = {
+          enable = true;
+          enableOffloadCmd = true;
+        };
 
-        intelBusId  = "PCI:0:2:0";
         nvidiaBusId = "PCI:1:0:0";
+        intelBusId  = "PCI:0:2:0";
       };
+
       powerManagement = {
         enable = true;
-        finegrained = false;
       };
     };
 
     graphics.extraPackages = with pkgs; [
       libva
       intel-media-driver
+      intel-vaapi-driver
+      libva-vdpau-driver
+      libvdpau-va-gl
     ];
 
     nvidia-container-toolkit.enable = true;
@@ -40,17 +48,9 @@
   environment.systemPackages = with pkgs; [
     zenith-nvidia
     virt-manager
-    (writeScriptBin "nvidia-offload" ''
-      export __NV_PRIME_RENDER_OFFLOAD=1
-      export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
-      export __GLX_VENDOR_LIBRARY_NAME=nvidia
-      export __VK_LAYER_NV_optimus=NVIDIA_only
-      exec -a "$0" "$@"
-    '')
 
     nvidia-vaapi-driver
-    intel-media-driver
-    vaapiVdpau
+    libva-vdpau-driver
     libvdpau-va-gl
   ];
 
diff --git a/host/hardware/athena.nix b/host/hardware/athena.nix
index 1628202..af70d34 100644
--- a/host/hardware/athena.nix
+++ b/host/hardware/athena.nix
@@ -22,6 +22,7 @@ let
         cp firmware/ivsc_fw.bin $out/lib/firmware/vsc/soc_a1_prod/ivsc_fw_a1_prod.bin
       '';
     };
+
 in {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
@@ -30,9 +31,19 @@ in {
   boot = {
     initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "usb_storage" "sd_mod" "i915" ];
     initrd.kernelModules = [ "dm-snapshot" ];
-    kernelModules = [ "kvm-intel" "fuse" "uinput" ];
-    extraModulePackages = [ ];
-    kernelParams = [ "nvidia-drm.modeset=1" "mem_sleep_default=deep" "i915.enable_psr=0" ];
+    kernelModules = [ "kvm-intel" "fuse" "uinput" "v4l2loopback" ];
+    blacklistedKernelModules = [ "ucsi_acpi" ];
+    extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+    kernelParams = [
+      "nvidia-drm.modeset=1"
+
+      "video=eDP-1:e"
+      "i915.enable_psr=0"
+
+      "mem_sleep_default=deep"
+      "pcie_aspm=force"
+      "nvme.noacpi=1"
+    ];
 
     loader = {
       systemd-boot.enable = true;
@@ -72,11 +83,13 @@ in {
 
   hardware.ipu6 = {
     enable = true;
-    platform = "ipu6ep";
+    #platform = "ipu6ep";
+    platform = "ipu6epmtl"; # "mtl" specifically for Meteor Lake (Precision 5490)
   };
 
   hardware.firmware = [
     ivsc-firmware
+    pkgs.linux-firmware
   ];
 
   environment.systemPackages = with pkgs; [