diff --git a/modules/core/default.nix b/modules/core/default.nix
index 8aec7846..c7457c1b 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ config, lib, ... }:
 
 with lib;
 let
@@ -10,18 +10,12 @@ in
     ./boot.nix
     ./fonts.nix
     ./i18n.nix
-    ./modules.nix
     ./networking.nix
     ./nix.nix
     ./packages.nix
     ./services.nix
   ];
 
-  pub-solar.terminal-life.enable = true;
-  pub-solar.audio.enable = lib.mkIf (!cfg.lite) true;
-  pub-solar.crypto.enable = lib.mkIf (!cfg.lite) true;
-  pub-solar.devops.enable = lib.mkIf (!cfg.lite) true;
-
   options.pub-solar.core = {
     lite = mkOption {
       description = ''
@@ -31,4 +25,13 @@ in
       type = types.bool;
     };
   };
+
+  config = {
+    pub-solar = {
+      terminal-life.enable = true;
+      audio.enable = lib.mkIf (!cfg.lite) true;
+      crypto.enable = lib.mkIf (!cfg.lite) true;
+      devops.enable = lib.mkIf (!cfg.lite) true;
+    };
+  };
 }