Adjust waybar layout and sizes

Change colour of MPRIS module to distinguish from sway/window module

system/home/waybar/default.nix

@@ -19,12 +19,11 @@
       position = "top";
       # Layout
       "modules-left" = [
-        "sway/workspaces"
         "sway/window"
-      ];
-      "modules-center" = [ ];
-      "modules-right" = [
         "mpris"
+      ];
+      "modules-center" = [ "sway/workspaces" ];
+      "modules-right" = [
         "custom/notification"
         "pulseaudio"
         "network"
@@ -276,7 +275,7 @@
           return-type = "json";
         };
       tray = {
-        icon-size = builtins.floor fonts.sizes.popups;
+        icon-size = 20;
         show-passive-items = true;
         spacing = 5;
       };
@@ -289,13 +288,14 @@
       ''
         * {
             all: unset;
-            font-size: ${toString fonts.sizes.popups}px;
+            font-size: 1em;
             font-family: ${fonts.monospace.name};
         }
 
         window {
             background: transparent;
             box-shadow: none;
+            border: none;
         }
 
         window > box {
@@ -339,7 +339,6 @@
 
         #workspaces,
         #window,
-        #mpris,
         #tray,
         #backlight,
         #battery,
@@ -363,6 +362,10 @@
             color: ${sc.base09};
         }
 
+        #mpris {
+            color: ${sc.base04};
+        }
+
         #custom-notification {
             color: ${sc.base08};
         }