Working on reshuffling

Droidnix/README.org

@@ -135,17 +135,13 @@ 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.mkSubmodule {
+  # Root for custom options
+  options.mySystem = lib.mkOption {
+    type = lib.types.attrs;      # simple attribute set
+    default = {};
     description = "Root for custom mySystem options";
-
-    options = {
-      desktop = lib.mkSubmodule {
-        description = "Desktop-related modules (fonts, wm, theming)";
-
-        options = {};
-      };
-    };
   };
 }
 #+END_SRC
@@ -985,10 +981,8 @@ This file installs and configures fonts
 { lib, pkgs, config, ... }:
 
 {
-  # Top-level toggle
   options.enableFonts = lib.mkEnableOption "Enable nerd fonts";
 
-  # Config is only applied when the module is evaluated
   config = lib.mkIf (config.enableFonts or false) {
     fonts.packages = with pkgs; [
       nerd-fonts.iosevka

Droidnix/generated/modules/desktop/fonts.nix

@@ -1,10 +1,8 @@
 { lib, pkgs, config, ... }:
 
 {
-  # Top-level toggle
   options.enableFonts = lib.mkEnableOption "Enable nerd fonts";
 
-  # Config is only applied when the module is evaluated
   config = lib.mkIf (config.enableFonts or false) {
     fonts.packages = with pkgs; [
       nerd-fonts.iosevka

Droidnix/generated/system/mysystem.nix

@@ -1,14 +1,10 @@
 { lib, ... }:
+
 {
-  options.mySystem = lib.mkSubmodule {
+  # Root for custom options
+  options.mySystem = lib.mkOption {
+    type = lib.types.attrs;      # simple attribute set
+    default = {};
     description = "Root for custom mySystem options";
-
-    options = {
-      desktop = lib.mkSubmodule {
-        description = "Desktop-related modules (fonts, wm, theming)";
-
-        options = {};
-      };
-    };
   };
 }