From c43b96c4d5f61cf07aa1a83b2cf753f0e95a3276 Mon Sep 17 00:00:00 2001
From: hensoko <hensoko@noreply.example.org>
Date: Sun, 14 Aug 2022 13:54:19 +0000
Subject: [PATCH] Fix core module (#116)

Co-authored-by: Hendrik Sokolowski <hensoko@gssws.de>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/116
Reviewed-by: teutat3s <teutates@mailbox.org>
---
 hosts/bootstrap.nix      |  1 -
 modules/core/default.nix | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/hosts/bootstrap.nix b/hosts/bootstrap.nix
index acadc44..541ca6f 100644
--- a/hosts/bootstrap.nix
+++ b/hosts/bootstrap.nix
@@ -6,7 +6,6 @@
   # interface that has the local link to the target machine
   imports = [
     # profiles.networking
-    profiles.core
     profiles.users.root # make sure to configure ssh keys
     profiles.users.pub-solar
     profiles.base-user
diff --git a/modules/core/default.nix b/modules/core/default.nix
index 8aec784..c7457c1 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;
+    };
+  };
 }