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

---
 Droidnix/README.org                          | 25 +++++++++++---------
 Droidnix/generated/modules/desktop/fonts.nix | 25 +++++++++++---------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index fbb67cd2c..d99279394 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -976,32 +976,35 @@ 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
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 let
-  # Program name (for myApps container)
+  # Program-specific info
   programName = "fonts";
 
-  # Enable toggle (default ON)
+  # Enable toggle for this module (default ON)
   enableProgram = true;
+
+  # Example symbolic references to fonts (avoid pkgs if possible)
+  fontPackages = [
+    "nerd-fonts.iosevka"
+    "nerd-fonts.fira-code"
+  ];
 in
 {
   # Top-level toggle for this program
   options.enableFonts = lib.mkEnableOption "Enable system fonts";
 
-  # Wrap everything in config if enabled
+  # Wrap all configuration in mkIf so nothing is applied unless enabled
   config = lib.mkIf enableProgram {
+
+    # Top-level container for your apps/services
     myApps = {
       fonts = {
         enable = true;
+        packages = fontPackages;
 
-        # Fonts packages (do not reference pkgs directly if you want symbolic pathing)
-        packages = [
-          "nerd-fonts.iosevka"
-          "nerd-fonts.fira-code"
-        ];
-
-        # Optional: user
+        # Optional: user, defaults to global defaultUser
         user = config.defaultUser or "henrov";
       };
     };
diff --git a/Droidnix/generated/modules/desktop/fonts.nix b/Droidnix/generated/modules/desktop/fonts.nix
index 4c6bb8b58..f373c3d1d 100644
--- a/Droidnix/generated/modules/desktop/fonts.nix
+++ b/Droidnix/generated/modules/desktop/fonts.nix
@@ -1,29 +1,32 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
 
 let
-  # Program name (for myApps container)
+  # Program-specific info
   programName = "fonts";
 
-  # Enable toggle (default ON)
+  # Enable toggle for this module (default ON)
   enableProgram = true;
+
+  # Example symbolic references to fonts (avoid pkgs if possible)
+  fontPackages = [
+    "nerd-fonts.iosevka"
+    "nerd-fonts.fira-code"
+  ];
 in
 {
   # Top-level toggle for this program
   options.enableFonts = lib.mkEnableOption "Enable system fonts";
 
-  # Wrap everything in config if enabled
+  # Wrap all configuration in mkIf so nothing is applied unless enabled
   config = lib.mkIf enableProgram {
+
+    # Top-level container for your apps/services
     myApps = {
       fonts = {
         enable = true;
+        packages = fontPackages;
 
-        # Fonts packages (do not reference pkgs directly if you want symbolic pathing)
-        packages = [
-          "nerd-fonts.iosevka"
-          "nerd-fonts.fira-code"
-        ];
-
-        # Optional: user
+        # Optional: user, defaults to global defaultUser
         user = config.defaultUser or "henrov";
       };
     };