Regenerated

Droidnix/README.org

@@ -448,7 +448,7 @@ com.todoist.Todoist
 ** =generated/modules/traveldroid/apps/kitty.nix=
 This file sets up Kitty terminal
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/apps/kitty.nix :noweb yes :mkdirp yes :eval never
-{ lib, pkgs, config, flakeRoot,... }:
+{ lib, pkgs, config, flakeRoot, ... }:
 
 let
   #################################
@@ -460,14 +460,8 @@ let
   #################################
   # Paths to assets
   #################################
-  assetPath    = "${flakeRoot}/generated/.config/kitty";
-  programFiles = builtins.readDir assetPath;
-
-  # Convert asset files into a nix attribute set
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    source = "${assetPath}/${name}";
-  });
-
+  assetPath  = "${flakeRoot}/generated/.config/${moduleName}";
+  assetFiles = builtins.attrNames (builtins.readDir assetPath);
 in
 {
   #################################
@@ -483,24 +477,32 @@ in
   home-manager.users = {
     ${username} = {
 
-      # Enable Kitty through Home Manager
-      programs.kitty.enable = true;
+      #################################
+      # Enable Kitty
+      #################################
+      programs.kitty = {
+        enable = true;
 
-      # Extra user-specific config snippet
-      programs.kitty.extraConfig = ''
-        # Include the Catppuccin-Mocha theme
-        include themes/Catppuccin-Mocha.conf
-      '';
+        extraConfig = ''
+          # Include the Catppuccin-Mocha theme
+          include themes/Catppuccin-Mocha.conf
+        '';
+      };
 
-      # Map all asset files into ~/.config/kitty/
-      home.file = lib.mkMerge (
-        map (name: { ".config/${moduleName}/${name}" = { source = files.${name}.source; }; })
-            (builtins.attrNames files)
-      );
+      #################################
+      # Copy config files
+      #################################
+      home.file =
+        (lib.mapAttrs'
+          (name: _: {
+            name = ".config/${moduleName}/${name}";
+            value.source = "${assetPath}/${name}";
+          })
+          (builtins.readDir assetPath)
+        );
     };
   };
 }
-
 #+END_SRC
 
 ** =.config/kitty/Catppuccin-Mocha.conf=
@@ -2507,15 +2509,12 @@ in
   #################################
   stylix = {
     enable = true;
-
     base16Scheme = "${flakeRoot}/assets/traveldroid/theming/stylix/catppuccin-mocha.yaml";
     polarity = "dark";
-
     targets = {
       gtk.enable = true;
       qt.enable  = true;
     };
-
     #  Define FULL cursor set OR remove entirely
     cursor = {
       name    = cursorName;

Droidnix/generated/modules/traveldroid/apps/kitty.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, config, flakeRoot,... }:
+{ lib, pkgs, config, flakeRoot, ... }:
 
 let
   #################################
@@ -10,14 +10,8 @@ let
   #################################
   # Paths to assets
   #################################
-  assetPath    = "${flakeRoot}/generated/.config/kitty";
-  programFiles = builtins.readDir assetPath;
-
-  # Convert asset files into a nix attribute set
-  files = lib.genAttrs (builtins.attrNames programFiles) (name: {
-    source = "${assetPath}/${name}";
-  });
-
+  assetPath  = "${flakeRoot}/generated/.config/${moduleName}";
+  assetFiles = builtins.attrNames (builtins.readDir assetPath);
 in
 {
   #################################
@@ -33,20 +27,29 @@ in
   home-manager.users = {
     ${username} = {
 
-      # Enable Kitty through Home Manager
-      programs.kitty.enable = true;
+      #################################
+      # Enable Kitty
+      #################################
+      programs.kitty = {
+        enable = true;
 
-      # Extra user-specific config snippet
-      programs.kitty.extraConfig = ''
-        # Include the Catppuccin-Mocha theme
-        include themes/Catppuccin-Mocha.conf
-      '';
+        extraConfig = ''
+          # Include the Catppuccin-Mocha theme
+          include themes/Catppuccin-Mocha.conf
+        '';
+      };
 
-      # Map all asset files into ~/.config/kitty/
-      home.file = lib.mkMerge (
-        map (name: { ".config/${moduleName}/${name}" = { source = files.${name}.source; }; })
-            (builtins.attrNames files)
-      );
+      #################################
+      # Copy config files
+      #################################
+      home.file =
+        (lib.mapAttrs'
+          (name: _: {
+            name = ".config/${moduleName}/${name}";
+            value.source = "${assetPath}/${name}";
+          })
+          (builtins.readDir assetPath)
+        );
     };
   };
 }

Droidnix/generated/modules/traveldroid/desktop/stylix.nix

@@ -41,15 +41,12 @@ in
   #################################
   stylix = {
     enable = true;
-
     base16Scheme = "${flakeRoot}/assets/traveldroid/theming/stylix/catppuccin-mocha.yaml";
     polarity = "dark";
-
     targets = {
       gtk.enable = true;
       qt.enable  = true;
     };
-
     #  Define FULL cursor set OR remove entirely
     cursor = {
       name    = cursorName;