Working on reshuffling

Droidnix/README.org

@@ -135,12 +135,17 @@ The Nix flake definition for Droidnix.
 This sets the networking.
 #+BEGIN_SRC nix :tangle generated/system/mysystem.nix :noweb tangle :mkdirp yes :eval never-html
 { lib, ... }:
-
 {
-  options.mySystem = lib.mkOption {
-    type = lib.types.attrsOf lib.types.attrsOf lib.types.any;
-    default = {};
-    description = "Root container for custom mySystem options (desktop, apps, etc.)";
+  options.mySystem = lib.mkSubmodule {
+    description = "Root for custom mySystem options";
+
+    options = {
+      desktop = lib.mkSubmodule {
+        description = "Desktop-related modules (fonts, wm, theming)";
+
+        options = {};
+      };
+    };
   };
 }
 #+END_SRC

Droidnix/generated/system/mysystem.nix

@@ -1,9 +1,14 @@
 { lib, ... }:
-
 {
-  options.mySystem = lib.mkOption {
-    type = lib.types.attrsOf lib.types.attrsOf lib.types.any;
-    default = {};
-    description = "Root container for custom mySystem options (desktop, apps, etc.)";
+  options.mySystem = lib.mkSubmodule {
+    description = "Root for custom mySystem options";
+
+    options = {
+      desktop = lib.mkSubmodule {
+        description = "Desktop-related modules (fonts, wm, theming)";
+
+        options = {};
+      };
+    };
   };
 }