From 0b944fe1d30ff8b11cf1d8fb53534ec77acd358a Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Thu, 19 Mar 2026 12:07:54 +0000
Subject: [PATCH] Working on reshuffling

---
 Droidnix/README.org                          | 12 +++++++-----
 Droidnix/generated/modules/desktop/fonts.nix | 12 +++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 4ff9034a5..fbb67cd2c 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -979,18 +979,20 @@ This file installs and configures fonts
 { lib, pkgs, ... }:
 
 let
+  # Program name (for myApps container)
   programName = "fonts";
-  enableProgram = true; # default ON, can be toggled per module
+
+  # Enable toggle (default ON)
+  enableProgram = true;
 in
 {
-  # Top-level toggle
-  options.enable${lib.str.capitalize programName} =
-    lib.mkEnableOption "Enable system fonts";
+  # Top-level toggle for this program
+  options.enableFonts = lib.mkEnableOption "Enable system fonts";
 
   # Wrap everything in config if enabled
   config = lib.mkIf enableProgram {
     myApps = {
-      ${programName} = {
+      fonts = {
         enable = true;
 
         # Fonts packages (do not reference pkgs directly if you want symbolic pathing)
diff --git a/Droidnix/generated/modules/desktop/fonts.nix b/Droidnix/generated/modules/desktop/fonts.nix
index fcbfa7ceb..4c6bb8b58 100644
--- a/Droidnix/generated/modules/desktop/fonts.nix
+++ b/Droidnix/generated/modules/desktop/fonts.nix
@@ -1,18 +1,20 @@
 { lib, pkgs, ... }:
 
 let
+  # Program name (for myApps container)
   programName = "fonts";
-  enableProgram = true; # default ON, can be toggled per module
+
+  # Enable toggle (default ON)
+  enableProgram = true;
 in
 {
-  # Top-level toggle
-  options.enable${lib.str.capitalize programName} =
-    lib.mkEnableOption "Enable system fonts";
+  # Top-level toggle for this program
+  options.enableFonts = lib.mkEnableOption "Enable system fonts";
 
   # Wrap everything in config if enabled
   config = lib.mkIf enableProgram {
     myApps = {
-      ${programName} = {
+      fonts = {
         enable = true;
 
         # Fonts packages (do not reference pkgs directly if you want symbolic pathing)