diff --git a/home/alex/home.nix b/home/alex/home.nix
index e88d65b..9c336be 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -4,13 +4,11 @@
   imports = [
     ./cli.nix
     ./programs/rofi
-    ./programs/xmonad
     ./services/polybar
     ./services/dunst
     ./services/udiskie
     ./services/picom
     ./services/screen-locker
-    ./services/blueman-applet
   ];
 
   home = {
diff --git a/home/alex/programs/xmonad/default.nix b/home/alex/programs/xmonad/default.nix
deleted file mode 100644
index 486cc14..0000000
--- a/home/alex/programs/xmonad/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  config.xsession.windowManager.xmonad = {
-    enable = true;
-    enableContribAndExtras = true;
-    config = ./config.hs;
-  };
-
-  # control backlight
-  config.home.packages = [ pkgs.xorg.xbacklight pkgs.scrot ];
-}
diff --git a/home/alex/services/blueman-applet/default.nix b/home/alex/services/blueman-applet/default.nix
deleted file mode 100644
index 649ac05..0000000
--- a/home/alex/services/blueman-applet/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  config.services.blueman-applet = { enable = true; };
-}
diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix
index cd23964..d38e601 100644
--- a/hosts/dregil/configuration.nix
+++ b/hosts/dregil/configuration.nix
@@ -17,7 +17,6 @@ in {
     ./hardware-configuration.nix
     # <nixos-hardware/lenovo/legion/15ich>
     ../../modules/appimage.nix
-    ../../modules/sudo.nix
     ../../modules/wm/x.nix
     ../../modules/wm/xmonad/default.nix
   ];
diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 3eb7eb4..b55c64c 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -12,7 +12,6 @@ in {
     inputs.snm.nixosModule
     inputs.agenix.nixosModules.age
     ../../modules/security.nix
-    ../../modules/sudo.nix
     ../../modules/upgrade-pg-cluster.nix
     ../../modules/nix-config.nix
     ../../modules/iohk.nix
@@ -111,6 +110,18 @@ in {
     defaults.email = "alex@jakalx.net";
   };
 
+  security.sudo = {
+    enable = true;
+    execWheelOnly = true;
+    extraRules = [{
+      groups = [ "wheel" ];
+      commands = [{
+        command = "/run/current-system/sw/bin/nixos-rebuild";
+        options = [ "NOPASSWD" ];
+      }];
+    }];
+  };
+
   # Select internationalization properties.
   i18n.defaultLocale = "en_US.UTF-8";
   console = {
diff --git a/modules/sudo.nix b/modules/sudo.nix
deleted file mode 100644
index f2c4915..0000000
--- a/modules/sudo.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  config.security.sudo = {
-    enable = true;
-    execWheelOnly = true;
-    extraRules = [{
-      groups = [ "wheel" ];
-      commands = [{
-        command = "/run/current-system/sw/bin/nixos-rebuild";
-        options = [ "NOPASSWD" ];
-      }];
-    }];
-  };
-}
diff --git a/home/alex/programs/xmonad/config.hs b/modules/wm/xmonad/config.hs
similarity index 100%
rename from home/alex/programs/xmonad/config.hs
rename to modules/wm/xmonad/config.hs
diff --git a/modules/wm/xmonad/default.nix b/modules/wm/xmonad/default.nix
index 05ae3d3..dab287a 100644
--- a/modules/wm/xmonad/default.nix
+++ b/modules/wm/xmonad/default.nix
@@ -8,9 +8,14 @@
       windowManager.xmonad = {
         enable = true;
         enableContribAndExtras = true;
+        config = ./config.hs;
+        extraPackages = hp: [ hp.dbus hp.monad-logger hp.xmonad-contrib ];
       };
     };
   };
 
+  # control backlight
+  config.environment.systemPackages = [ pkgs.xorg.xbacklight pkgs.scrot ];
+
   config.systemd.services.upower.enable = true;
 }