From f0343bf17329ec6d0128510fc23be87cedf7cbf7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Oct 2024 13:11:15 -0400 Subject: [PATCH] edit config to reflect protontricks update --- home-manager/flake.nix | 12 ------------ home-manager/system-nixos.nix | 28 +--------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 09cf59d..4e524d3 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -34,18 +34,6 @@ url = "github:ch4og/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # sources to patch protontricks as it doesn't work with latest steam beta - # https://github.com/Matoking/protontricks/issues/304#issuecomment-2280920826 - protontricks = { - url = "github:Matoking/protontricks/appinfo_v29"; - flake = false; - }; - - vdf-patch = { - url = "github:Matoking/vdf/support_new_bvdf"; - flake = false; - }; }; outputs = diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 4c0cb8c..35a6808 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -8,34 +8,8 @@ imports = [ ./gui.nix ]; nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = [ - # Add a protontricks-beta package so we can use protontricks with latest steam beta - # https://github.com/Matoking/protontricks/issues/304#issuecomment-2280920826 - - # nixpkgs update: https://github.com/NixOS/nixpkgs/pull/343068 - ( - final: prev: - let - ps = prev.python312Packages; - in - { - vdf-patch = ps.vdf.overrideAttrs (oldAttrs: { - src = inputs.vdf-patch; - }); - protontricks-beta = prev.protontricks.overrideAttrs (oldAttrs: { - src = inputs.protontricks; - propagatedBuildInputs = [ - ps.setuptools # implicit dependency, used to find data/icon_placeholder.png - final.vdf-patch - ps.pillow - ]; - }); - } - ) - ]; - home.packages = with pkgs; [ - protontricks-beta + protontricks beatsabermodmanager protonup-qt ];