Working on reshuffling

Droidnix/README.org

@@ -137,9 +137,10 @@ This sets the networking.
 { lib, ... }:
 
 {
-  options.mySystem = lib.mkSubmodule {
+  options.mySystem = lib.mkOption {
-    description = "Root for custom mySystem options";
+    type = lib.types.attrsOf lib.types.attrsOf lib.types.any;
-    options = {};
+    default = {};
+    description = "Root container for custom mySystem options (desktop, apps, etc.)";
   };
 }
 #+END_SRC
@@ -976,20 +977,25 @@ Setting up GTK
 ** =generated/modules/desktop/fonts.nix=
 This file installs and configures fonts
 #+BEGIN_SRC nix :tangle generated/modules/desktop/fonts.nix :noweb tangle :mkdirp yes :eval never-html
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
-  # Define enable option
+  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
-  options.mySystem.desktop.fonts.enable =
-    lib.mkEnableOption "Enable nerd-fonts";
 
-  # Apply only if enabled
+  let
-  config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+    enableProgram = true; # toggle default
+  in
+  {
+    options.mySystem.desktop.fonts.enable =
+      lib.mkEnableOption "Enable system fonts";
+
+    config = lib.mkIf (enableProgram) {
       fonts.packages = with pkgs; [
         nerd-fonts.iosevka
         nerd-fonts.fira-code
       ];
     };
+  };
 }
 #+END_SRC
 

Droidnix/generated/modules/desktop/fonts.nix

@@ -1,15 +1,20 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 {
-  # Define enable option
+  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
-  options.mySystem.desktop.fonts.enable =
-    lib.mkEnableOption "Enable nerd-fonts";
 
-  # Apply only if enabled
+  let
-  config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+    enableProgram = true; # toggle default
+  in
+  {
+    options.mySystem.desktop.fonts.enable =
+      lib.mkEnableOption "Enable system fonts";
+
+    config = lib.mkIf (enableProgram) {
       fonts.packages = with pkgs; [
         nerd-fonts.iosevka
         nerd-fonts.fira-code
       ];
     };
+  };
 }

Droidnix/generated/system/mysystem.nix

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