diff --git a/home/desktop-river/waybar.nix b/home/desktop-river/waybar.nix
index 317cfeb..6774bff 100644
--- a/home/desktop-river/waybar.nix
+++ b/home/desktop-river/waybar.nix
@@ -9,71 +9,69 @@
       modules-left = [ "river/tags" ];
       modules-center = [ "river/window" ];
       modules-right = [ "tray" "pulseaudio" "battery" "network" "clock" ];
-      modules = {
-        clock.format = ''{: %m/%d <span color="#a89984">|</span>  %H:%M}'';
-        network = {
-          format-icons = [
-            ''<span color="#fb4944">直</span>''
-            ''<span color="#fabd2f">直</span>''
-            ''<span color="#b8bb26">直</span>''
-          ];
-          format = "({ifname})";
-          format-wifi = "{icon} {signalStrength}";
-          format-disconnected = ''<span color="#a89974">睊</span>'';
-          format-ethernet = "";
-        };
-        battery = {
-          states = {
-            good = 95;
-            warning = 50;
-            critical = 20;
-          };
-          format-icons = {
-            discharging = [
-              ''<span color="#fb4944"></span>''
-              ''<span color="#fb4944"></span>''
-              ''<span color="#fb4944"></span>''
-              ''<span color="#fabd2f"></span>''
-              ''<span color="#fabd2f"></span>''
-              ''<span color="#fabd2f"></span>''
-              ''<span color="#b8bb26"></span>''
-              ''<span color="#b8bb26"></span>''
-              ''<span color="#b8bb26"></span>''
-            ]; # 
-            charging = [
-              ''<span color="#fb4944"></span>''
-              ''<span color="#fb4944"></span>''
-              ''<span color="#fabd2f"></span>''
-              ''<span color="#fabd2f"></span>''
-              ''<span color="#b8bb26"></span>''
-              ''<span color="#b8bb26"></span>''
-            ]; # 
-          };
-          format = " {capacity}";
-          format-full = "";
-          format-good-charging = "";
-          format-plugged = "";
-          format-charging = "{icon} {capacity}";
-          format-discharging = "{icon} {capacity} ({time})";
-          interval = 5;
-        };
-        pulseaudio = {
-          states = {
-            high = 101;
-            very_high = 111;
-          };
-          format-icons = [
-            ''<span color="#a89974">奄</span>''
-            ''<span color="#83a587">奔</span>''
-            ''<span color="#b8bb26">墳</span>''
-          ];
-          format = "{icon} {volume}";
-          format-bluetooth = "{icon} {volume}";
-          format-muted = "ﱝ";
-        };
-
-        tray.icon-size = 14;
+      clock.format = ''{: %m/%d <span color="#a89984">|</span>  %H:%M}'';
+      network = {
+        format-icons = [
+          ''<span color="#fb4944">直</span>''
+          ''<span color="#fabd2f">直</span>''
+          ''<span color="#b8bb26">直</span>''
+        ];
+        format = "({ifname})";
+        format-wifi = "{icon} {signalStrength}";
+        format-disconnected = ''<span color="#a89974">睊</span>'';
+        format-ethernet = "";
       };
+      battery = {
+        states = {
+          good = 95;
+          warning = 50;
+          critical = 20;
+        };
+        format-icons = {
+          discharging = [
+            ''<span color="#fb4944"></span>''
+            ''<span color="#fb4944"></span>''
+            ''<span color="#fb4944"></span>''
+            ''<span color="#fabd2f"></span>''
+            ''<span color="#fabd2f"></span>''
+            ''<span color="#fabd2f"></span>''
+            ''<span color="#b8bb26"></span>''
+            ''<span color="#b8bb26"></span>''
+            ''<span color="#b8bb26"></span>''
+          ]; # 
+          charging = [
+            ''<span color="#fb4944"></span>''
+            ''<span color="#fb4944"></span>''
+            ''<span color="#fabd2f"></span>''
+            ''<span color="#fabd2f"></span>''
+            ''<span color="#b8bb26"></span>''
+            ''<span color="#b8bb26"></span>''
+          ]; # 
+        };
+        format = " {capacity}";
+        format-full = "";
+        format-good-charging = "";
+        format-plugged = "";
+        format-charging = "{icon} {capacity}";
+        format-discharging = "{icon} {capacity} ({time})";
+        interval = 5;
+      };
+      pulseaudio = {
+        states = {
+          high = 101;
+          very_high = 111;
+        };
+        format-icons = [
+          ''<span color="#a89974">奄</span>''
+          ''<span color="#83a587">奔</span>''
+          ''<span color="#b8bb26">墳</span>''
+        ];
+        format = "{icon} {volume}";
+        format-bluetooth = "{icon} {volume}";
+        format-muted = "ﱝ";
+      };
+
+      tray.icon-size = 14;
     }];
     style = ''
       * {