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

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

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 0ed33b258..3aa71e659 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -978,24 +978,21 @@ This file installs and configures fonts
 #+BEGIN_SRC nix :tangle generated/modules/desktop/fonts.nix :noweb tangle :mkdirp yes :eval never-html
 { lib, pkgs, ... }:
 
-{
-  # Top-level option (toggle)
-  options = {
-    mySystem = {
-      desktop = {
-        fonts = {
-          enable = lib.mkEnableOption "Enable nerd-fonts";
-        };
-      };
-    };
-  };
+{  # The function defining the NixOS module
+  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
 
-  # 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
-    ];
+  {
+    # Define an enable option
+    options.mySystem.desktop.fonts.enable =
+      lib.mkEnableOption "Enable nerd-fonts";
+
+    # Only apply config 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
diff --git a/Droidnix/generated/modules/desktop/fonts.nix b/Droidnix/generated/modules/desktop/fonts.nix
index 2204025ab..2d49fa54d 100644
--- a/Droidnix/generated/modules/desktop/fonts.nix
+++ b/Droidnix/generated/modules/desktop/fonts.nix
@@ -1,22 +1,19 @@
 { lib, pkgs, ... }:
 
-{
-  # Top-level option (toggle)
-  options = {
-    mySystem = {
-      desktop = {
-        fonts = {
-          enable = lib.mkEnableOption "Enable nerd-fonts";
-        };
-      };
+{  # The function defining the NixOS module
+  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
+
+  {
+    # Define an enable option
+    options.mySystem.desktop.fonts.enable =
+      lib.mkEnableOption "Enable nerd-fonts";
+
+    # Only apply config if enabled
+    config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+      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
-    ];
-  };
 }