diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index cc49951..67f1cb2 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,7 +1,5 @@
 { pkgs, ... }: {
   imports = [
-    ./firefox.nix
-    ./kanshi.nix
     ./network.nix
     ./ssh.nix
     ./sway.nix
@@ -10,6 +8,7 @@
 
   environment.systemPackages = with pkgs; [
     discord
+    firefox-wayland
     keepassxc
     mpv
     spotify
diff --git a/modules/desktop/firefox.nix b/modules/desktop/firefox.nix
deleted file mode 100644
index 7e4f021..0000000
--- a/modules/desktop/firefox.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }: {
-  # https://nixos.wiki/wiki/Firefox
-
-  environment.systemPackages = with pkgs; [
-    firefox-wayland
-  ];
-}
diff --git a/modules/desktop/kanshi.nix b/modules/desktop/kanshi.nix
deleted file mode 100644
index 7935499..0000000
--- a/modules/desktop/kanshi.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ home-manager, lib, pkgs, ... }: {
-  # https://nix-community.github.io/home-manager/options.html
-
-  home-manager.users.caspervk = {
-    services.kanshi = {
-      enable = true;
-      profiles = {
-        # Output names ("criteria") from `swaymsg -t get_outputs`.
-        home.outputs = [
-          {
-            criteria = "ASUSTek COMPUTER INC ROG XG27AQ M3LMQS370969";
-            mode = "2560x1440@144Hz";
-            position = "0,0";
-            adaptiveSync = true;
-          }
-          {
-            criteria = "BNQ BenQ XL2411Z SCD06385SL0";
-            mode = "1920x1080@144Hz";
-            position = "2560,0";
-          }
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/desktop/sway.nix b/modules/desktop/sway.nix
index c2ff9cd..444bd58 100644
--- a/modules/desktop/sway.nix
+++ b/modules/desktop/sway.nix
@@ -109,6 +109,26 @@
           { timeout = 600; command = lock; }
         ];
       };
+
+    services.kanshi = {
+      enable = true;
+      profiles = {
+        # Output names ("criteria") from `swaymsg -t get_outputs`.
+        home.outputs = [
+          {
+            criteria = "ASUSTek COMPUTER INC ROG XG27AQ M3LMQS370969";
+            mode = "2560x1440@144Hz";
+            position = "0,0";
+            adaptiveSync = true;
+          }
+          {
+            criteria = "BNQ BenQ XL2411Z SCD06385SL0";
+            mode = "1920x1080@144Hz";
+            position = "2560,0";
+          }
+        ];
+      };
+    };
   };
 
   environment.systemPackages = with pkgs; [