nixos/nvk: update to mesa 24.0.0

1 files changed, 15 insertions, 12 deletions

diff --git a/modules/nixos/features/nvk/default.nix b/modules/nixos/features/nvk/default.nix
index 9e641ec..977dd3b 100644
--- a/modules/nixos/features/nvk/default.nix
+++ b/modules/nixos/features/nvk/default.nix
@@ -11,6 +11,17 @@ in {
   options.features.nvk.enable = lib.mkEnableOption "nvk";
 
   config = lib.mkIf cfg.enable {
+    # make sure we're loading new gsp firmware
+    boot.kernelParams = [
+      "nouveau.config=NvGspRm=1"
+      "nouveau.debug=info,VBIOS=info,gsp=debug"
+    ];
+
+    environment.sessionVariables = {
+      # (fake) advertise vk 1.3
+      MESA_VK_VERSION_OVERRIDE = "1.3";
+    };
+
     hardware.opengl = {
       package = mesa.drivers;
       package32 = mesa32.drivers;
@@ -18,20 +29,12 @@ in {
 
     system.replaceRuntimeDependencies = [
       {
-        original = pkgs.mesa;
-        replacement = mesa;
-      }
-      {
-        original = pkgs.mesa.drivers;
-        replacement = mesa.drivers;
-      }
-      {
-        original = pkgs.pkgsi686Linux.mesa;
-        replacement = mesa32;
+        original = pkgs.mesa.out;
+        replacement = mesa.out;
       }
       {
-        original = pkgs.pkgsi686Linux.mesa.drivers;
-        replacement = mesa32.drivers;
+        original = pkgs.pkgsi686Linux.mesa.out;
+        replacement = mesa32.out;
       }
     ];
   };