Merge branch 'master' into car

2 files changed, 8 insertions, 4 deletions

diff --git a/waybar/config b/waybar/config
index 9c7c2c5..39fda47 100644
--- a/waybar/config
+++ b/waybar/config
@@ -157,7 +157,7 @@
         "tooltip": false
     },
     "memory": {
-        "format": "{}% "
+        "format": "{used}G "
     },
     "battery": {
         "bat": "BAT0",
@@ -192,7 +192,7 @@
     },
     "network": {
         // "interface": "wlp2*", // (Optional) To force the use of this interface
-        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-wifi": "{essid} ",
         "format-ethernet": "Connected  ",
         "tooltip-format": "{ifname} via {gwaddr} ",
         "format-linked": "{ifname} (No IP) ",
@@ -223,7 +223,7 @@
     },
     "custom/power":{
         "format": "",
-        "on-click": "rofi -show p -modi p:rofi-power-menu",
+        "on-click": "power-menu",
         //"on-click-right": "killall rofi"
     },
     "custom/snip":{
diff --git a/waybar/style.css b/waybar/style.css
index 6ecb923..599e6af 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -160,11 +160,13 @@ label:focus {
 #cpu {
     background-color: #1b1d1c;
     color: #ffffff;
+    padding-right: 18px;
 }
 
 #memory {
     background-color: #198844;
     color: #ffffff;
+    padding-right: 18px;
 }
 
 #disk {
@@ -180,6 +182,7 @@ label:focus {
 #network {
     background-color: #198844;
     color: #ffffff;
+    padding-right: 18px;
 }
 
 #network.disconnected {
@@ -190,6 +193,7 @@ label:focus {
 #wireplumber {
     background-color: #198844;
     color: #ffffff;
+    padding-right: 18px;
 }
 
 #wireplumber.muted {
@@ -323,7 +327,7 @@ label:focus {
 #idle_inhibitor {
     background-color: #1b1d1c;
     border-radius: 20px 0px 0px 20px;
-
+    padding-right: 18px;
 }
 
 #idle_inhibitor.activated {