Reordered icons.

I'm going to do a series of refactoring commit and wanted to change some
things prior.

waybar/config.json

@@ -3,7 +3,7 @@
     "height": 35,
     "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
     "modules-center": ["sway/window"],
-    "modules-right": ["pulseaudio", "network", "cpu", "memory", "backlight", "battery", "battery#bat2", "clock", "tray", "idle_inhibitor"],
+    "modules-right": ["pulseaudio", "network", "cpu", "memory", "backlight", "battery", "clock", "tray", "idle_inhibitor"],
      "sway/workspaces": {
          "disable-scroll": true,
          "all-outputs": true
@@ -26,35 +26,34 @@
         "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
-        "format": "{usage}% "
+        "format": " {usage}%"
     },
     "memory": {
-        "format": "{}% "
+        "format": " {}%"
     },
     "backlight": {
-        "format": "{percent}% {icon}",
+        "format": "{icon} {percent}% ",
         "format-icons": ["", ""]
     },
     "battery": {
+        "interval": 1,
         "states": {
             "good": 95,
             "warning": 30,
             "critical": 15
         },
-        "format": "{capacity}% {icon}",
+        "format": " {capacity}%", 
+        "format-discharging": "{icon} {capacity}%",
         "format-icons": ["", "", "", "", ""]
     },
-    "battery#bat2": {
-        "bat": "BAT2"
-    },
     "network": {
-        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-wifi": " {essid} ({signalStrength}%)",
         "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
         "format-disconnected": "⚠",
         "on-click": "rofi-wifi-menu"
     },
     "pulseaudio": {
-        "format": "{volume}% {icon}",
+        "format": "{icon} {volume}%",
         "format-bluetooth": "{volume}% {icon}",
         "format-muted": "",
         "format-icons": {