From c7035346fae65bf4015b0d70b3974702c6f51c65 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Thu, 19 Mar 2026 06:54:09 +0000
Subject: [PATCH] Working on reshuffling

---
 Droidnix/README.org                           | 37 ++++++++++++++-----
 .../generated/modules/terminals/kitty.nix     | 37 ++++++++++++++-----
 2 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index 2834ee330..4d0e32464 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1180,16 +1180,35 @@ 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
-{ config, pkgs, lib, user, flakeRoot, ... }:
-let
-  kittyConf = "${flakeRoot}/assets/system/conf/kitty/kitty.conf";
-  kittyTheme = "${flakeRoot}/assets/system/conf/kitty/Catppuccin-Mocha.conf";
-in
+{ lib, ... }:
+
 {
-  home-manager.users.${user.username} = {
-    programs.kitty.enable = true;
-    xdg.configFile."kitty/kitty.conf".source = kittyConf;
-    xdg.configFile."kitty/Catppuccin-Mocha.conf".source = kittyTheme;
+  flake.nixosModules.kitty = { config, pkgs, lib, ... }:
+
+  let
+    # ✅ relatieve paden i.p.v. flakeRoot
+    kittyConf = ./assets/system/conf/kitty/kitty.conf;
+    kittyTheme = ./assets/system/conf/kitty/Catppuccin-Mocha.conf;
+
+    # ✅ vaste user (of uit config halen)
+    username = "henrov";
+  in
+  {
+    options.mySystem.terminals.kitty.enable =
+      lib.mkEnableOption "Enable Kitty terminal";
+
+    config = lib.mkIf (config.mySystem.terminals.kitty.enable or false) {
+
+      # 👇 juiste Home Manager scope
+      home-manager.users.${username} = {
+
+        programs.kitty.enable = true;
+
+        xdg.configFile."kitty/kitty.conf".source = kittyConf;
+        xdg.configFile."kitty/Catppuccin-Mocha.conf".source = kittyTheme;
+
+      };
+    };
   };
 }
 #+END_SRC
diff --git a/Droidnix/generated/modules/terminals/kitty.nix b/Droidnix/generated/modules/terminals/kitty.nix
index aa2a086b2..ac1ee314f 100644
--- a/Droidnix/generated/modules/terminals/kitty.nix
+++ b/Droidnix/generated/modules/terminals/kitty.nix
@@ -1,12 +1,31 @@
-{ config, pkgs, lib, user, flakeRoot, ... }:
-let
-  kittyConf = "${flakeRoot}/assets/system/conf/kitty/kitty.conf";
-  kittyTheme = "${flakeRoot}/assets/system/conf/kitty/Catppuccin-Mocha.conf";
-in
+{ lib, ... }:
+
 {
-  home-manager.users.${user.username} = {
-    programs.kitty.enable = true;
-    xdg.configFile."kitty/kitty.conf".source = kittyConf;
-    xdg.configFile."kitty/Catppuccin-Mocha.conf".source = kittyTheme;
+  flake.nixosModules.kitty = { config, pkgs, lib, ... }:
+
+  let
+    # ✅ relatieve paden i.p.v. flakeRoot
+    kittyConf = ./assets/system/conf/kitty/kitty.conf;
+    kittyTheme = ./assets/system/conf/kitty/Catppuccin-Mocha.conf;
+
+    # ✅ vaste user (of uit config halen)
+    username = "henrov";
+  in
+  {
+    options.mySystem.terminals.kitty.enable =
+      lib.mkEnableOption "Enable Kitty terminal";
+
+    config = lib.mkIf (config.mySystem.terminals.kitty.enable or false) {
+
+      # 👇 juiste Home Manager scope
+      home-manager.users.${username} = {
+
+        programs.kitty.enable = true;
+
+        xdg.configFile."kitty/kitty.conf".source = kittyConf;
+        xdg.configFile."kitty/Catppuccin-Mocha.conf".source = kittyTheme;
+
+      };
+    };
   };
 }