diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 1e307692..18f9d6d6 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -69,19 +69,6 @@
       name = "Catppuccin-${catppuccinVariant}-${size}-${accent}-Dark";
     };
   };
-  systemd.user.services.hyprpaper = {
-    Unit = {
-      Description = "Hyprland wallpaper utility";
-      Wants = ["hyprland-session.target"];
-      After = ["hyprland-session.target"];
-    };
-    Service = {
-      Environment = ["PATH=/run/current-system/sw/bin/:$PATH"];
-      Restart = "always";
-      ExecStart = "${pkgs.hyprpaper}/bin/hyprpaper";
-    };
-    Install.WantedBy = ["default.target"];
-  };
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
@@ -103,10 +90,13 @@
         "GRIM_DEFAULT_DIR=${xdg.userDirs.pictures}/Grim"
       ];
       exec-once = with config; [
+        "systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME"
         "${wayland.windowManager.hyprland.finalPackage}/bin/hyprctl setcursor ${stylix.cursor.name} ${toString stylix.cursor.name}"
         "${pkgs.swaynotificationcenter}/bin/swaync"
         "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"
         "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n"
+        "${pkgs.waybar}/bin/waybar"
+        "${pkgs.hyprpaper}/bin/hyprpaper"
       ];
       gestures.workspace_swipe = true;
       input = {
@@ -368,10 +358,6 @@
         "SUPER, mouse:273, resizewindow"
       ];
     };
-    extraConfig = ''
-      exec-once = systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME
-      exec-once = systemctl --user restart "xdg-desktop-portal*" foot waybar hyprpaper
-    '';
   };
   xdg.configFile = {
     "hypr/hyprpaper.conf".text = ''
diff --git a/home/waybar/default.nix b/home/waybar/default.nix
index 384e087d..2f5b7c30 100644
--- a/home/waybar/default.nix
+++ b/home/waybar/default.nix
@@ -10,10 +10,6 @@
   };
   programs.waybar = {
     enable = true;
-    systemd = {
-      enable = true;
-      target = "hyprland-session.target";
-    };
     settings.main = {
       layer = "top";
       position = "top";