From ae7cc50cac4c06ca7d2876b431a8505d94c371ad Mon Sep 17 00:00:00 2001
From: Trimutex <gregcraw2001@gmail.com>
Date: Tue, 16 Jan 2024 22:40:16 -0600
Subject: [PATCH] Updated waybar

---
 waybar/config.json | 72 ++++++++++++++++++++++++++++------------------
 waybar/style.css   | 65 +++++++++++------------------------------
 2 files changed, 61 insertions(+), 76 deletions(-)

diff --git a/waybar/config.json b/waybar/config.json
index bc8f6a1..3496026 100755
--- a/waybar/config.json
+++ b/waybar/config.json
@@ -3,27 +3,37 @@
         "name": "main",
         "layer": "top",
         "position": "top",
-        "height": 34,
+        "height": 38,
         "spacing": 4,
-        "margin-top": 10,
+        "margin-top": 4,
         "margin-bottom": 0,
-        "output": "DP-2",
+        "output": "eDP-1",
         "modules-left": [
-            "wireplumber", 
             "disk", 
             "memory", 
             "cpu", 
-            "temperature"
+            "temperature",
+            "pulseaudio"
         ],
-        "modules-center": ["wlr/taskbar"],
+        "modules-center": ["hyprland/workspaces"],
         "modules-right": [
-            "hyprland/workspaces",
             "tray", 
+            "network#wifi", 
             "custom/weather", 
-            "network#ethernet", 
+            "battery",
             "clock",
             "custom/poweroff"
         ],
+        "battery": {
+            "interval": 60,
+            "states": {
+                "warning": 30,
+                "critical": 15
+            },
+            "format": "{icon} {capacity}%",
+            "format-icons": ["", "", "", "", "", ""],
+            "max-length": 25
+        },
         "clock": {
             "interval": 1,
             "format": "<b>{:%H:%M:%S}</b>",
@@ -51,26 +61,34 @@
         },
         "temperature": {
             "critical-threshold": 80,
-            "format": " {icon} {temperatureC}°C  ",
+            "format": "{icon} {temperatureC}°C",
             "format-icons": ["", "", "", "", ""],
             "hwmon-path": "/sys/class/thermal/thermal_zone2/temp"
         },
-        "network#ethernet": {
-            "interface": "enp*",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
+        "network#wifi": {
+            "interface": "wlo1",
+            "format-wifi": " {essid} ({signalStrength})%",
             "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
-        },
-        "sway/mode": {
-            "format": "<span style=\"italic\">{}</span>"
+            "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
         },
         "hyprland/workspaces": {
-            "format": "{name}",
+            "format": "{icon}",
             "sort-by-number": true,
-            "all-outputs": true
+            "all-outputs": true,
+            "disable-scroll": true,
+            "active-only": false,
+            "format-icons": {
+                "default": "",
+                "persistent": "",
+                "active": ""
+            },
+            "persistent-workspaces": {
+                "1": [ ],
+                "2": [ ],
+                "3": [ ],
+                "4": [ ],
+                "5": [ ]
+            }
         },
         "wlr/taskbar": {
             "format": "{name}",
@@ -84,19 +102,17 @@
             ],
             "rewrite": {
                 "(.*)Firefox Web Browser": "",
-                "(.*)Discord": "",
+                "(.*)Discord": "󰙯",
                 "(.*)Alacritty": "",
                 "Steam(.*)": "",
                 "(.*)Spotify": ""
             }
         },
-        "wireplumber": {
+        "pulseaudio": {
             "format": " {volume}%",
             "format-muted": " 0%",
-            "on-click": "pavucontrol",
-            "on-click-right": "helvum",
             "max-volume": 100,
-            "scroll-step": 5
+            "scroll-step": 0
         },
         "tray": {
             "icon-size": 21,
@@ -112,10 +128,10 @@
         "custom/poweroff": {
             "tooltip": false,
             "format": " ",
-            "on-click": "bash $HOME/.config/waybar/scripts/poweroff.sh"
+            "on-click": "bash ~/.config/waybar/scripts/poweroff.sh"
         },
         "custom/weather": {
-            "exec": "$HOME/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
+            "exec": "~/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
             "return-type": "json",
             "format": "{}",
             "tooltip": true,
diff --git a/waybar/style.css b/waybar/style.css
index a5dae49..e29a7bf 100755
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,47 +1,34 @@
-@import "mocha.css";
+@import "frappe.css";
 
 * {
     border: none;
     border-radius: 0px;
     min-height: 0;
-	font-size: 15px;
+	font-size: 14px;
 	font-family: "Hack Nerd Font";
-    /*background: @base;*/
 }
 
 window#waybar {
     background-color: transparent;
-	color: #ffffff;
-    transition-property: background-color;
-    transition-duration: .5s;
+	color: @text;
 }
 
-window#waybar.hidden {
-    opacity: 0.2;
+#workspaces {
+    margin: 4px 0;
+    border-radius: 5px;
+    background: transparent;
 }
 
 #workspaces button {
-    border-radius: 20px;
+    color: @overlay0;
+    background: transparent;
+    transition: all 0.1s ease;
 }
 
-#workspaces button:hover {
-    color: black;
-    border-bottom: 3px solid #ffffff;
-}
-
-#mode {
-    background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
-}
-
-/* Sections */
-
-.modules-left,
-.modules-center,
-.modules-right {
-    border-radius: 20px;
-    border: 3px solid @crust;
-    padding: 0 10px;
+#workspaces button.active {
+    color: @lavender;
+    border-top: 2px solid @lavender;
+    transition: all 0.1s ease;
 }
 
 #clock,
@@ -50,29 +37,14 @@ window#waybar.hidden {
 #memory,
 #network,
 #temperature,
-#taskbar,
 #tray,
-#workspaces,
-#wireplumber,
+#pulseaudio,
 #custom-poweroff,
-#custom-weather,
-#custom-spotify {
+#custom-weather {
 	padding: 0 10px;
 }
 
-.modules-left {
-    background-image: linear-gradient(90deg, @base, @surface0, @surface2);
-}
-
-.modules-center {
-    background-image: linear-gradient(270deg, @base, @overlay2, @base);
-}
-
-.modules-right {
-    background-image: linear-gradient(270deg, @base, @surface0, @surface2);
-}
-
-#wireplumber{
+#pulseaudio {
 	color: @sapphire;
 }
 #disk {
@@ -87,6 +59,3 @@ window#waybar.hidden {
 #temperature {
     color: @sky;
 }
-#taskbar button {
-    color: @rosewater;
-}