Working on reshuffling

Droidnix/README.org

@@ -1161,30 +1161,58 @@ 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, ... }:
+{ lib, config, ... }:
 
+let
+  # --- Program definition ---
+  programName = "kitty";
+
+  # Assets directory (relative, self-contained)
+  programAssets = ../../../assets/system/conf/${programName};
+
+  # Read all files in assets dir
+  programFiles = builtins.readDir programAssets;
+
+  # Map files → attrset
+  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
 {
-  flake.nixosModules.kitty = { config, pkgs, lib, ... }:
+  # --- Option ---
+  options.enableKitty =
+    lib.mkEnableOption "Enable kitty terminal";
 
-  let
+  # --- Config ---
-    kittyConf = ./assets/system/conf/kitty/kitty.conf;
+  config = lib.mkIf enableProgram {
-    kittyTheme = ./assets/system/conf/kitty/Catppuccin-Mocha.conf;
-    username = "henrov";
-  in
-  {
-    options.mySystem.terminals.kitty.enable =
-      lib.mkEnableOption "Enable Kitty terminal";
 
-    config = lib.mkIf (config.mySystem.terminals.kitty.enable or false) {
+    myApps.${programName} = {
+      enable = true;
+      assetsDir = programAssets;
+      files = files;
+      inherit user;
 
-      home-manager.users.${username} = {
+      # Program-specific metadata
+      theme = "catppuccin-mocha";
+    };
 
-        programs.kitty.enable = true;
+    # Actual system wiring (kept minimal + scoped)
+    home-manager.users.${user} = {
 
-        xdg.configFile."kitty/kitty.conf".source = kittyConf;
+      programs.kitty.enable = true;
-        xdg.configFile."kitty/Catppuccin-Mocha.conf".source = kittyTheme;
+
+      xdg.configFile =
+        lib.mapAttrs' (name: value: {
+          name = "kitty/${name}";
+          value.source = value.src;
+        }) files;
 
-      };
     };
   };
 }

Droidnix/generated/modules/terminals/kitty.nix

@@ -1,27 +1,55 @@
-{ lib, ... }:
+{ lib, config, ... }:
 
+let
+  # --- Program definition ---
+  programName = "kitty";
+
+  # Assets directory (relative, self-contained)
+  programAssets = ../../../assets/system/conf/${programName};
+
+  # Read all files in assets dir
+  programFiles = builtins.readDir programAssets;
+
+  # Map files → attrset
+  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
 {
-  flake.nixosModules.kitty = { config, pkgs, lib, ... }:
+  # --- Option ---
+  options.enableKitty =
+    lib.mkEnableOption "Enable kitty terminal";
 
-  let
+  # --- Config ---
-    kittyConf = ./assets/system/conf/kitty/kitty.conf;
+  config = lib.mkIf enableProgram {
-    kittyTheme = ./assets/system/conf/kitty/Catppuccin-Mocha.conf;
-    username = "henrov";
-  in
-  {
-    options.mySystem.terminals.kitty.enable =
-      lib.mkEnableOption "Enable Kitty terminal";
 
-    config = lib.mkIf (config.mySystem.terminals.kitty.enable or false) {
+    myApps.${programName} = {
+      enable = true;
+      assetsDir = programAssets;
+      files = files;
+      inherit user;
 
-      home-manager.users.${username} = {
+      # Program-specific metadata
+      theme = "catppuccin-mocha";
+    };
 
-        programs.kitty.enable = true;
+    # Actual system wiring (kept minimal + scoped)
+    home-manager.users.${user} = {
 
-        xdg.configFile."kitty/kitty.conf".source = kittyConf;
+      programs.kitty.enable = true;
-        xdg.configFile."kitty/Catppuccin-Mocha.conf".source = kittyTheme;
+
+      xdg.configFile =
+        lib.mapAttrs' (name: value: {
+          name = "kitty/${name}";
+          value.source = value.src;
+        }) files;
 
-      };
     };
   };
 }