Rebase to flake parts #11

modules/system/gaming.nix

@@ -7,13 +7,13 @@
         with pkgs;
         [
           lutris
-          bottles
           wine
           winetricks
           gamemode
           mangohud
           goverlay
         ]
+        ++ lib.optionals cfg.launchers.enableBottles [ bottles ]
         ++ lib.optionals pkgs.stdenv.isx86_64 [ heroic ];
 
       steamExtraPkgs =
@@ -66,6 +66,19 @@
           description = "`programs.gamemode` (Feral GameMode).";
         };
 
+        gamescope = {
+          enable = lib.mkEnableOption ''
+            `programs.gamescope` — isolated compositor for Steam/Proton on Wayland
+            (fixes games embedding inside the Steam window).
+          '';
+
+          capSysNice = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Allow gamescope to renice itself for smoother frame pacing.";
+          };
+        };
+
         jack.enable = lib.mkOption {
           type = lib.types.bool;
           default = true;
@@ -76,6 +89,11 @@
         };
 
         launchers = {
+          enableBottles = lib.mkOption {
+            type = lib.types.bool;
+            default = true;
+            description = "Install native `pkgs.bottles` in the launcher bundle.";
+          };
           forUsers = lib.mkOption {
             type = lib.types.nullOr (lib.types.listOf lib.types.str);
             default = null;
@@ -93,6 +111,17 @@
 
       config = lib.mkIf cfg.enable (lib.mkMerge [
         {
+          # openldap's upstream test suite is flaky in the Nix sandbox (test017, test001, …).
+          # Disabling checks avoids cascading failures in lutris, apache, gnupg, nfs-utils, etc.
+          # Upstream: https://github.com/NixOS/nixpkgs/issues/514113
+          nixpkgs.overlays = [
+            (_: prev: {
+              openldap = prev.openldap.overrideAttrs (_: {
+                doCheck = false;
+              });
+            })
+          ];
+
           programs.steam = {
             enable = true;
             remotePlay.openFirewall = cfg.steam.remotePlay.openFirewall;
@@ -106,6 +135,11 @@
 
           programs.gamemode.enable = cfg.gamemode.enable;
 
+          programs.gamescope = lib.mkIf cfg.gamescope.enable {
+            enable = true;
+            inherit (cfg.gamescope) capSysNice;
+          };
+
           chiasson.system.audio.pipewire.jack.enable = lib.mkIf (cfg.jack.enable) (lib.mkDefault true);
 
           assertions = [