diff --git a/flake.nix b/flake.nix
index 89cddf6..bab1a89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -159,7 +159,6 @@
                 wayland-pipewire-idle-inhibit = inputs.wayland-pipewire-idle-inhibit.homeModules.default;
               };
               wm = import ./wm/hm.nix;
-              waybar = import ./waybar/hm.nix;
               de = import ./de/hm.nix;
               personal-gui = import ./personal-gui/hm.nix;
               gaming = import ./gaming/hm.nix;
diff --git a/hostconfig/ZeNixLaptop/default.nix b/hostconfig/ZeNixLaptop/default.nix
index 8547cc5..f78fc29 100644
--- a/hostconfig/ZeNixLaptop/default.nix
+++ b/hostconfig/ZeNixLaptop/default.nix
@@ -19,7 +19,6 @@
       personal-cli
       gui
       wm
-      waybar
       gaming
     ];
   };
diff --git a/hostconfig/gandalf/default.nix b/hostconfig/gandalf/default.nix
index 022be28..b70de05 100644
--- a/hostconfig/gandalf/default.nix
+++ b/hostconfig/gandalf/default.nix
@@ -20,7 +20,6 @@
       personal-cli
       gui
       wm
-      waybar
       personal-gui
     ];
     unfreePackages = [
diff --git a/hostconfig/thinkpad-nixos/default.nix b/hostconfig/thinkpad-nixos/default.nix
index da9159f..1a3149f 100644
--- a/hostconfig/thinkpad-nixos/default.nix
+++ b/hostconfig/thinkpad-nixos/default.nix
@@ -26,7 +26,6 @@
         minimal
         personal-cli
         gui
-        waybar
         wm
       ];
     };
@@ -38,7 +37,6 @@
           work
           personal-cli
           gui
-          waybar
           wm
         ])
         ++ [
diff --git a/wm/hm.nix b/wm/hm.nix
index bb31694..d399f81 100644
--- a/wm/hm.nix
+++ b/wm/hm.nix
@@ -5,7 +5,10 @@
   ...
 }:
 {
-  imports = [ ./sway.nix ];
+  imports = [
+    ./sway.nix
+    ./waybar/hm.nix
+  ];
 
   options = {
     traxys.wm = lib.mkOption {
diff --git a/waybar/hm.nix b/wm/waybar/hm.nix
similarity index 100%
rename from waybar/hm.nix
rename to wm/waybar/hm.nix
diff --git a/waybar/waybar-khal.py b/wm/waybar/waybar-khal.py
similarity index 100%
rename from waybar/waybar-khal.py
rename to wm/waybar/waybar-khal.py
diff --git a/waybar/waybar.css b/wm/waybar/waybar.css
similarity index 100%
rename from waybar/waybar.css
rename to wm/waybar/waybar.css