From fe853aa331abd5d78555857dd861752af62f029f Mon Sep 17 00:00:00 2001
From: Christian Harke <christian@harke.ch>
Date: Sat, 23 Sep 2023 21:39:15 +0200
Subject: [PATCH] Remove some duplicate steam-specific options and add libGL
 dependency

---
 nixos/roles/gaming/default.nix   | 22 ++++++++++++----------
 nixos/roles/steambox/default.nix |  2 --
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/roles/gaming/default.nix b/nixos/roles/gaming/default.nix
index 452c5670..e5dcbcac 100644
--- a/nixos/roles/gaming/default.nix
+++ b/nixos/roles/gaming/default.nix
@@ -16,19 +16,21 @@ in
   };
 
   config = mkIf cfg.enable {
-    # open ports for steam stream and some games
-    networking.firewall.allowedTCPPorts = [ 27036 27037 ] ++ (range 27015 27030);
-    networking.firewall.allowedUDPPorts = [ 4380 27036 ] ++ (range 27000 27031);
-
-    programs.steam.enable = true;
+    programs.steam = {
+      enable = true;
+      dedicatedServer.openFirewall = true;
+      remotePlay.openFirewall = true;
+    };
 
-    # Gaming 32bit
-    #hardware.opengl.driSupport32Bit = true;
-    #hardware.opengl.extraPackages32 = with pkgs.pkgsi686Linux; [ libva ];
-    #hardware.pulseaudio.support32Bit = true;
+    nixpkgs.config.packageOverrides = pkgs: {
+      steam = pkgs.steam.override {
+        extraPkgs = pkgs: with pkgs; [
+          libGL
+        ];
+      };
+    };
 
     # Xbox controller
     hardware.xpadneo.enable = true;
-    #boot.extraModprobeConfig = '' options bluetooth disable_ertm=1 '';
   };
 }
diff --git a/nixos/roles/steambox/default.nix b/nixos/roles/steambox/default.nix
index 2acf9677..e587398c 100644
--- a/nixos/roles/steambox/default.nix
+++ b/nixos/roles/steambox/default.nix
@@ -36,8 +36,6 @@ in
       firefox
     ];
 
-    hardware.opengl.driSupport32Bit = true;
-
     # Enable the KDE Desktop Environment.
     services.xserver = {
       enable = true;