update niri config

user/waybar/default.nix

@@ -10,8 +10,55 @@ let
     theme
     accent
     font
+    desktop
     ;
   inherit (theme) color;
+  workspaceModule = if desktop == "niri" then "niri/workspaces" else "sway/workspaces";
+  windowModule = if desktop == "niri" then "niri/window" else "sway/window";
+  languageModule = if desktop == "niri" then "niri/language" else "sway/language";
+  workspaceSettings =
+    if desktop == "niri" then
+      {
+        all-outputs = false;
+        current-only = false;
+        format = "{icon}";
+        format-icons = {
+          "1" = "";
+          "2" = "";
+          "3" = "󰅩";
+          "4" = "";
+          "5" = "";
+          "6" = "";
+          "7" = "󰇮";
+          "8" = "";
+          "9" = "";
+          "10" = "";
+          empty = "";
+          active = "";
+          focused = "";
+          urgent = "";
+          default = "";
+        };
+      }
+    else
+      {
+        enable-bar-scroll = true;
+        format = "{icon}";
+        format-icons = {
+          "1" = "";
+          "2" = "";
+          "3" = "󰅩";
+          "4" = "";
+          "5" = "";
+          "6" = "";
+          "7" = "󰇮";
+          "8" = "";
+          "9" = "";
+          "10" = "";
+          urgent = "";
+          default = "";
+        };
+      };
 
   cfg = config.my.waybar;
 in
@@ -22,18 +69,18 @@ in
     programs.waybar = {
       enable = true;
       systemd.enable = true;
-      systemd.target = "sway-session.target";
+      systemd.target = "graphical-session.target";
       settings = [
         {
           layer = "top";
           modules-left = [
-            "sway/workspaces"
-            "sway/mode"
-            "sway/window"
-          ];
+            workspaceModule
+          ]
+          ++ (lib.optional (desktop != "niri") "sway/mode")
+          ++ [ windowModule ];
           modules-center = [ "clock" ];
           modules-right = lib.flatten [
-            "sway/language"
+            languageModule
             "mpd"
             "custom/playerctl"
             "tray"
@@ -82,26 +129,8 @@ in
             format-linked = "󰈀";
             format-disconnected = "";
           };
-          "sway/workspaces" = {
-            enable-bar-scroll = true;
-            format = "{icon}";
-            format-icons = {
-              "1" = "";
-              "2" = "";
-              "3" = "󰅩";
-              "4" = "";
-              "5" = "";
-              "6" = "";
-              "7" = "󰇮";
-              "8" = "";
-              "9" = "";
-              "10" = "";
-              urgent = "";
-              # focused = "";
-              default = "";
-            };
-          };
-          "sway/window" = {
+          "${workspaceModule}" = workspaceSettings;
+          "${windowModule}" = {
             max-length = 40;
           };
           "tray" = {
@@ -158,7 +187,7 @@ in
             interval = 1;
             tooltip = false;
           };
-          "sway/language" = {
+          "${languageModule}" = {
             format = "{short} {variant}";
           };
           "custom/controller-battery" = {