3 files changed, 6 insertions, 18 deletions
diff --git a/modules/desktop/waybar/bar/main.nix b/modules/desktop/waybar/bar/main.nix
index 66a7fdd..08d816e 100644
--- a/modules/desktop/waybar/bar/main.nix
+++ b/modules/desktop/waybar/bar/main.nix
@@ -7,8 +7,8 @@
   fixed-center = false;
   expand-center = true;
 
-  modules-left = [ "hyprland/workspaces" ];
-  modules-center = [ "hyprland/window" ];
+  modules-left = [ "niri/workspaces" ];
+  modules-center = [ "niri/window" ];
   modules-right = [
     "pulseaudio"
     "battery"
diff --git a/modules/desktop/waybar/module/default.nix b/modules/desktop/waybar/module/default.nix
index 28ee0ed..b504387 100644
--- a/modules/desktop/waybar/module/default.nix
+++ b/modules/desktop/waybar/module/default.nix
@@ -18,8 +18,8 @@ let
     "clock#time" = ./time.nix;
     "custom/usque" = ./usque.nix;
     "pulseaudio" = ./volume.nix;
-    "hyprland/window" = ./window.nix;
-    "hyprland/workspaces" = ./workspaces.nix;
+    "niri/window" = ./window.nix;
+    "niri/workspaces" = ./workspaces.nix;
   };
 in
 {
diff --git a/modules/desktop/waybar/module/workspaces.nix b/modules/desktop/waybar/module/workspaces.nix
index e8a12fa..cc34d01 100644
--- a/modules/desktop/waybar/module/workspaces.nix
+++ b/modules/desktop/waybar/module/workspaces.nix
@@ -6,20 +6,8 @@
 }:
 {
   format = "{windows} <span rise='-3000' font_size='small'>{id}</span>";
-  persistent-workspaces = {
-    "*" = [
-      1
-      2
-      3
-      4
-      5
-      6
-      7
-      8
-      9
-      10
-    ];
-  };
+  sort-by-name = true;
+  all-outputs = false;
   window-rewrite-default = icons."Default";
   window-rewrite = {
     "class<chromium-browser>" = lib.mkIf config.web.chromium.enable icons."Chromium";