not using xdg.config file

Droidnix/README.org

@@ -1379,10 +1379,7 @@ in
 {
   home-manager.users.${user.username} = {
     programs.kitty.enable = true;
-    # Use `.source` for store path files (flake-safe)
-    xdg.configFile."kitty/kitty.conf".source = kittyConf;
-    # Optional: if you have a theme
-    xdg.configFile."kitty/Catppuccin-Mocha.conf".source = "${flakeRoot}/assets/system/conf/kitty/Catppuccin-Mocha.conf";
+    programs.kitty.config = kittyConf;
   };
 }
 #+END_SRC

Droidnix/generated/system/applications/terminal_shell/kitty.nix

@@ -1,13 +1,17 @@
-{ config, pkgs, lib, user, flakeRoot, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  user,
+  flakeRoot,
+  ...
+}:
 let
   kittyConf = "${flakeRoot}/assets/system/conf/kitty/kitty.conf";
 in
 {
   home-manager.users.${user.username} = {
     programs.kitty.enable = true;
-    # Use `.source` for store path files (flake-safe)
     xdg.configFile."kitty/kitty.conf".source = kittyConf;
-    # Optional: if you have a theme
-    xdg.configFile."kitty/Catppuccin-Mocha.conf".source = "${flakeRoot}/assets/system/conf/kitty/Catppuccin-Mocha.conf";
   };
 }

Droidnix/generated/system/core/waybar.nix

@@ -2,7 +2,6 @@
 
 let
   username = "henrov";
-  userHome = "/home/${username}";
   waybar-config = pkgs.writeText "waybar-config" (builtins.readFile (flakeRoot + "/assets/system/conf/waybar/config"));
   waybar-style  = pkgs.writeText "waybar-style"  (builtins.readFile (flakeRoot + "/assets/system/conf/waybar/style.css"));
 in
@@ -12,20 +11,23 @@ in
     package = pkgs.waybar;
   };
 
-  # Use Home Manager user units for Waybar
-  home.file.".config/waybar/config".source = waybar-config;
-  home.file.".config/waybar/style.css".source = waybar-style;
-
-  home.sessionVariables.WAYBAR_CONFIG = "${waybar-config}";
-  home.sessionVariables.WAYBAR_STYLE  = "${waybar-style}";
-
-  home.user.services.waybar = {
+  systemd.user.services.waybar = {
     description = "Waybar (status bar for Wayland)";
+    wantedBy = [ "graphical-session.target" ];
     after = [ "graphical-session.target" ];
     serviceConfig = {
       Type = "simple";
-      ExecStart = "${config.programs.waybar.package}/bin/waybar -c $WAYBAR_CONFIG -s $WAYBAR_STYLE";
+      ExecStart = "${config.programs.waybar.package}/bin/waybar -c ${waybar-config} -s ${waybar-style}";
+      Restart = "on-failure";
+      RestartSec = "5s";
     };
-    wantedBy = [ "default.target" ]; # Home Manager user target
   };
+
+  # Create symlinks for config and style
+  system.activationScripts.waybarSetup = lib.mkAfter ''
+    mkdir -p /home/${username}/.config/waybar
+    ln -sf ${waybar-config} /home/${username}/.config/waybar/config
+    ln -sf ${waybar-style} /home/${username}/.config/waybar/style.css
+    chown -R ${username}:users /home/${username}/.config/waybar
+  '';
 }