Working on reshuffling

Droidnix/README.org

@@ -1038,55 +1038,76 @@ This file sets up Kitty terminal
 { lib, config, ... }:
 
 let
-  # --- Program definition ---
+  # --- Program metadata ---
-  programName = "kitty";
+  programName    = "kitty";                          # Change per module
+  enableProgram  = config.enableKitty or true;       # Reference toggle safely
+  username       = config.defaultUser or "henrov";   # Resolve user safely
 
-  # Assets directory (relative, self-contained)
+  # --- Assets ---
   programAssets  = ../../../assets/system/conf/${programName};
-
-  # Read all files in assets dir
   programFiles   = builtins.readDir programAssets;
 
-  # Map files → attrset
+  # Map each file → attrset for easy deployment
   files = lib.genAttrs (builtins.attrNames programFiles) (name: {
     src = "${programAssets}/${name}";
   });
-
-  # Enable toggle (safe: defined before config)
-  enableProgram = config.enableKitty or true;
-
-  # Resolve user safely (top-level, not inside mkIf)
-  user = config.defaultUser or "henrov";
 in
 {
-  # --- Option ---
+  # --- Top-level toggle for this module ---
-  options.enableKitty =
+  options.enableKitty = lib.mkEnableOption "Enable kitty terminal";
-    lib.mkEnableOption "Enable kitty terminal";
 
-  # --- Config ---
+  # --- Actual configuration (applied only if enabled) ---
   config = lib.mkIf enableProgram {
 
-    mySystem.${programName} = {
+    # Dendritic container: all program config under myApps
+    myApps.${programName} = {
       enable    = true;
+      user      = username;
       assetsDir = programAssets;
       files     = files;
-      inherit user;
 
       # Program-specific metadata
       theme = "catppuccin-mocha";
     };
 
-    # Actual system wiring (kept minimal + scoped)
+    # Deploy asset files for Home Manager users
-    home-manager.users.${user} = {
+    home-manager.users.${username} = {
-
       programs.kitty.enable = true;
 
-      xdg.configFile =
+      xdg.configFile = lib.mapAttrs' (name: value: {
-        lib.mapAttrs' (name: value: {
         name  = "kitty/${name}";
         value.source = value.src;
       }) files;
+    };
 
+    # Example: systemd service if this program needed a sync or install process
+    # (Remove or adapt if unnecessary)
+    systemd.services.${programName}-sync = {
+      description = "Sync ${programName} configuration";
+      wantedBy    = [ "multi-user.target" ];
+      wants       = [ "network-online.target" ];
+      after       = [ "network-online.target" ];
+
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = ''
+          set -euo pipefail
+          CONF="${programAssets}"
+
+          # Example loop over files; adapt per program
+          for f in ${programAssets}/*; do
+            echo "Processing $f..."
+          done
+        '';
+      };
+
+      restartTriggers = [ programAssets ];
+
+      path = [
+        pkgs.coreutils
+        pkgs.gnugrep
+        pkgs.gnused
+      ];
     };
   };
 }

Droidnix/generated/modules/terminals/kitty.nix

@@ -1,55 +1,76 @@
 { lib, config, ... }:
 
 let
-  # --- Program definition ---
+  # --- Program metadata ---
-  programName = "kitty";
+  programName    = "kitty";                          # Change per module
+  enableProgram  = config.enableKitty or true;       # Reference toggle safely
+  username       = config.defaultUser or "henrov";   # Resolve user safely
 
-  # Assets directory (relative, self-contained)
+  # --- Assets ---
   programAssets  = ../../../assets/system/conf/${programName};
-
-  # Read all files in assets dir
   programFiles   = builtins.readDir programAssets;
 
-  # Map files → attrset
+  # Map each file → attrset for easy deployment
   files = lib.genAttrs (builtins.attrNames programFiles) (name: {
     src = "${programAssets}/${name}";
   });
-
-  # Enable toggle (safe: defined before config)
-  enableProgram = config.enableKitty or true;
-
-  # Resolve user safely (top-level, not inside mkIf)
-  user = config.defaultUser or "henrov";
 in
 {
-  # --- Option ---
+  # --- Top-level toggle for this module ---
-  options.enableKitty =
+  options.enableKitty = lib.mkEnableOption "Enable kitty terminal";
-    lib.mkEnableOption "Enable kitty terminal";
 
-  # --- Config ---
+  # --- Actual configuration (applied only if enabled) ---
   config = lib.mkIf enableProgram {
 
-    mySystem.${programName} = {
+    # Dendritic container: all program config under myApps
+    myApps.${programName} = {
       enable    = true;
+      user      = username;
       assetsDir = programAssets;
       files     = files;
-      inherit user;
 
       # Program-specific metadata
       theme = "catppuccin-mocha";
     };
 
-    # Actual system wiring (kept minimal + scoped)
+    # Deploy asset files for Home Manager users
-    home-manager.users.${user} = {
+    home-manager.users.${username} = {
-
       programs.kitty.enable = true;
 
-      xdg.configFile =
+      xdg.configFile = lib.mapAttrs' (name: value: {
-        lib.mapAttrs' (name: value: {
         name  = "kitty/${name}";
         value.source = value.src;
       }) files;
+    };
 
+    # Example: systemd service if this program needed a sync or install process
+    # (Remove or adapt if unnecessary)
+    systemd.services.${programName}-sync = {
+      description = "Sync ${programName} configuration";
+      wantedBy    = [ "multi-user.target" ];
+      wants       = [ "network-online.target" ];
+      after       = [ "network-online.target" ];
+
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = ''
+          set -euo pipefail
+          CONF="${programAssets}"
+
+          # Example loop over files; adapt per program
+          for f in ${programAssets}/*; do
+            echo "Processing $f..."
+          done
+        '';
+      };
+
+      restartTriggers = [ programAssets ];
+
+      path = [
+        pkgs.coreutils
+        pkgs.gnugrep
+        pkgs.gnused
+      ];
     };
   };
 }