From 4a89dff70e06a993e3bc747fddb13c0b36f4d1bf Mon Sep 17 00:00:00 2001 From: Chris Toph Date: Thu, 10 Jul 2025 10:42:23 -0400 Subject: [PATCH] Fix steam compat packages, ge-custom was using overlay some users wont have --- flake.nix | 6 +++++- modules/nixos/default.nix | 3 ++- modules/nixos/steam.nix | 6 ++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 675d46f..6667579 100644 --- a/flake.nix +++ b/flake.nix @@ -47,7 +47,11 @@ ) // { homeManagerModules.play = import ./modules/home; - nixosModules.play = import ./modules/nixos; + nixosModules.play = { + imports = [ + (import ./modules/nixos { inherit chaotic; }) + ]; + }; # Default module (home-manager) homeManagerModules.default = self.homeManagerModules.play; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 6fbe3ee..7a4e6b7 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,9 +1,10 @@ +{ chaotic }: { imports = [ ./amd.nix ./ananicy.nix ./gamemode.nix ./lutris.nix - ./steam.nix + (import ./steam.nix { inherit chaotic; }) ]; } diff --git a/modules/nixos/steam.nix b/modules/nixos/steam.nix index 75f1356..c6c7087 100644 --- a/modules/nixos/steam.nix +++ b/modules/nixos/steam.nix @@ -4,18 +4,20 @@ pkgs, lib, config, + chaotic, ... }: let cfg = config.play.steam; - # Import proton-cachyos package directly, some users wont chaotics overlay + # Import proton packages directly, some users wont chaotics overlay proton-cachyos = pkgs.callPackage ../../pkgs/proton-cachyos { }; + proton-ge-custom = chaotic.legacyPackages.${pkgs.system}.proton-ge-custom; defaultCompatPackages = [ - pkgs.proton-ge-custom proton-cachyos + proton-ge-custom ]; finalCompatPackages = defaultCompatPackages ++ cfg.extraCompatPackages;