diff --git a/modules/home/waybar/waybar.nix b/modules/home/waybar/waybar.nix
index bbc3d18..b70a0a6 100644
--- a/modules/home/waybar/waybar.nix
+++ b/modules/home/waybar/waybar.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.waybar.enable = true;
   programs.waybar.systemd.enable = true;
 
@@ -6,6 +10,13 @@
   services.network-manager-applet.enable = true;
   services.pasystray.enable = true;
 
+  # is already fixed on latest home-manager rev
+  systemd.user.services = {
+    blueman-applet.Unit.After = lib.mkForce ["graphical-session.target"];
+    network-manager-applet.Unit.After = lib.mkForce ["graphical-session.target"];
+    pasystray.Unit.After = lib.mkForce ["graphical-session.target"];
+  };
+
   home.packages = with pkgs; [
     pulsemixer
     pavucontrol