5 files changed, 18 insertions, 38 deletions
diff --git a/home/default.nix b/home/default.nix
index 1418d68..f49cadd 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -11,13 +11,13 @@ in {
     ./apps
     ./browsers
     ./desktops
-    ./gaming
     ./gtk
     ./neovim
     ./ssh
     ./tmux
     ./zsh
     ./development.nix
+    ./gaming.nix
     ./git.nix
     ./gpg.nix
     ./starship.nix
diff --git a/home/gaming.nix b/home/gaming.nix
new file mode 100644
index 0000000..8d389e5
--- /dev/null
+++ b/home/gaming.nix
@@ -0,0 +1,17 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: let
+  inherit (lib) optionals;
+  cfg = config.gaming;
+in {
+  home.packages = with pkgs;
+    (optionals cfg.homestuck.enable [
+      unofficial-homestuck-collection
+    ])
+    ++ (optionals cfg.minecraft.enable [
+      prismlauncher
+    ]);
+}
diff --git a/home/gaming/default.nix b/home/gaming/default.nix
deleted file mode 100644
index 6e06904..0000000
--- a/home/gaming/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{...}: {
-  imports = [
-    ./homestuck.nix
-    ./minecraft.nix
-  ];
-}
diff --git a/home/gaming/homestuck.nix b/home/gaming/homestuck.nix
deleted file mode 100644
index f7a1d65..0000000
--- a/home/gaming/homestuck.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  lib,
-  config,
-  inputs,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf;
-  cfg = config.gaming.homestuck;
-in {
-  config = mkIf cfg.enable {
-    home.packages = [
-      inputs.self.packages.${pkgs.system}.unofficial-homestuck-collection
-    ];
-  };
-}
diff --git a/home/gaming/minecraft.nix b/home/gaming/minecraft.nix
deleted file mode 100644
index 0b02981..0000000
--- a/home/gaming/minecraft.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  inherit (lib) mkIf;
-  cfg = config.gaming.minecraft;
-in {
-  config = mkIf cfg.enable {
-    home.packages = with pkgs; [
-      prismlauncher
-    ];
-  };
-}