Working on reshuffling

Droidnix/README.org

@@ -979,22 +979,17 @@ This file installs and configures fonts
 #+BEGIN_SRC nix :tangle generated/modules/desktop/fonts.nix :noweb tangle :mkdirp yes :eval never-html
 { lib, pkgs, ... }:
 
-{
-  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
+{ # module function
+  # --- Top-level toggle ---
+  options.mySystem.desktop.fonts.enable =
+    lib.mkEnableOption "Enable system fonts";
 
-  let
-    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
-      ];
-    };
+  # --- Apply configuration if enabled ---
+  config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+    fonts.packages = with pkgs; [
+      nerd-fonts.iosevka
+      nerd-fonts.fira-code
+    ];
   };
 }
 #+END_SRC

Droidnix/generated/modules/desktop/fonts.nix

@@ -1,20 +1,15 @@
 { lib, pkgs, ... }:
 
-{
-  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
+{ # module function
+  # --- Top-level toggle ---
+  options.mySystem.desktop.fonts.enable =
+    lib.mkEnableOption "Enable system fonts";
 
-  let
-    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
-      ];
-    };
+  # --- Apply configuration if enabled ---
+  config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+    fonts.packages = with pkgs; [
+      nerd-fonts.iosevka
+      nerd-fonts.fira-code
+    ];
   };
 }