From e0897be13f0ca40413beb555de81944bcb97d2dc Mon Sep 17 00:00:00 2001
From: "info@data-pro.nu" <info@data-pro.nu>
Date: Wed, 25 Mar 2026 21:24:20 +0000
Subject: [PATCH] Regenerated

---
 Droidnix/README.org                           | 38 +++++++++++++++----
 .../modules/traveldroid/desktop/waybar.nix    | 37 +++++++++++++++---
 2 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index ac93b1a14..67bb64efb 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -812,27 +812,51 @@ in
 ** =generated/modules/traveldroid/desktop/waybar.nix=
 This file installs and configures waybar
 #+BEGIN_SRC nix :tangle generated/modules/traveldroid/desktop/waybar.nix :noweb tangle :mkdirp yes :eval never-html
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, flakeRoot, ... }:
 
 let
-  username  = config.defaultUser or "henrov";
-  assetPath = ../../../assets/system/conf/waybar;
+  assetPath = "${flakeRoot}/assets/system/conf/waybar";
+
+  # Pick a normal user safely
+  username =
+    builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false)
+      (builtins.attrNames config.users.users));
 in
 {
   # Install Waybar globally
   environment.systemPackages = [ pkgs.waybar ];
 
-  # Contribute to the existing Home Manager users map safely
-  home-manager.users = lib.recursiveUpdate config.home-manager.users {
+  ##############################
+  # Home Manager: only define the user entries we want
+  ##############################
+  home-manager.users = {
     ${username} = {
-      home.file = lib.recursiveUpdate (config.home-manager.users.${username}.home.file or {}) {
+      home.file = {
         ".config/waybar/config"  = { source = "${assetPath}/config"; };
         ".config/waybar/style.css" = { source = "${assetPath}/style.css"; };
       };
     };
   };
-}
 
+  ##############################
+  # Systemd user service
+  ##############################
+  systemd.user.services.waybar = {
+    description = "Waybar for Hyprland";
+    after = [ "graphical-session.target" ];
+
+    serviceConfig = {
+      ExecStart = "${pkgs.waybar}/bin/waybar";
+      Restart = "always";
+      Environment = ''
+        WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"}
+        XDG_CURRENT_DESKTOP=Hyprland
+      '';
+    };
+
+    wantedBy = [ "default.target" ];
+  };
+}
 #+END_SRC
 
 ** =generated/modules/traveldroid/desktop/wayland.nix=
diff --git a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
index 5c19b6d5c..6b9b33542 100644
--- a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
+++ b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
@@ -1,20 +1,45 @@
-{ lib, config, pkgs, ... }:
+{ lib, config, pkgs, flakeRoot, ... }:
 
 let
-  username  = config.defaultUser or "henrov";
-  assetPath = ../../../assets/system/conf/waybar;
+  assetPath = "${flakeRoot}/assets/system/conf/waybar";
+
+  # Pick a normal user safely
+  username =
+    builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false)
+      (builtins.attrNames config.users.users));
 in
 {
   # Install Waybar globally
   environment.systemPackages = [ pkgs.waybar ];
 
-  # Contribute to the existing Home Manager users map safely
-  home-manager.users = lib.recursiveUpdate config.home-manager.users {
+  ##############################
+  # Home Manager: only define the user entries we want
+  ##############################
+  home-manager.users = {
     ${username} = {
-      home.file = lib.recursiveUpdate (config.home-manager.users.${username}.home.file or {}) {
+      home.file = {
         ".config/waybar/config"  = { source = "${assetPath}/config"; };
         ".config/waybar/style.css" = { source = "${assetPath}/style.css"; };
       };
     };
   };
+
+  ##############################
+  # Systemd user service
+  ##############################
+  systemd.user.services.waybar = {
+    description = "Waybar for Hyprland";
+    after = [ "graphical-session.target" ];
+
+    serviceConfig = {
+      ExecStart = "${pkgs.waybar}/bin/waybar";
+      Restart = "always";
+      Environment = ''
+        WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"}
+        XDG_CURRENT_DESKTOP=Hyprland
+      '';
+    };
+
+    wantedBy = [ "default.target" ];
+  };
 }