waybar: Switch tray and battery placement

Battery will always be displayed on the very right of the status bar
now, to easily find the indicator. Also removed the remaining time from
the alternative display which snuck in there accidentally - it can be
seen from the tooltip instead.

desktop/.config/waybar/config

@@ -2,7 +2,7 @@
     "layer": "top",
     "modules-left": ["river/tags", "custom/events", "custom/vidl", "river/window"],
     "modules-center": ["clock", "custom/media"],
-    "modules-right": ["river/mode", "custom/wireguard", "custom/archupdates", "pulseaudio", "backlight", "network", "cpu", "memory", "temperature", "battery", "tray"],
+    "modules-right": ["river/mode", "custom/wireguard", "custom/archupdates", "pulseaudio", "backlight", "network", "cpu", "memory", "temperature", "tray", "battery"],
     "custom/archupdates": {
         "format": "{icon}",
         "format-alt": "{} {icon}",
@@ -29,7 +29,7 @@
         "format": "{icon}",
         "format-warning": "{capacity}% {icon}",
         "format-critical": "{capacity}% {icon}",
-        "format-alt":"{capacity}% ({time}) {icon}",
+        "format-alt":"{capacity}% {icon}",
         "format-alt-click": "click-right",
         "format-icons": ["", "", "", "", ""],
         "interval": 10,