modules: merge base and nixos

1 files changed, 4 insertions, 27 deletions

diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index bbe334e..3ae2f08 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,30 +1,7 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.getchoo.nixos;
-  inherit (lib) mkDefault mkEnableOption mkIf;
-in {
-  options.getchoo.nixos.enable = mkEnableOption "base nixos module";
-
+_: {
   imports = [
-    ./locale.nix
-    ./network.nix
-    ./root.nix
-    ./security.nix
-    ./systemd.nix
-    ./virtualisation.nix
+    ./base
+    ./desktop
+    ./hardware
   ];
-
-  config = mkIf cfg.enable {
-    getchoo = {
-      base.enable = true;
-      nixos = {
-        defaultLocale.enable = mkDefault true;
-        defaultRoot.enable = mkDefault true;
-        networking.enable = mkDefault true;
-      };
-    };
-  };
 }