From 5b0253a6e4909a548048736cc30fb8344ef9eee5 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Tue, 17 Sep 2024 21:48:47 -0700
Subject: modules: enable gaming

---
 modules/software/default.nix                 |  2 +-
 modules/software/gaming.nix                  | 42 ++++++++++++++++++----------
 modules/software/multimedia/video/nvidia.nix |  1 +
 modules/variables/wayland.nix                |  2 +-
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/modules/software/default.nix b/modules/software/default.nix
index b63d9d9..fa39b3b 100644
--- a/modules/software/default.nix
+++ b/modules/software/default.nix
@@ -8,7 +8,7 @@
     ./services
     ./aagl.nix
     ./encryption.nix
-    # ./gaming.nix
+    ./gaming.nix
     ./input.nix
     ./locale.nix
     ./programs.nix
diff --git a/modules/software/gaming.nix b/modules/software/gaming.nix
index 790a94e..675aee9 100644
--- a/modules/software/gaming.nix
+++ b/modules/software/gaming.nix
@@ -1,26 +1,38 @@
 { pkgs, ... }:
-let
-  openFirewall = false;
-in
 {
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = openFirewall;
-    localNetworkGameTransfers.openFirewall = openFirewall;
-    dedicatedServer.openFirewall = openFirewall;
-    extest.enable = true;
+  programs = {
+    steam =
+      let
+        openFirewall = false;
+      in
+      {
+        enable = true;
+        remotePlay.openFirewall = openFirewall;
+        localNetworkGameTransfers.openFirewall = openFirewall;
+        dedicatedServer.openFirewall = openFirewall;
+        extest.enable = true;
+        # gamescopeSession.enable = true;
 
-    package = pkgs.steam.override { extraEnv.MANGOHUD = true; };
-  };
+        package = pkgs.steam-small.override {
+          extraEnv = {
+            MANGOHUD = true;
+            # SDL_VIDEODRIVER = "x11";
+          };
+        };
+
+        extraCompatPackages = [ pkgs.proton-ge-bin.steamcompattool ];
+      };
+
+    gamemode = {
+      enable = true;
+      enableRenice = false;
+    };
 
-  programs.gamemode = {
-    enable = true;
-    enableRenice = false;
+    gamescope.enable = true;
   };
 
   environment.systemPackages = with pkgs; [
     mangohud
-    gamescope
     steamtinkerlaunch
   ];
 }
diff --git a/modules/software/multimedia/video/nvidia.nix b/modules/software/multimedia/video/nvidia.nix
index bc8cb22..c133bc2 100644
--- a/modules/software/multimedia/video/nvidia.nix
+++ b/modules/software/multimedia/video/nvidia.nix
@@ -14,6 +14,7 @@
 
     kernelParams = [
       "nvidia-drm.fbdev=1"
+      "nvidia-drm.modeset=1"
       "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
     ];
   };
diff --git a/modules/variables/wayland.nix b/modules/variables/wayland.nix
index c1a51d9..ee21d52 100644
--- a/modules/variables/wayland.nix
+++ b/modules/variables/wayland.nix
@@ -3,7 +3,7 @@
     GDK_BACKEND = "wayland,x11,*";
     SDL_VIDEODRIVER = "wayland";
     CLUTTER_BACKEND = "wayland";
-    XWAYLAND_NO_GLAMOR = "1"; # Gamescope
+    XWAYLAND_NO_GLAMOR = "0"; # Gamescope
     ANKI_WAYLAND = "1";
     XDG_SESSION_TYPE = "wayland";
   };
-- 
cgit v1.2.3