diff --git a/modules/hyprland/fuzzel.nix b/modules/hyprland/fuzzel.nix
index e43df74..71df10e 100644
--- a/modules/hyprland/fuzzel.nix
+++ b/modules/hyprland/fuzzel.nix
@@ -18,6 +18,10 @@ desktopUserHomeConfiguration {
     ];
   };
 
+  services.cliphist = enabled {
+    extraOptions = [ "-max-items" "1000" ];
+  };
+
   programs.fuzzel = with config.theme; enabled {
     settings.main = {
       dpi-aware  = false;
diff --git a/modules/hyprland/hyprland.nix b/modules/hyprland/hyprland.nix
index 1e86f4e..946be01 100644
--- a/modules/hyprland/hyprland.nix
+++ b/modules/hyprland/hyprland.nix
@@ -33,15 +33,14 @@ in desktopSystemConfiguration {
   '';
 
   wayland.windowManager.hyprland = enabled {
+    systemd = enabled {
+      enableXdgAutostart = true;
+    };
+
     settings = {
       monitor    = [ ", preferred, auto, 1" ];
       windowrule = [ "noinitialfocus" ];
 
-      exec-once = [
-        "wl-paste --type text  --watch cliphist store -max-items 1000"
-        "wl-paste --type image --watch cliphist store -max-items 1000"
-      ];
-
       exec = [ "pkill swaybg; swaybg --image ${./wallpaper.png}" ];
 
       bindle = [
@@ -207,7 +206,6 @@ in desktopSystemConfiguration {
 
 (desktopUserHomePackages (with pkgs; [
   brightnessctl
-  cliphist
   grim
   hyprpicker
   slurp