Working on reshuffling

Droidnix/README.org

@@ -976,56 +976,42 @@ 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, flakeRoot, ... }:
+{ lib, pkgs, ... }:
 
-let
-  programName = "fonts";
-
-  # --- Assets (if any) ---
-  programAssets = "${flakeRoot}/assets/system/conf/${programName}";
-  programFiles =
-    if builtins.pathExists programAssets
-    then builtins.readDir programAssets
-    else {};
-
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${programAssets}/${name}";
-  });
-
-  # Enable toggle (matches option defined below)
-  enableProgram = config.enableFonts or true;
-
-  # Default user
-  user = config.defaultUser or "henrov";
-in
 {
-  # --- Top-level toggle ---
+  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
-  options.enableFonts =
+
+  {
+    # Top-level toggle
+    options.mySystem.desktop.fonts.enable =
       lib.mkEnableOption "Enable system fonts";
 
-  # --- Configuration applied only if enabled ---
+    # Only apply if enabled
-  config = lib.mkIf enableProgram {
+    config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
 
-    # Dendritic container for this program
+      # Dendritic container for apps
-    myApps.${programName} = {
+      myApps = {
+        fonts = {
           enable = true;
-      assetsDir = programAssets;
-      files = files;
-      user = user;
 
-      # Example font packages (without referencing pkgs directly outside mkIf)
+          # Optional user
+          user = config.defaultUser or "henrov";
+
+          # Font packages
           packages = [
-        "nerd-fonts-iosevka"
+            pkgs.nerd-fonts.iosevka
-        "nerd-fonts-fira-code"
+            pkgs.nerd-fonts.fira-code
           ];
         };
+      };
 
-    # Actual NixOS/Home Manager config
+      # Actual Home Manager / NixOS config
-    fonts.packages = with pkgs; [
+      fonts.packages = [
-      nerd-fonts.iosevka
+        pkgs.nerd-fonts.iosevka
-      nerd-fonts.fira-code
+        pkgs.nerd-fonts.fira-code
       ];
     };
+  };
 }
 #+END_SRC
 

Droidnix/generated/modules/desktop/fonts.nix

@@ -1,51 +1,37 @@
-{ lib, flakeRoot, ... }:
+{ lib, pkgs, ... }:
 
-let
-  programName = "fonts";
-
-  # --- Assets (if any) ---
-  programAssets = "${flakeRoot}/assets/system/conf/${programName}";
-  programFiles =
-    if builtins.pathExists programAssets
-    then builtins.readDir programAssets
-    else {};
-
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${programAssets}/${name}";
-  });
-
-  # Enable toggle (matches option defined below)
-  enableProgram = config.enableFonts or true;
-
-  # Default user
-  user = config.defaultUser or "henrov";
-in
 {
-  # --- Top-level toggle ---
+  flake.nixosModules.fonts = { config, lib, pkgs, ... }:
-  options.enableFonts =
+
+  {
+    # Top-level toggle
+    options.mySystem.desktop.fonts.enable =
       lib.mkEnableOption "Enable system fonts";
 
-  # --- Configuration applied only if enabled ---
+    # Only apply if enabled
-  config = lib.mkIf enableProgram {
+    config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
 
-    # Dendritic container for this program
+      # Dendritic container for apps
-    myApps.${programName} = {
+      myApps = {
+        fonts = {
           enable = true;
-      assetsDir = programAssets;
-      files = files;
-      user = user;
 
-      # Example font packages (without referencing pkgs directly outside mkIf)
+          # Optional user
+          user = config.defaultUser or "henrov";
+
+          # Font packages
           packages = [
-        "nerd-fonts-iosevka"
+            pkgs.nerd-fonts.iosevka
-        "nerd-fonts-fira-code"
+            pkgs.nerd-fonts.fira-code
           ];
         };
+      };
 
-    # Actual NixOS/Home Manager config
+      # Actual Home Manager / NixOS config
-    fonts.packages = with pkgs; [
+      fonts.packages = [
-      nerd-fonts.iosevka
+        pkgs.nerd-fonts.iosevka
-      nerd-fonts.fira-code
+        pkgs.nerd-fonts.fira-code
       ];
     };
+  };
 }