Merge branch 'master' into cas

2 files changed, 71 insertions, 12 deletions

diff --git a/waybar/config b/waybar/config
index 18e3dc4..1aa4978 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,3 +1,4 @@
+// vim: set filetype=json5 :
 {
     "layer": "bottom",
     "position": "top",
@@ -5,7 +6,7 @@
     //"output": "%%DISPLAY%%",
     "spacing": 4,
     //"margin-top": 5,
-    //"margin-bottom":5,
+    //"margin-bottom": 5,
 
     // Choose the order of the modules
 
@@ -18,17 +19,48 @@
     "sway/workspaces": {
       "all-outputs": false,
       "persistent-workspaces": {
-        "1": ["eDP-1"],
-        "2": ["eDP-1"],
-        "3": ["eDP-1"],
-        "4": ["eDP-1"],
-        "5": ["eDP-1"],
-        "6": ["eDP-1"],
-        "7": ["eDP-1"],
-        "8": ["eDP-1"],
-        "9": ["eDP-1"],
+        "11": ["eDP-1"],
+        "12": ["eDP-1"],
+        "13": ["eDP-1"],
+        "14": ["eDP-1"],
+        "15": ["eDP-1"],
+        "16": ["eDP-1"],
+        "17": ["eDP-1"],
+        "18": ["eDP-1"],
+        "19": ["eDP-1"],
+      },
+      "format": "{icon}",
+      "format-icons": {
+        "1": "1",
+        "2": "2",
+        "3": "3",
+        "4": "4",
+        "5": "5",
+        "6": "6",
+        "7": "7",
+        "8": "8",
+        "9": "9",
+        "10": "0",
+        "11": "1",
+        "12": "2",
+        "13": "3",
+        "14": "4",
+        "15": "5",
+        "16": "6",
+        "17": "7",
+        "18": "8",
+        "19": "9",
+        "20": "0",
+        "21": "1",
+        "22": "2",
+        "23": "3",
+        "24": "4",
+        "25": "5",
+        "26": "6",
+        "27": "7",
+        "28": "8",
+        "29": "9",
       },
-      "format": "{value}",
     },
     "niri/workspaces": {
       "format": "{value}",
@@ -183,6 +215,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 9398381..ff6dc9a 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;
@@ -89,6 +89,7 @@ window#waybar.hidden {
 #custom-media,
 #custom-launcher,
 #custom-power,
+#custom-battery,
 #custom-layout,
 #custom-updater,
 #custom-snip,
@@ -215,7 +216,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{