Merge branch 'master' into cla

2 files changed, 30 insertions, 1 deletions

diff --git a/waybar/config b/waybar/config
index c6cb9f5..9605243 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,3 +1,4 @@
+// vim: set filetype=json5 :
 {
     "layer": "bottom",
     "position": "top",
@@ -247,6 +248,13 @@
         "on-click": "rofi -show drun",
         //"on-click-right": "killall rofi"
     },
+    "custom/battery":{
+      "interval": 15,
+      "format": "{percentage}%",
+      "return-type": "json",
+      "exec": "custom-battery",
+      "tooltip": true,
+    },
     "custom/power":{
         "format": "",
         "on-click": "rofi -show p -modi p:rofi-power-menu",
diff --git a/waybar/style.css b/waybar/style.css
index f8fec13..2432be5 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -3,7 +3,7 @@
     margin: 0px;
     border-radius: 0px;
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FiraCode Nerd Font Mono;
+    font-family: JetBrainsMono Nerd Font;
     font-size: 18px;
     min-height: 0px;
     min-width: 0px;
@@ -14,6 +14,7 @@ window#waybar {
     color: #ffffff;
     transition-property: background-color;
     transition-duration: .5s;
+    background: rgba(0, 0, 0, 0.2);
 }
 
 window#waybar.hidden {
@@ -89,6 +90,7 @@ window#waybar.hidden {
 #custom-media,
 #custom-launcher,
 #custom-power,
+#custom-battery,
 #custom-layout,
 #custom-updater,
 #custom-snip,
@@ -215,7 +217,26 @@ label:focus {
     background-color: #1b1d1c;
     font-size: 18px;
     margin-right: 5px;
+}
+
+#custom-battery{
+    background-color: #1b1d1c;
+    font-size: 18px;
+}
 
+#custom-battery.battery_low{
+    background-color: yellow;
+    color: #1b1d1c;
+}
+
+#custom-battery.battery_crit{
+    background-color: red;
+    color: #1b1d1c;
+}
+
+#custom-battery.battery_charging{
+    background-color: #1d1b1c;
+    color: #198844;
 }
 
 #custom-launcher{