diff --git a/home/wm/addon/waybar/default.nix b/home/wm/addon/waybar/default.nix
index c8da0c0..db40715 100644
--- a/home/wm/addon/waybar/default.nix
+++ b/home/wm/addon/waybar/default.nix
@@ -13,9 +13,16 @@
         layer = "top";
         position = "top";
         height = 28;
-        modules-left = [ "hyprland/workspaces" "hyprland/window" "hyprland/submap" ];
+        modules-left = [ "niri/workspaces" "hyprland/workspaces" "niri/window" "hyprland/window" "hyprland/submap" ];
         modules-center = [ ];
         modules-right = [ "tray" "idle_inhibitor" "network" "bluetooth" "wireplumber" "backlight" "battery" "clock" "custom/notification" ];
+        "niri/workspaces" = {
+          all-outputs = false;
+          current-only = true;
+        };
+        "niri/window" = {
+          separate-outputs = true;
+        };
         "hyprland/workspaces" = {
           separate-outputs = true;
         };