diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index 10c198b..939186c 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -11,7 +11,12 @@ let
   keyboardLayout = config.var.keyboardLayout;
 in {
 
-  imports = [ ./animations.nix ./bindings.nix ./polkitagent.nix ];
+  imports = [
+    ./animations.nix
+    ./bindings.nix
+    ./polkitagent.nix
+    # ./hyprspace.nix
+  ];
 
   home.packages = with pkgs; [
     qt5.qtwayland
@@ -42,8 +47,6 @@ in {
     systemd.enable = true;
     package = inputs.hyprland.packages."${pkgs.system}".hyprland;
 
-    plugins = [ inputs.hyprspace.packages.${pkgs.system}.Hyprspace ];
-
     settings = {
       "$mod" = "SUPER";
       "$shiftMod" = "SUPER_SHIFT";
@@ -53,8 +56,6 @@ in {
         "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
       ];
 
-      plugin = { overview = { autoDrag = false; }; };
-
       monitor = [
         "eDP-2,highres,0x0,1"
         "DP-7, disable"
diff --git a/home/system/hyprland/hyprspace.nix b/home/system/hyprland/hyprspace.nix
new file mode 100644
index 0000000..29ca6a6
--- /dev/null
+++ b/home/system/hyprland/hyprspace.nix
@@ -0,0 +1,7 @@
+{ inputs, pkgs, ... }: {
+
+  wayland.windowManager.hyprland = {
+    plugins = [ inputs.hyprspace.packages.${pkgs.system}.Hyprspace ];
+    settings = { plugin = { overview = { autoDrag = false; }; }; };
+  };
+}