diff --git a/home/modules/default.nix b/home/modules/default.nix
index a3a9019..31b52f4 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -1,53 +1,24 @@
 {
-  config,
   lib,
+  config,
   ...
-}: let
-  cfg = config.myModules;
-in {
+}: {
   options.myModules = {
     games.enable = lib.mkOption {
       type = lib.types.bool;
       default = false;
       description = "Enable games module.";
     };
-
-    dailyApps.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = "Enable daily applications.";
-    };
-
-    niri.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = "Enable niri wayland compositor config.";
-    };
-
-    nvf.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = "Enable nvf (neovim) configuration.";
-    };
-
-    shell.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = "Enable shell configuration.";
-    };
-
-    createProject.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = "Enable create-project tooling.";
-    };
   };
-
   imports =
-    (lib.optional cfg.dailyApps.enable ./daily_apps.nix)
-    ++ (lib.optional cfg.niri.enable ./niri.nix)
-    ++ (lib.optional cfg.nvf.enable ./nvf.nix)
-    ++ (lib.optional cfg.shell.enable ./shell)
-    ++ (lib.optional cfg.games.enable ./games/minecraft.nix)
-    ++ (lib.optional cfg.createProject.enable ./create-project/create-project.nix);
+    [
+      ./daily_apps.nix
+      ./niri.nix
+      ./nvf.nix
+      ./shell
+      ./create-project/create-project.nix
+    ]
+    ++ lib.optionals config.myModules.games.enable [
+      ./games
+    ];
 }
diff --git a/home/modules/games/default.nix b/home/modules/games/default.nix
new file mode 100644
index 0000000..cc1175f
--- /dev/null
+++ b/home/modules/games/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./minecraft.nix
+  ];
+}