Working on reshuffling

Droidnix/README.org

@@ -976,29 +976,56 @@ 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, ... }:
+{ lib, flakeRoot, ... }:
 
+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
 {
-  flake.nixosModules.fonts =
+  # --- Top-level toggle ---
-    {
+  options.enableFonts =
-      config,
+    lib.mkEnableOption "Enable system fonts";
-      pkgs,
-      lib,
-      ...
-    }:
 
-    {
+  # --- Configuration applied only if enabled ---
-      options.mySystem.desktop.fonts.enable = lib.mkEnableOption "Enable system fonts";
+  config = lib.mkIf enableProgram {
 
-      config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+    # Dendritic container for this program
+    myApps.${programName} = {
+      enable = true;
+      assetsDir = programAssets;
+      files = files;
+      user = user;
 
-        fonts.packages = with pkgs; [
+      # Example font packages (without referencing pkgs directly outside mkIf)
-          nerd-fonts.iosevka
+      packages = [
-          nerd-fonts.fira-code
+        "nerd-fonts-iosevka"
-        ];
+        "nerd-fonts-fira-code"
-
+      ];
-      };
     };
+
+    # Actual NixOS/Home Manager config
+    fonts.packages = with pkgs; [
+      nerd-fonts.iosevka
+      nerd-fonts.fira-code
+    ];
+  };
 }
 #+END_SRC
 

Droidnix/generated/modules/desktop/fonts.nix

@@ -1,24 +1,51 @@
-{ lib, ... }:
+{ lib, flakeRoot, ... }:
 
+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
 {
-  flake.nixosModules.fonts =
+  # --- Top-level toggle ---
-    {
+  options.enableFonts =
-      config,
+    lib.mkEnableOption "Enable system fonts";
-      pkgs,
-      lib,
-      ...
-    }:
 
-    {
+  # --- Configuration applied only if enabled ---
-      options.mySystem.desktop.fonts.enable = lib.mkEnableOption "Enable system fonts";
+  config = lib.mkIf enableProgram {
 
-      config = lib.mkIf (config.mySystem.desktop.fonts.enable or false) {
+    # Dendritic container for this program
+    myApps.${programName} = {
+      enable = true;
+      assetsDir = programAssets;
+      files = files;
+      user = user;
 
-        fonts.packages = with pkgs; [
+      # Example font packages (without referencing pkgs directly outside mkIf)
-          nerd-fonts.iosevka
+      packages = [
-          nerd-fonts.fira-code
+        "nerd-fonts-iosevka"
-        ];
+        "nerd-fonts-fira-code"
-
+      ];
-      };
     };
+
+    # Actual NixOS/Home Manager config
+    fonts.packages = with pkgs; [
+      nerd-fonts.iosevka
+      nerd-fonts.fira-code
+    ];
+  };
 }