Merge branch 'upstream-custom' into dev

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

@@ -246,21 +246,27 @@
         // END CLOCK FORMAT
     },
 
-    // System
-    "custom/system": {
-        "format": "",
+    // spacer
+    "custom/spacer": {
+        "format": " ",
+        "tooltip": false
+    },
+
+    // div
+    "custom/div": {
+        "format": " | ",
         "tooltip": false
     },
 
     // CPU
     "cpu": {
-        "format": "󰒇  {usage}%",
+        "format": "󰒇  {usage}% ",
         "on-click": "alacritty -e htop"
     },
 
     // Memory
     "memory": {
-        "format": " {used:0.1f}G",
+        "format": " {used:0.1f}G ",
         "on-click": "alacritty -e htop"
     },
 
@@ -281,7 +287,9 @@
         "orientation": "inherit",
         "modules": [
             "cpu",
+            "div",
             "memory",
+            "div",
             "network"
         ]
     },

waybar/themes/ml4w-blur-custom/style.css

@@ -295,7 +295,15 @@ window#waybar.empty #window {
     opacity:0.8;
 } */
 
-#groups
+#hardware {
+    background-color: @backgroundlight;
+    font-size: 16px;
+    color: @textcolor2;
+    border-radius: 15px;
+    padding: 2px 10px 0px 10px;
+    margin: 8px 10px 8px 0px;
+    opacity:0.8;
+}
 
 #language {
     margin-right:10px;