redid waybar

Droidnix/README.org

@@ -1145,7 +1145,6 @@ This file installs and configures waybar
 
 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
@@ -1155,22 +1154,25 @@ in
     package = pkgs.waybar;
   };
 
-  # Use Home Manager user units for Waybar
+  systemd.user.services.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";
+      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
+  '';
 }
 #+END_SRC