diff --git a/home-modules/games.nix b/home-modules/games.nix
index c7e7f6e..37cb74d 100644
--- a/home-modules/games.nix
+++ b/home-modules/games.nix
@@ -1,20 +1,19 @@
-{ pkgs, ... }@all: with all;
-lib.mkIf (hyper.host == "NxNORTH")
-{
+{ pkgs, ... }@all: with all; {
   home = {
-    packages = (with pkgs.unstable; [
-      protonup-ng
-      mangohud
-
-      prismlauncher
-
-      # heroic
-
+    packages = (with pkgs; [
+      unstable.protonup-ng
+      unstable.mangohud
+    ] ++ (if hyper.host == "NxNORTH" then [
+      unstable.prismlauncher
+      heroic
       # mindustry-wayland 
-    ]) ++ [ pkgs.heroic ];
-    sessionVariables = {
-      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
-    };
+    ] else if hyper.host == "NxXPS" then [
+      heroic
+    ] else if hyper.host == "NxACE" then [
+      heroic
+    ] else []));
+
+    sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d";
   };
 }
 
diff --git a/system-modules/games.nix b/system-modules/games.nix
index 5d90705..a54913e 100644
--- a/system-modules/games.nix
+++ b/system-modules/games.nix
@@ -1,15 +1,7 @@
-{ pkgs, ... }@all: with all;
-lib.mkIf (hyper.host == "NxNORTH" || hyper.host == "NxACE")
-{
+{ pkgs, ... }@all: with all; {
   programs = {
-    steam = {
-      enable = true;
-    };
-    gamemode = {
-      enable = true;
-    };
-    gamescope = {
-      enable = true;
-    };
+    steam.enable = true;
+    gamemode.enable = true;
+    gamescope.enable = true;
   };
 }