diff --git a/gaming/hm.nix b/gaming/hm.nix index 6f85c48..9c12e96 100644 --- a/gaming/hm.nix +++ b/gaming/hm.nix @@ -25,14 +25,4 @@ #recursive = true; }; }; - - home.activation = { - proton-ge = lib.hm.dag.entryAfter [ "writeBoundary" ] '' - target="${config.home.homeDirectory}/.steam/root/compatibilitytools.d/Proton-${lib.getVersion pkgs.proton-ge}" - if ! [ -d "$target" ]; then - cp -R ${pkgs.proton-ge} "$target" - chmod -R u+w "$target" - fi - ''; - }; } diff --git a/gaming/nixos.nix b/gaming/nixos.nix index 0d67d44..17af315 100644 --- a/gaming/nixos.nix +++ b/gaming/nixos.nix @@ -8,6 +8,9 @@ enable = true; remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; + extraCompatPackages = with pkgs; [ + proton-ge-bin + ]; }; hardware.steam-hardware.enable = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index ea85fc6..6865016 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -13,7 +13,6 @@ simulationcraft = pkgs.callPackage ./simulationcraft.nix { simulationcraft-src = inputs.simulationcraft; }; - proton-ge = pkgs.callPackage ./proton-ge.nix { }; hbw = pkgs.callPackage ./hbw { }; kabalist_cli = pkgs.callPackage ./kabalist.nix { naersk = naersk'; diff --git a/pkgs/proton-ge.nix b/pkgs/proton-ge.nix deleted file mode 100644 index 0dfb831..0000000 --- a/pkgs/proton-ge.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { - pname = "proton-ge"; - version = "9-4"; - - src = fetchFromGitHub { - owner = "GloriousEggroll"; - repo = "proton-ge-custom"; - rev = "refs/tags/GE-Proton${version}"; - hash = "sha256-tg+ElIoPhchedHwofRArZ0ds9xF1LSrIFTBxoFm4btg="; - }; - - installPhase = '' - mkdir -p $out - mv * $out/ - ''; -}