From a6c7a8807597a2a0f8e4ceebc46305562c7a4bc8 Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Tue, 17 Mar 2026 10:54:54 +0000
Subject: [PATCH] waybar is causing errors

---
 Droidnix/generated/system/core/waybar.nix | 24 ++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Droidnix/generated/system/core/waybar.nix b/Droidnix/generated/system/core/waybar.nix
index 0b3eab978..b8ae2e8c2 100644
--- a/Droidnix/generated/system/core/waybar.nix
+++ b/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
+  '';
 }