diff --git a/flake.lock b/flake.lock index dc72d6b..70c37b9 100644 --- a/flake.lock +++ b/flake.lock @@ -52,7 +52,7 @@ "bypass-paywalls-clean": { "flake": false, "locked": { - "narHash": "sha256-OlHiORYigNwOncKNaaq/EDgWutnWbdt0AFXGeUpOoC4=", + "narHash": "sha256-VioYGvLdF8Nxdyu7Jcj3k0ufUUhTIo0v+R+u+goAXN4=", "type": "file", "url": "https://github.com/bpc-clone/bpc_updates/releases/download/latest/bypass_paywalls_clean-latest.xpi" }, @@ -483,19 +483,6 @@ "type": "github" } }, - "proton-ge": { - "flake": false, - "locked": { - "lastModified": 1710987994, - "narHash": "sha256-NqBzKonCYH+hNpVZzDhrVf+r2i6EwLG/IFBXjE2mC7s=", - "type": "tarball", - "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz" - } - }, "ren": { "flake": false, "locked": { @@ -555,7 +542,6 @@ "nvim-lspconfig-src": "nvim-lspconfig-src", "nvim-tree-lua-src": "nvim-tree-lua-src", "nvim-treesitter-src": "nvim-treesitter-src", - "proton-ge": "proton-ge", "ren": "ren", "rep": "rep", "telescope-nvim-src": "telescope-nvim-src", diff --git a/flake.nix b/flake.nix index 934e272..8348327 100644 --- a/flake.nix +++ b/flake.nix @@ -174,14 +174,6 @@ flake = false; }; - # GE version of Proton for game compatibility - # Alternatively, could consider using https://github.com/fufexan/nix-gaming - proton-ge = { - # https://github.com/GloriousEggroll/proton-ge-custom/releases - url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/GE-Proton9-2/GE-Proton9-2.tar.gz"; - flake = false; - }; - # Firefox addon from outside the extension store bypass-paywalls-clean = { # https://gitlab.com/magnolia1234/bpc-uploads/-/commits/master/?ref_type=HEADS @@ -260,7 +252,6 @@ (import ./overlays/mpv-scripts.nix inputs) (import ./overlays/nextcloud-apps.nix inputs) (import ./overlays/betterlockscreen.nix) - (import ./overlays/proton-ge.nix inputs) (import ./overlays/gh-collaborators.nix) (import ./overlays/bypass-paywalls-clean.nix inputs) (import ./overlays/ren-rep.nix inputs) diff --git a/modules/nixos/gaming/steam.nix b/modules/nixos/gaming/steam.nix index 3393455..3c917d4 100644 --- a/modules/nixos/gaming/steam.nix +++ b/modules/nixos/gaming/steam.nix @@ -20,13 +20,7 @@ programs.steam = { enable = true; remotePlay.openFirewall = true; - package = pkgs.steam.override { - # Adapted in part from: https://github.com/Shawn8901/nix-configuration/blob/1c48be94238a9f463cf0bbd1e1842a4454286514/modules/nixos/steam-compat-tools/default.nix - # Based on: https://github.com/NixOS/nixpkgs/issues/73323 - extraEnv = { - STEAM_EXTRA_COMPAT_TOOLS_PATHS = lib.makeBinPath [ pkgs.proton-ge-custom ]; - }; - }; + extraCompatPackages = [ pkgs.proton-ge-bin ]; }; environment.systemPackages = with pkgs; [ diff --git a/overlays/proton-ge.nix b/overlays/proton-ge.nix deleted file mode 100644 index 7471adc..0000000 --- a/overlays/proton-ge.nix +++ /dev/null @@ -1,20 +0,0 @@ -# Adapted from: -# https://github.com/Shawn8901/nix-configuration/blob/182a45a6b193143ff7ff8e78bb66f7b869ea48d4/packages/proton-ge-custom/default.nix -# Based on: https://github.com/NixOS/nixpkgs/issues/73323 - -inputs: _final: prev: { - proton-ge-custom = prev.stdenv.mkDerivation (finalAttrs: rec { - name = "proton-ge-custom"; - version = prev.lib.removeSuffix "\n" ( - builtins.head (builtins.match ".*GE-Proton(.*)" (builtins.readFile "${inputs.proton-ge}/version")) - ); - src = inputs.proton-ge; - # Took from https://github.com/AtaraxiaSjel/nur/blob/cf83b14b102985a587a498ba2c56f9f2bd9b9eb6/pkgs/proton-ge/default.nix - installPhase = '' - runHook preBuild - mkdir -p $out/bin - cp -r ${src}/* -t $out/bin/ - runHook postBuild - ''; - }); -}