Merge branch 'upstream-custom' into dev

waybar/themes/ml4w-blur-custom/modules.json

@@ -247,7 +247,7 @@
 
     // Memory
     "memory": {
-        "format": "󰍛  {used:0.1f}G",
+        "format": " {used:0.1f}G",
         "on-click": "alacritty -e htop"
     },
 
@@ -305,7 +305,7 @@
     // Network
     "network": {
         "format": "{ifname}",
-        "format-wifi": "   {signalStrength}%",
+        "format-wifi": "{icon}   {signalStrength}%",
         "format-ethernet": "  {ifname}",
         "format-disconnected": "Disconnected",
         "tooltip-format": " {ifname} via {gwaddri}",
@@ -313,7 +313,8 @@
         "tooltip-format-ethernet": " {ifname}\nIP: {ipaddr}\n up: {bandwidthUpBits} down: {bandwidthDownBits}",
         "tooltip-format-disconnected": "Disconnected",
         "max-length": 50,
-        "on-click": "~/dotfiles/.settings/networkmanager.sh"
+        "on-click": "~/dotfiles/.settings/networkmanager.sh",
+        "format-icons": ["󰤯","󰤟","󰤢","󰤥","󰤨"]
     },
 
     // Battery