diff --git a/modules/home/waybar/config.nix b/modules/home/waybar/config.nix
index 1387a7f..f4900e6 100644
--- a/modules/home/waybar/config.nix
+++ b/modules/home/waybar/config.nix
@@ -6,16 +6,6 @@
 }: let
   for_hyprland = config.programs.waybar.enable && config.wayland.windowManager.hyprland.enable;
 in {
-  wayland.windowManager.hyprland = lib.mkIf for_hyprland {
-    settings = {
-      exec-once = [
-        "${pkgs.waybar}/bin/waybar &"
-        "${pkgs.networkmanagerapplet}/bin/nm-applet &"
-        "${pkgs.blueman}/bin/blueman-applet &"
-      ];
-    };
-  };
-
   programs.waybar = lib.mkIf for_hyprland {
     settings.mainBar = {
       position = "top";
diff --git a/modules/home/waybar/waybar.nix b/modules/home/waybar/waybar.nix
index 437a13e..bbc3d18 100644
--- a/modules/home/waybar/waybar.nix
+++ b/modules/home/waybar/waybar.nix
@@ -1,9 +1,11 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.waybar.enable = true;
+  programs.waybar.systemd.enable = true;
+
+  services.blueman-applet.enable = true;
+  services.network-manager-applet.enable = true;
+  services.pasystray.enable = true;
+
   home.packages = with pkgs; [
     pulsemixer
     pavucontrol