new wm, hyprland gone

modules/desktop/waybar.nix

@@ -8,7 +8,6 @@ in {
     enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors.";
     package = mkOption {
       type = types.package;
-      # default = inputs.waybar.packages.${system}.default;
       default = pkgs.waybar;
       example = "pkgs.waybar";
     };
@@ -35,8 +34,8 @@ in {
           margin-right = 6;
           margin-bottom = 0;
           modules-left = [
-            "hyprland/workspaces"
-            "hyprland/window"
+            "niri/workspaces"
+            "niri/window"
           ];
           modules-center = [
             "clock"
@@ -114,24 +113,15 @@ in {
             tooltip-format = "Change wallpaper";
             on-click = "${config.modules.desktop.swww.swapScript}";
           };
-          "hyprland/workspaces" = {
+          "niri/workspaces" = {
             format = "{icon}";
             format-icons = {
-              "1" = "";
-              "2" = "";
-              "3" = "";
-              "4" = "";
-              urgent = "";
-              default = "•";
-            };
-            persistent-workspaces = {
-              "1" = [];
-              "2" = [];
-              "3" = [];
-              "4" = [];
+              urgent = "◈";
+              focused = "◆";
+              default = "◇";
             };
           };
-          "hyprland/window" = {
+          "niri/window" = {
             format = "{}";
             icon = true;
             icon-size = 16;
@@ -170,7 +160,7 @@ in {
               default = ["" "" ""];
             };
             scroll-step = 1;
-            on-click = "${lib.getExe pkgs.pavucontrol}";
+            on-click = "${lib.getExe pkgs.pwvucontrol}";
             ignored-sinks = ["Easy Effects Sink"];
           };
           backlight = {