Working on reshuffling

Droidnix/README.org

@@ -1035,74 +1035,31 @@ in
 ** =generated/modules/terminals/kitty.nix=
 This file sets up Kitty terminal
 #+BEGIN_SRC nix :tangle generated/modules/terminals/kitty.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, ... }:
+{ lib, config, pkgs, ... }:
 
 let
-  # --- 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 ---
-  programAssets  = ../../../assets/system/conf/${programName};
-  programFiles   = builtins.readDir programAssets;
-
-  # Map each file → attrset for easy deployment
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${programAssets}/${name}";
-  });
 in
 {
-  # --- Top-level toggle for this module ---
   options.enableKitty = lib.mkEnableOption "Enable kitty terminal";
 
-  # --- Actual configuration (applied only if enabled) ---
+  config = lib.mkIf (config.enableKitty or true) {
-  config = lib.mkIf enableProgram {
+    myApps.${programName} = { enable = true; };
 
-    # Dendritic container: all program config under myApps
-    myApps.${programName} = {
-      enable    = true;
-      user      = username;
-      assetsDir = programAssets;
-      files     = files;
-
-      # Program-specific metadata
-      theme = "catppuccin-mocha";
-    };
-
-    # Deploy asset files for Home Manager users
-    home-manager.users.${username} = {
-      programs.kitty.enable = true;
-
-      xdg.configFile = 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" ];
+      wantedBy = [ "multi-user.target" ];
-      wants       = [ "network-online.target" ];
-      after       = [ "network-online.target" ];
 
       serviceConfig = {
         Type = "oneshot";
         ExecStart = ''
-          set -euo pipefail
+          echo "Syncing ${programName}"
-          CONF="${programAssets}"
-
-          # Example loop over files; adapt per program
-          for f in ${programAssets}/*; do
-            echo "Processing $f..."
-          done
         '';
       };
 
-      restartTriggers = [ programAssets ];
+      restartTriggers = [];
 
+      # Use pkgs passed to module
       path = [
         pkgs.coreutils
         pkgs.gnugrep

Droidnix/generated/modules/terminals/kitty.nix

@@ -1,71 +1,28 @@
-{ lib, config, ... }:
+{ lib, config, pkgs, ... }:
 
 let
-  # --- 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 ---
-  programAssets  = ../../../assets/system/conf/${programName};
-  programFiles   = builtins.readDir programAssets;
-
-  # Map each file → attrset for easy deployment
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    src = "${programAssets}/${name}";
-  });
 in
 {
-  # --- Top-level toggle for this module ---
   options.enableKitty = lib.mkEnableOption "Enable kitty terminal";
 
-  # --- Actual configuration (applied only if enabled) ---
+  config = lib.mkIf (config.enableKitty or true) {
-  config = lib.mkIf enableProgram {
+    myApps.${programName} = { enable = true; };
 
-    # Dendritic container: all program config under myApps
-    myApps.${programName} = {
-      enable    = true;
-      user      = username;
-      assetsDir = programAssets;
-      files     = files;
-
-      # Program-specific metadata
-      theme = "catppuccin-mocha";
-    };
-
-    # Deploy asset files for Home Manager users
-    home-manager.users.${username} = {
-      programs.kitty.enable = true;
-
-      xdg.configFile = 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" ];
+      wantedBy = [ "multi-user.target" ];
-      wants       = [ "network-online.target" ];
-      after       = [ "network-online.target" ];
 
       serviceConfig = {
         Type = "oneshot";
         ExecStart = ''
-          set -euo pipefail
+          echo "Syncing ${programName}"
-          CONF="${programAssets}"
-
-          # Example loop over files; adapt per program
-          for f in ${programAssets}/*; do
-            echo "Processing $f..."
-          done
         '';
       };
 
-      restartTriggers = [ programAssets ];
+      restartTriggers = [];
 
+      # Use pkgs passed to module
       path = [
         pkgs.coreutils
         pkgs.gnugrep