diff --git a/hosts/snowhawk/home.nix b/hosts/snowhawk/home.nix
index a532982..acd4767 100644
--- a/hosts/snowhawk/home.nix
+++ b/hosts/snowhawk/home.nix
@@ -48,10 +48,6 @@
     homeNetwork = true;
   };
 
-  # WM Stuff
-  xsession.numlock.enable = true;
-  services.unclutter.enable = true;
-
   home.packages = with pkgs; [
     ripgrep
     unzip
diff --git a/modules/dwm.nix b/modules/dwm.nix
index 8d5c1cd..de132ca 100644
--- a/modules/dwm.nix
+++ b/modules/dwm.nix
@@ -56,5 +56,7 @@ in
       dmenu
       xclip
     ];
+
+    home-manager.sharedModules = [ (import ./home/dwm.nix) ];
   };
 }
diff --git a/modules/home/dwm.nix b/modules/home/dwm.nix
new file mode 100644
index 0000000..8b8c8f4
--- /dev/null
+++ b/modules/home/dwm.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.snowhawk.dwm;
+in
+{
+  options.snowhawk.dwm = {
+    enable = mkEnableOption "niri home-manager module";
+  };
+
+  config = mkIf cfg.enable {
+    # WM Stuff
+    xsession.numlock.enable = true;
+    services.unclutter.enable = true;
+  };
+}
+