diff --git a/modules/desktop/cursor.nix b/modules/desktop/cursor.nix
new file mode 100644
index 0000000..6e7975e
--- /dev/null
+++ b/modules/desktop/cursor.nix
@@ -0,0 +1,18 @@
+{
+  flake.modules.nixos.desktop =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.vanilla-dmz ];
+      hjem.extraModules = [
+        {
+          niri.extraConfig = ''
+            cursor {
+                xcursor-theme "Vanilla-DMZ"
+                xcursor-size 32
+                hide-when-typing
+            }
+          '';
+        }
+      ];
+    };
+}
diff --git a/modules/desktop/niri/config.kdl b/modules/desktop/niri/config.kdl
index a385176..207ef02 100644
--- a/modules/desktop/niri/config.kdl
+++ b/modules/desktop/niri/config.kdl
@@ -36,10 +36,6 @@ layout {
     focus-ring { off; }
     border { off; }
 }
-cursor {
-    xcursor-theme "default"
-    xcursor-size 24
-}
 window-rule {
     geometry-corner-radius 12
     clip-to-geometry true
diff --git a/modules/desktop/wayland.nix b/modules/desktop/wayland.nix
index 7b7aa06..eaabd98 100644
--- a/modules/desktop/wayland.nix
+++ b/modules/desktop/wayland.nix
@@ -1,12 +1,5 @@
 { config, ... }:
 let
-  cursor =
-    { pkgs, ... }:
-    {
-      packages = [ pkgs.vanilla-dmz ];
-      environment.sessionVariables.XCURSOR_THEME = "Vanilla-DMZ";
-      environment.sessionVariables.XCURSOR_SIZE = 32;
-    };
   services =
     { pkgs, ... }:
     {
@@ -65,10 +58,7 @@ in
   flake.modules.hjem.desktop =
     { pkgs, ... }:
     {
-      imports = [
-        cursor
-        services
-      ];
+      imports = [ services ];
 
       mpv.defaultProfile = "wayland";