diff --git a/modules2/dwm/dwm-status/order.nix b/modules2/dwm/dwm-status/order.nix
deleted file mode 100644
index 9d383168..00000000
--- a/modules2/dwm/dwm-status/order.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  flake.modules.nixos.pc.services.dwm-status.settings.order = [
-    "audio"
-    "battery"
-    "network"
-    "time"
-  ];
-}
diff --git a/modules2/dwm/dwm-status/restart.nix b/modules2/dwm/dwm-status/restart.nix
deleted file mode 100644
index d3bd1b34..00000000
--- a/modules2/dwm/dwm-status/restart.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  flake.modules.nixos.pc.systemd.user.services.dwm-status.serviceConfig.Restart = "on-failure";
-}
diff --git a/modules2/dwm/xinitrc b/modules2/dwm/xinitrc
index d2368e09..ba020660 100644
--- a/modules2/dwm/xinitrc
+++ b/modules2/dwm/xinitrc
@@ -1,7 +1,7 @@
 systemctl --user import-environment DISPLAY
 poweralertd -s &
 set-background &
-systemctl --user start dwm-status &
+dwmblocks &
 gammastep &
 
 sxhkd &
diff --git a/modules2/hosts/t480/dwm/blocks.nix b/modules2/hosts/t480/dwm/blocks.nix
new file mode 100644
index 00000000..34b1f165
--- /dev/null
+++ b/modules2/hosts/t480/dwm/blocks.nix
@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.gui = { pkgs, ... }: {
+    home.packages = [ pkgs.dwmblocks ];
+  };
+}
diff --git a/modules2/hosts/t480/dwm/dwm-status.nix b/modules2/hosts/t480/dwm/dwm-status.nix
deleted file mode 100644
index c6770e61..00000000
--- a/modules2/hosts/t480/dwm/dwm-status.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  flake.modules.nixos.pc.services.dwm-status.enable = true;
-}