From d2426b4291bb5ee5df71020f72db3ac17c42bfd9 Mon Sep 17 00:00:00 2001 From: "Alexander \"PapaTutuWawa" Date: Sun, 17 Sep 2023 13:35:25 +0200 Subject: [PATCH] gaming: Allow gamescope to run with CAPSYSNICE --- flake.lock | 64 +++++++++---------- flake.nix | 2 +- modules/programs/gaming/default.nix | 9 ++- packages/temp/gamescope.nix | 96 ----------------------------- 4 files changed, 39 insertions(+), 132 deletions(-) delete mode 100644 packages/temp/gamescope.nix diff --git a/flake.lock b/flake.lock index 0bddacc..df67221 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1689700121, - "narHash": "sha256-YoKqbhyIQUCF7hGQNABMvcSfc9IgIFyxa6ZRInD5W+Q=", + "lastModified": 1693879203, + "narHash": "sha256-0CGMa3MxeG3YsVetUtxg6eZumQIe8FJ+WHVfR2ko9zM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bb06a68dba7b316472dab0a7255a3ea21be45812", + "rev": "3adaef3b1bebdc244a03ee19f705f5a3190a33d9", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -175,11 +175,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1689495092, - "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=", + "lastModified": 1693859358, + "narHash": "sha256-r3Pak/ao3p8weTzR+Ry3qQrfRsmSOwWW5sAe73mrYKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382", + "rev": "886ea1d213efd1082f419d066e89ef37635dc970", "type": "github" }, "original": { @@ -387,11 +387,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1689320556, - "narHash": "sha256-vODUkZLWFVCvo1KPK3dC2CbXjxa9antEn5ozwlcTr48=", + "lastModified": 1693718952, + "narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d4ea64f2063820120c05f6ba93ee02e6d4671d6b", + "rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35", "type": "github" }, "original": { @@ -419,11 +419,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689534811, - "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", + "lastModified": 1693663421, + "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", + "rev": "e56990880811a451abd32515698c712788be5720", "type": "github" }, "original": { @@ -435,11 +435,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1689605451, - "narHash": "sha256-u2qp2k9V1smCfk6rdUcgMKvBj3G9jVvaPHyeXinjN9E=", + "lastModified": 1693771906, + "narHash": "sha256-32EnPCaVjOiEERZ+o/2Ir7JH9pkfwJZJ27SKHNvt4yk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "53657afe29748b3e462f1f892287b7e254c26d77", + "rev": "da5adce0ffaff10f6d0fee72a02a5ed9d01b52fc", "type": "github" }, "original": { @@ -467,15 +467,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1689373857, - "narHash": "sha256-mtBksyvhhT98Zsm9tYHuMKuLwUKDwv+BGTl6K5nOGhY=", - "owner": "nixos", + "lastModified": 1693565476, + "narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfdbcc428f365071f0ca3888f6ec8c25c3792885", + "rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -483,11 +483,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1689534811, - "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", + "lastModified": 1693663421, + "narHash": "sha256-ImMIlWE/idjcZAfxKK8sQA7A1Gi/O58u5/CJA+mxvl8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", + "rev": "e56990880811a451abd32515698c712788be5720", "type": "github" }, "original": { @@ -589,11 +589,11 @@ }, "nur": { "locked": { - "lastModified": 1689705562, - "narHash": "sha256-5++xa1AWV9tl8LWGdKzVaRNcdjM5Svhyv4Bjhfwk3B8=", + "lastModified": 1693907142, + "narHash": "sha256-U3yzshaxSUAC6Hy5xGmlX1TySHoWjH++Y2cC9ujEmZc=", "owner": "nix-community", "repo": "nur", - "rev": "092ea7443f334c362cc5429612846f6193a7de11", + "rev": "283964d2452632c9b0ccc8eff08d242a073b022f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a1311d7..9c0b624 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,7 @@ ]; }; in { - inherit (pkgs) wayqt dfl-ipc dfl-applications dfl-utils qtgreet xwaylandvideobridge obs-cli rgb_keyboard prismlauncher-wrapped; + inherit (pkgs) wayqt dfl-ipc dfl-applications dfl-utils qtgreet xwaylandvideobridge obs-cli rgb_keyboard prismlauncher-wrapped anime4k; }; }); } diff --git a/modules/programs/gaming/default.nix b/modules/programs/gaming/default.nix index 1c9ce58..be979ae 100644 --- a/modules/programs/gaming/default.nix +++ b/modules/programs/gaming/default.nix @@ -37,13 +37,16 @@ in { # Gameplay clip editing kdenlive - # Better experience - gamescope - # Performance corectrl ]; + programs.gamescope = { + enable = true; + capSysNice = true; + args = ["--rt"]; + }; + # security.wrappers.gamescope = { # owner = "alexander"; # group = "alexander"; diff --git a/packages/temp/gamescope.nix b/packages/temp/gamescope.nix deleted file mode 100644 index df1da20..0000000 --- a/packages/temp/gamescope.nix +++ /dev/null @@ -1,96 +0,0 @@ -# From https://github.com/Jovian-Experiments/Jovian-NixOS/blob/d27526e7917671ad3a64f823f4b95b761f96807d/pkgs/gamescope/default.nix -{ stdenv -, fetchFromGitHub - -, meson -, pkg-config -, cmake -, ninja - -, xorg -, libdrm -, vulkan-loader -, wayland -, wayland-protocols -, libxkbcommon -, libcap -, SDL2 -, pipewire -, mesa -, udev -, pixman -, libinput -, libseat -, xwayland -, glslang - -, stb -, wlroots -, libliftoff -}: - -let -in -stdenv.mkDerivation { - pname = "gamescope"; - version = "3.11.28-beta4"; - src = fetchFromGitHub { - owner = "Plagman"; - repo = "gamescope"; - rev = "refs/tags/3.11.28-beta4"; - hash = "sha256-3L3bQIPPfScvtN1dduh10dQu/AuTmD4dHNp3JjBIBLA="; - }; - - buildInputs = [ - xorg.libX11 - xorg.libXdamage - xorg.libXcomposite - xorg.libXrender - xorg.libXext - xorg.libXxf86vm - xorg.libXtst - xorg.libXres - libdrm - vulkan-loader - wayland - wayland-protocols - libxkbcommon - libcap - SDL2 - pipewire - mesa - udev - pixman - libinput - libseat - xwayland - xorg.xcbutilwm - xorg.xcbutilerrors - glslang - xorg.libXi - ]; - - prePatch = '' - echo ":: Copying stb" - cp -vr "${stb.src}" subprojects/stb - chmod -R +w subprojects/stb - cp "subprojects/packagefiles/stb/meson.build" "subprojects/stb/" - echo ":: Copying wlroots" - rmdir subprojects/wlroots - cp -vr "${wlroots.src}" subprojects/wlroots - chmod -R +w subprojects/wlroots - echo ":: Copying libliftoff" - rmdir subprojects/libliftoff - cp -vr "${libliftoff.src}" subprojects/libliftoff - chmod -R +w subprojects/libliftoff - ''; - - nativeBuildInputs = [ - cmake - meson - pkg-config - ninja - ]; - - dontUseCmakeConfigure = true; -}