diff --git a/hosts/architect/sunshine.nix b/hosts/architect/sunshine.nix index cbdf62f..250db37 100644 --- a/hosts/architect/sunshine.nix +++ b/hosts/architect/sunshine.nix @@ -30,7 +30,24 @@ let executable = true; destination = "/bin/resolution.sh"; }; - sunshinePkg = (pkgs.localPkgs.sunshine.override { cudaSupport = true; cudaPackages = pkgs.cudaPackages_12_3; boost = pkgs.boost186; }); + sunshinePkg = (pkgs.localPkgs.sunshine.override { cudaSupport = true; cudaPackages = pkgs.cudaPackages_12_4; boost = pkgs.boost186; }); + gamescopeArgs = [ + "--immediate-flips" + "--rt" + "-C" + "3000" + "-f" + "--hdr-enabled" + "-e" + "-W" + "\${SUNSHINE_CLIENT_WIDTH}" + "-H" + "\${SUNSHINE_CLIENT_HEIGHT}" + "-r" + "\${SUNSHINE_CLIENT_FPS}" + ]; + + gamescopeArgsStr = builtins.concatStringsSep " " gamescopeArgs; in { boot.kernelModules = [ "uinput" ]; @@ -51,7 +68,6 @@ in programs.steam = { enable = true; - gamescopeSession.enable = true; }; security = { @@ -102,7 +118,7 @@ in apps = [ { name = "Steam"; - cmd = ''${pkgs.bash}/bin/bash -c "${pkgs.gamescope}/bin/gamescope --immediate-flips --rt -C 3000 -f --hdr-enabled -e -W ''${SUNSHINE_CLIENT_WIDTH} -H ''${SUNSHINE_CLIENT_HEIGHT} -r ''${SUNSHINE_CLIENT_FPS} -- ${pkgs.steam}/bin/steam"''; + cmd = ''${pkgs.bash}/bin/bash -c "${pkgs.gamescope}/bin/gamescope ${gamescopeArgsStr} -- ${pkgs.steam}/bin/steam"''; prep-cmd = [ { do = ''${pkgs.bash}/bin/bash -c "${resolutionScript}/bin/resolution.sh ''${SUNSHINE_CLIENT_WIDTH} ''${SUNSHINE_CLIENT_HEIGHT}" ''${SUNSHINE_CLIENT_FPS}"'';