diff --git a/modules/home-manager/programs/waybar.nix b/modules/home-manager/programs/waybar.nix
index 129ae1e..6ed7256 100644
--- a/modules/home-manager/programs/waybar.nix
+++ b/modules/home-manager/programs/waybar.nix
@@ -1,6 +1,16 @@
 {
-  programs.waybar = {
-    enable = true;
-    systemd.enable = true;
-  };
+  lib,
+  nixosConfig,
+  ...
+}:
+{
+  config = lib.mkMerge [
+    # Auto-enable Waybar only if system has a desktop environment
+    (lib.mkIf (nixosConfig != null && !nixosConfig.osbmModules.desktopEnvironment.none) {
+      programs.waybar = {
+        enable = lib.mkDefault true;
+        systemd.enable = true;
+      };
+    })
+  ];
 }