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

---
 Droidnix/README.org                                       | 7 ++++++-
 Droidnix/generated/modules/traveldroid/desktop/waybar.nix | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Droidnix/README.org b/Droidnix/README.org
index ed03053dd..117613628 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -816,12 +816,17 @@ This file installs and configures waybar
 
 let
   waybarPath = "${pkgs.waybar}/bin/waybar";
+
+  # Pick the first non-system user automatically
+  myUser = builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users));
 in
 {
+  # Install Waybar in the system
   environment.systemPackages = [
     pkgs.waybar
   ];
 
+  # User systemd service for Waybar
   systemd.user.services.waybar = {
     description = "Waybar for Hyprland";
     after = [ "graphical-session.target" ];
@@ -832,7 +837,7 @@ in
       Environment = ''
         WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"}
         XDG_CURRENT_DESKTOP=Hyprland
-        XDG_RUNTIME_DIR=/run/user/${config.users.users.henrov.uid}
+        XDG_RUNTIME_DIR=/run/user/${config.users.users.${myUser}.uid}
       '';
     };
 
diff --git a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
index 7e3327f1d..27985b244 100644
--- a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
+++ b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
@@ -2,12 +2,17 @@
 
 let
   waybarPath = "${pkgs.waybar}/bin/waybar";
+
+  # Pick the first non-system user automatically
+  myUser = builtins.head (builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users));
 in
 {
+  # Install Waybar in the system
   environment.systemPackages = [
     pkgs.waybar
   ];
 
+  # User systemd service for Waybar
   systemd.user.services.waybar = {
     description = "Waybar for Hyprland";
     after = [ "graphical-session.target" ];
@@ -18,7 +23,7 @@ in
       Environment = ''
         WAYLAND_DISPLAY=${config.environment.sessionVariables.WAYLAND_DISPLAY or "wayland-0"}
         XDG_CURRENT_DESKTOP=Hyprland
-        XDG_RUNTIME_DIR=/run/user/${config.users.users.henrov.uid}
+        XDG_RUNTIME_DIR=/run/user/${config.users.users.${myUser}.uid}
       '';
     };