Working on reshuffling

Droidnix/README.org

@@ -976,28 +976,33 @@ 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, ... }:
 
+let
+  programName = "fonts";
+  enableProgram = true; # default ON, can be toggled per module
+in
 {
-  options.mySystem.desktop.fonts.enable =
+  # Top-level toggle
+  options.enable${lib.str.capitalize programName} =
     lib.mkEnableOption "Enable system fonts";
 
-  config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+  # Wrap everything in config if enabled
+  config = lib.mkIf enableProgram {
     myApps = {
-      fonts = {
+      ${programName} = {
         enable = true;
-        user = config.defaultUser or "henrov";
+
+        # Fonts packages (do not reference pkgs directly if you want symbolic pathing)
         packages = [
-          pkgs.nerd-fonts.iosevka
+          "nerd-fonts.iosevka"
-          pkgs.nerd-fonts.fira-code
+          "nerd-fonts.fira-code"
         ];
+
+        # Optional: user
+        user = config.defaultUser or "henrov";
       };
     };
-
-    fonts.packages = [
-      pkgs.nerd-fonts.iosevka
-      pkgs.nerd-fonts.fira-code
-    ];
   };
 }
 #+END_SRC

Droidnix/generated/modules/desktop/fonts.nix

@@ -1,24 +1,29 @@
-{ config, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
+let
+  programName = "fonts";
+  enableProgram = true; # default ON, can be toggled per module
+in
 {
-  options.mySystem.desktop.fonts.enable =
+  # Top-level toggle
+  options.enable${lib.str.capitalize programName} =
     lib.mkEnableOption "Enable system fonts";
 
-  config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+  # Wrap everything in config if enabled
+  config = lib.mkIf enableProgram {
     myApps = {
-      fonts = {
+      ${programName} = {
         enable = true;
-        user = config.defaultUser or "henrov";
+
+        # Fonts packages (do not reference pkgs directly if you want symbolic pathing)
         packages = [
-          pkgs.nerd-fonts.iosevka
+          "nerd-fonts.iosevka"
-          pkgs.nerd-fonts.fira-code
+          "nerd-fonts.fira-code"
         ];
+
+        # Optional: user
+        user = config.defaultUser or "henrov";
       };
     };
-
-    fonts.packages = [
-      pkgs.nerd-fonts.iosevka
-      pkgs.nerd-fonts.fira-code
-    ];
   };
 }