3 files changed, 41 insertions, 41 deletions
diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix
index a4e5c0f..463c138 100644
--- a/modules/gaming/default.nix
+++ b/modules/gaming/default.nix
@@ -1,46 +1,8 @@
 # Gaming - Collection of game launchers and gaming utilities
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
+{ ... }:
 {
   imports = [
-    ./steam.nix
+    ./heroic
+    ./steam
   ];
-
-  options.gaming = {
-    enable = lib.mkEnableOption "gaming tools bundle (Heroic, winetricks, gamemode).";
-    launcher = lib.mkOption {
-      type = lib.types.package;
-      default = pkgs.symlinkJoin {
-        name = "heroic-bundle";
-        paths = with pkgs; [
-          # Wrap Heroic so it dynamically appends gamemode's library folder to LD_LIBRARY_PATH
-          (pkgs.symlinkJoin {
-            name = "heroic-wrapped";
-            paths = [ heroic ];
-            buildInputs = [ pkgs.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/heroic \
-                --prefix LD_LIBRARY_PATH : "${pkgs.gamemode.lib}/lib:${pkgs.pkgsi686Linux.gamemode.lib}/lib"
-            '';
-          })
-          winetricks
-          xdg-user-dirs
-          gamemode
-        ];
-      };
-      description = "Bundle of game launchers (Heroic), winetricks, and core gaming utilities with GameMode support.";
-    };
-  };
-
-  config = lib.mkIf config.gaming.enable {
-    home.packages = [ config.gaming.launcher ];
-
-    xdg.mimeApps.defaultApplications = {
-      "x-scheme-handler/heroic" = "heroic.desktop";
-    };
-  };
 }
diff --git a/modules/gaming/heroic/default.nix b/modules/gaming/heroic/default.nix
new file mode 100644
index 0000000..9c07f17
--- /dev/null
+++ b/modules/gaming/heroic/default.nix
@@ -0,0 +1,38 @@
+# Heroic Games Launcher - Epic/GOG/Amazon game launcher
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+{
+  options.gaming.heroic = {
+    enable = lib.mkEnableOption "Enables Heroic Games Launcher.";
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.symlinkJoin {
+        name = "heroic-wrapped";
+        paths = with pkgs; [
+          winetricks
+          xdg-user-dirs
+          gamemode
+          heroic
+        ];
+        buildInputs = [ pkgs.makeWrapper ];
+        postBuild = ''
+          wrapProgram $out/bin/heroic \
+            --prefix LD_LIBRARY_PATH : "${pkgs.gamemode.lib}/lib:${pkgs.pkgsi686Linux.gamemode.lib}/lib"
+        '';
+      };
+      description = "Heroic Games Launcher package (wrapped with GameMode support).";
+    };
+  };
+
+  config = lib.mkIf config.gaming.heroic.enable {
+    home.packages = [ config.gaming.heroic.package ];
+
+    xdg.mimeApps.defaultApplications = {
+      "x-scheme-handler/heroic" = "heroic.desktop";
+    };
+  };
+}
diff --git a/modules/gaming/steam.nix b/modules/gaming/steam/default.nix
index ba3cf0f..ba3cf0f 100644
--- a/modules/gaming/steam.nix
+++ b/modules/gaming/steam/default.nix