diff --git a/home/homemodules/waybar/default.nix b/home/homemodules/waybar/default.nix
index 1e3a33d..acbe270 100644
--- a/home/homemodules/waybar/default.nix
+++ b/home/homemodules/waybar/default.nix
@@ -23,7 +23,7 @@ in {
           fixed-center = true;
           output = waybar.monitors;
 
-          modules-left = ["custom/launcher" "niri/workspaces" "niri/window"]; # "user"
+          modules-left = ["custom/launcher" "niri/workspaces" "niri/window" "hyprland/workspaces" "hyprland/window"]; # "user"
           modules-center = ["mpris"]; # "systemd-failed-units"
           modules-right = ["privacy" "pulseaudio" "network" "disk" "cpu" "memory" "clock" "tray"];
 
@@ -58,6 +58,27 @@ in {
             icon-size = 22;
           };
 
+          "hyprland/workspaces" = {
+            all-outputs = false;
+            format = "{icon}";
+            format-icons = {
+              default = "";
+              focused = "";
+              active = "";
+            };
+            persistent-workspaces = {
+              DP-1 = [1 2 3 4 5 6 7 8 9];
+              DP-2 = [0];
+            };
+          };
+
+          "hyprland/window" = {
+            format = "{title}";
+            separate-outputs = false;
+            icon = true;
+            icon-size = 22;
+          };
+
           mpris = {
             format = "<span>󰎇</span> {dynamic}";
             format-paused = "<span>{status_icon}</span> <i>{dynamic}</i>";