From 30ffdf6a2ff8cbd3a4e98ec4edd16486bbb7575f Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Tue, 24 Mar 2026 23:20:08 +0100
Subject: [PATCH] fix(stellaris): stabilize hybrid GPU stack for Wayland/Proton
 and fix external monitor mode

---
 hosts/stellaris/default.nix                |  7 +------
 hosts/stellaris/hardware-configuration.nix | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/hosts/stellaris/default.nix b/hosts/stellaris/default.nix
index 29ae73b..9fcfd14 100644
--- a/hosts/stellaris/default.nix
+++ b/hosts/stellaris/default.nix
@@ -66,14 +66,9 @@
       services.network-manager-applet.enable = true;
       services.blueman-applet.enable = true;
       wayland.windowManager.hyprland.settings = {
-        env = [
-          "LIBVA_DRIVER_NAME,nvidia"
-          "__GLX_VENDOR_LIBRARY_NAME,nvidia"
-        ];
-
         monitor = [
           "eDP-1, 2560x1600@240, 0x0, 1.6"
-          "desc:Microstep MPG321UX OLED 0x01010101, @239.99001, auto-right, 1.6"
+          "desc:Microstep MPG321UX OLED 0x01010101, 3840x2160@239.99001, auto-right, 1.6"
           ", preferred, auto, 1"
         ];
 
diff --git a/hosts/stellaris/hardware-configuration.nix b/hosts/stellaris/hardware-configuration.nix
index 6acd67d..063d643 100644
--- a/hosts/stellaris/hardware-configuration.nix
+++ b/hosts/stellaris/hardware-configuration.nix
@@ -20,7 +20,14 @@
     "sdhci_pci"
   ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [
+    "kvm-amd"
+    "amdgpu"
+    "nvidia"
+    "nvidia_drm"
+    "nvidia_uvm"
+  ];
+  boot.kernelParams = [ "nvidia-drm.modeset=1" ];
   boot.extraModulePackages = [ ];
 
   boot.loader.systemd-boot.enable = true;
@@ -76,18 +83,20 @@
     "nvidia"
   ];
 
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
   hardware.nvidia = {
     modesetting.enable = true;
     powerManagement.enable = false;
-    powerManagement.finegrained = true;
+    powerManagement.finegrained = false;
     open = true;
     nvidiaSettings = true;
     package = config.boot.kernelPackages.nvidiaPackages.stable;
     prime = {
-      offload = {
-        enable = true;
-        enableOffloadCmd = true;
-      };
+      sync.enable = true;
       # nix run github:eclairevoyant/pcids
       amdgpuBusId = "PCI:7:0:0";
       nvidiaBusId = "PCI:1:0:0";