diff --git a/Droidnix/README.org b/Droidnix/README.org
index d99279394..5f625c786 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -985,27 +985,28 @@ let
   # Enable toggle for this module (default ON)
   enableProgram = true;
 
-  # Example symbolic references to fonts (avoid pkgs if possible)
+  # Example symbolic references to fonts
   fontPackages = [
     "nerd-fonts.iosevka"
     "nerd-fonts.fira-code"
   ];
 in
 {
-  # Top-level toggle for this program
+  # Top-level toggle
   options.enableFonts = lib.mkEnableOption "Enable system fonts";
 
-  # Wrap all configuration in mkIf so nothing is applied unless enabled
+  # Wrap everything in config.mkIf
   config = lib.mkIf enableProgram {
 
-    # Top-level container for your apps/services
-    myApps = {
+    # Inside mkIf, config is defined
+    myApps = let
+      userName = config.defaultUser or "henrov";
+    in
+    {
       fonts = {
         enable = true;
         packages = fontPackages;
-
-        # Optional: user, defaults to global defaultUser
-        user = config.defaultUser or "henrov";
+        user = userName;
       };
     };
   };
diff --git a/Droidnix/generated/modules/desktop/fonts.nix b/Droidnix/generated/modules/desktop/fonts.nix
index f373c3d1d..2e78bc64b 100644
--- a/Droidnix/generated/modules/desktop/fonts.nix
+++ b/Droidnix/generated/modules/desktop/fonts.nix
@@ -7,27 +7,28 @@ let
   # Enable toggle for this module (default ON)
   enableProgram = true;
 
-  # Example symbolic references to fonts (avoid pkgs if possible)
+  # Example symbolic references to fonts
   fontPackages = [
     "nerd-fonts.iosevka"
     "nerd-fonts.fira-code"
   ];
 in
 {
-  # Top-level toggle for this program
+  # Top-level toggle
   options.enableFonts = lib.mkEnableOption "Enable system fonts";
 
-  # Wrap all configuration in mkIf so nothing is applied unless enabled
+  # Wrap everything in config.mkIf
   config = lib.mkIf enableProgram {
 
-    # Top-level container for your apps/services
-    myApps = {
+    # Inside mkIf, config is defined
+    myApps = let
+      userName = config.defaultUser or "henrov";
+    in
+    {
       fonts = {
         enable = true;
         packages = fontPackages;
-
-        # Optional: user, defaults to global defaultUser
-        user = config.defaultUser or "henrov";
+        user = userName;
       };
     };
   };