diff --git a/common.nix b/common.nix index 421e91d..aa2a9ff 100644 --- a/common.nix +++ b/common.nix @@ -1,4 +1,4 @@ -{ pkgs, hypr-contrib, nix-gaming, ... }: +{ pkgs, lib, hypr-contrib, nix-gaming, ... }: { imports = [ @@ -6,7 +6,6 @@ ./user.nix ./desktop ./dev - ./games.nix ./host ./containers/rar.nix ./containers/wine.nix @@ -39,9 +38,21 @@ boot.tmp.useTmpfs = true; - environment.systemPackages = [ + programs.gamemode.enable = true; + + environment.systemPackages = with pkgs; [ hypr-contrib.packages."x86_64-linux".grimblast nix-gaming.packages."x86_64-linux".osu-stable + (pkgs.callPackage ./packages/waycorner { }) + (pkgs.callPackage ./packages/srb2 { }) + slade + typespeed + osu-lazer-bin + ]; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "osu-lazer-bin" + "vmware-workstation" ]; environment.sessionVariables = { diff --git a/games.nix b/games.nix deleted file mode 100644 index 20b661f..0000000 --- a/games.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, lib, ... }: - -{ - programs.gamemode.enable = true; - - environment.systemPackages = with pkgs; [ - (pkgs.callPackage ./packages/srb2 { }) - slade - typespeed - osu-lazer-bin - ]; - - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "osu-lazer-bin" - ]; -}