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

---
 Droidnix/README.org                       | 29 +++++++++++------------
 Droidnix/generated/system/core/waybar.nix | 29 +++++++++++------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index daaeb2349..a9fa8af8b 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -1142,10 +1142,12 @@ in
 This file installs and configures waybar
 #+BEGIN_SRC nix :tangle generated/system/core/waybar.nix :noweb tangle :mkdirp yes :eval never-html
 { lib, pkgs, config, flakeRoot, ... }:
+
 let
-  username = "henrov";  # Replace with your actual username
+  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"));
+  waybar-style  = pkgs.writeText "waybar-style"  (builtins.readFile (flakeRoot + "/assets/system/conf/waybar/style.css"));
 in
 {
   programs.waybar = {
@@ -1153,25 +1155,22 @@ in
     package = pkgs.waybar;
   };
 
-  systemd.user.services.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 = {
     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}";
-      Restart = "on-failure";
-      RestartSec = "5s";
+      ExecStart = "${config.programs.waybar.package}/bin/waybar -c $WAYBAR_CONFIG -s $WAYBAR_STYLE";
     };
+    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
-  '';
 }
 #+END_SRC
 
diff --git a/Droidnix/generated/system/core/waybar.nix b/Droidnix/generated/system/core/waybar.nix
index e6df40185..0b3eab978 100644
--- a/Droidnix/generated/system/core/waybar.nix
+++ b/Droidnix/generated/system/core/waybar.nix
@@ -1,8 +1,10 @@
 { lib, pkgs, config, flakeRoot, ... }:
+
 let
-  username = "henrov";  # Replace with your actual username
+  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"));
+  waybar-style  = pkgs.writeText "waybar-style"  (builtins.readFile (flakeRoot + "/assets/system/conf/waybar/style.css"));
 in
 {
   programs.waybar = {
@@ -10,23 +12,20 @@ in
     package = pkgs.waybar;
   };
 
-  systemd.user.services.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 = {
     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}";
-      Restart = "on-failure";
-      RestartSec = "5s";
+      ExecStart = "${config.programs.waybar.package}/bin/waybar -c $WAYBAR_CONFIG -s $WAYBAR_STYLE";
     };
+    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
-  '';
 }