diff --git a/Droidnix/README.org b/Droidnix/README.org
index 5c5b5b979..7e1a4709a 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -817,17 +817,16 @@ This file installs and configures waybar
 let
   waybarPath = "${pkgs.waybar}/bin/waybar";
 
-  # Pick the first normal (non-system) user automatically
-  normalUsers = builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users);
+  # Pick the first normal user
+  normalUsers = builtins.filter (u: (config.users.users.${u}.isNormalUser or false) != false) (builtins.attrNames config.users.users);
   myUser = if normalUsers == [] then builtins.head (builtins.attrNames config.users.users) else builtins.head normalUsers;
+
+  # Compute UID safely
+  myUid = config.users.users.${myUser}.uid;
 in
 {
-  # Install Waybar in the system
-  environment.systemPackages = [
-    pkgs.waybar
-  ];
+  environment.systemPackages = [ pkgs.waybar ];
 
-  # User systemd service for Waybar
   systemd.user.services.waybar = {
     description = "Waybar for Hyprland";
     after = [ "graphical-session.target" ];
@@ -838,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.${myUser}.uid}
+        XDG_RUNTIME_DIR=/run/user/${myUid}
       '';
     };
 
diff --git a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
index 253aa8276..2921b1c2c 100644
--- a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
+++ b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
@@ -3,17 +3,16 @@
 let
   waybarPath = "${pkgs.waybar}/bin/waybar";
 
-  # Pick the first normal (non-system) user automatically
-  normalUsers = builtins.filter (u: config.users.users.${u}.isNormalUser != false) (builtins.attrNames config.users.users);
+  # Pick the first normal user
+  normalUsers = builtins.filter (u: (config.users.users.${u}.isNormalUser or false) != false) (builtins.attrNames config.users.users);
   myUser = if normalUsers == [] then builtins.head (builtins.attrNames config.users.users) else builtins.head normalUsers;
+
+  # Compute UID safely
+  myUid = config.users.users.${myUser}.uid;
 in
 {
-  # Install Waybar in the system
-  environment.systemPackages = [
-    pkgs.waybar
-  ];
+  environment.systemPackages = [ pkgs.waybar ];
 
-  # User systemd service for Waybar
   systemd.user.services.waybar = {
     description = "Waybar for Hyprland";
     after = [ "graphical-session.target" ];
@@ -24,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.${myUser}.uid}
+        XDG_RUNTIME_DIR=/run/user/${myUid}
       '';
     };