diff --git a/Droidnix/README.org b/Droidnix/README.org
index 67bb64efb..84e8b45e4 100644
--- a/Droidnix/README.org
+++ b/Droidnix/README.org
@@ -815,20 +815,15 @@ This file installs and configures waybar
 { lib, config, pkgs, flakeRoot, ... }:
 
 let
+  # Use the config option defaultUser directly, fallback to "henrov"
+  username = config.defaultUser or "henrov";
   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
+  # Install Waybar system-wide
   environment.systemPackages = [ pkgs.waybar ];
 
-  ##############################
-  # Home Manager: only define the user entries we want
-  ##############################
+  # Home Manager user definition: only define what you need
   home-manager.users = {
     ${username} = {
       home.file = {
@@ -838,9 +833,7 @@ in
     };
   };
 
-  ##############################
-  # Systemd user service
-  ##############################
+  # Systemd user service for Waybar
   systemd.user.services.waybar = {
     description = "Waybar for Hyprland";
     after = [ "graphical-session.target" ];
diff --git a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
index 6b9b33542..1549a9f1e 100644
--- a/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
+++ b/Droidnix/generated/modules/traveldroid/desktop/waybar.nix
@@ -1,20 +1,15 @@
 { lib, config, pkgs, flakeRoot, ... }:
 
 let
+  # Use the config option defaultUser directly, fallback to "henrov"
+  username = config.defaultUser or "henrov";
   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
+  # Install Waybar system-wide
   environment.systemPackages = [ pkgs.waybar ];
 
-  ##############################
-  # Home Manager: only define the user entries we want
-  ##############################
+  # Home Manager user definition: only define what you need
   home-manager.users = {
     ${username} = {
       home.file = {
@@ -24,9 +19,7 @@ in
     };
   };
 
-  ##############################
-  # Systemd user service
-  ##############################
+  # Systemd user service for Waybar
   systemd.user.services.waybar = {
     description = "Waybar for Hyprland";
     after = [ "graphical-session.target" ];