From ad7b72af43f8818bb0991a2ae5044c2aa28aed44 Mon Sep 17 00:00:00 2001
From: Dante <150515748+xsghetti@users.noreply.github.com>
Date: Fri, 1 Mar 2024 13:22:09 -0500
Subject: [PATCH] Waybar + Pywal Changes

---
 .config/waybar/config    | 27 ++++++++++++++++--
 .config/waybar/style.css | 61 +++++++++++++++++++++++++---------------
 2 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/.config/waybar/config b/.config/waybar/config
index cbc01c40..28ea1d21 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -6,9 +6,9 @@
     // "width": 1280, // Waybar width
     // "spacing": 4, // Gaps between modules (4px)
     // Choose the order of the modules
-    "modules-left": ["custom/menu", "hyprland/workspaces", "custom/updates"],
+    "modules-left": ["custom/menu", "hyprland/workspaces", "custom/swaync", "custom/updates"],
     "modules-center": ["custom/playerctl", "custom/playerlabel"],
-    "modules-right": ["network", "custom/div", "pulseaudio", "custom/div", "clock", "tray", "custom/power"],
+    "modules-right": ["network", "pulseaudio", "clock", "tray", "custom/power"],
 
     "keyboard-state": {
         "numlock": true,
@@ -227,10 +227,31 @@
         "on-click": "activate",
         "on-click-middle": "close"
     },
+},
+"custom/swaync": {
+    "tooltip": true,
+    "format": "{icon} {}",
+    "format-icons": {
+        "notification": "<span foreground='red'><sup></sup></span>",
+        "none": "",
+        "dnd-notification": "<span foreground='red'><sup></sup></span>",
+        "dnd-none": "",
+        "inhibited-notification": "<span foreground='red'><sup></sup></span>",
+        "inhibited-none": "",
+        "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
+        "dnd-inhibited-none": ""
+    },
+    "return-type": "json",
+    "exec-if": "which swaync-client",
+    "exec": "swaync-client -swb",
+    "on-click": "sleep 0.1 && swaync-client -t -sw",
+    "on-click-right": "swaync-client -d -sw",
+    "escape": true
+},
     
 
     
 
 
     
-}
+
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index bcbc9901..0562ec47 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -15,25 +15,27 @@ window#waybar {
 
 
 tooltip {
-  background: rgba(114, 101, 138, 0.5);
-  border: 1px solid rgba(100, 114, 125, 0.5);
+  background: @color1;
+  border: 1px solid @color7;
+  color: @color7
 }
 tooltip label {
   color: white;
 }
 
 #workspaces{
-    background-color: rgba(114, 101, 138, 0.5);
-    margin-top: 3px;
+    background-color: @color1;
+    margin-top: 5px;
     margin-bottom: 3px;
     border-radius: 4px;
     margin-left: 5px;
     padding-right: 5px;
+    border: 1.2px solid @color7;
 }
 #workspaces button {
     padding: 5px 5px;
     background: transparent;
-    color: @foreground;
+    color: @color7;
     border-bottom: 3px solid transparent;
     margin-top: 3px;
     margin-left: 3px;
@@ -50,7 +52,7 @@ tooltip label {
 #workspaces button:hover{
     border-radius: 6px;
     /* background-color: rgba(114, 101, 138, 0.8); */
-    box-shadow: inset 2px 2px 2px @foreground;
+    box-shadow: inset 2px 2px 2px @color7;
 
 }
 
@@ -64,17 +66,19 @@ tooltip label {
 }
 
 #clock, #idle_inhibitor, #network, #pulseaudio, #tray, #temperature{
-    background-color: rgba(114, 101, 138, 0.5);
+    background-color: @color1;
     padding: 2px 10px;
-    margin-top: 3px;
+    margin-top: 5px;
     margin-bottom: 3px;
     padding-left: 10px;
-    color: @foreground;
+    color: @color7;
+    border: 1.2px solid @color7;
 }
 #custom-div{
-    background-color: rgba(114, 101, 138, 0.5);
+    background-color: @color1;
     margin-top: 3px;
     margin-bottom: 3px;
+    
 }
 #clock {
     padding-left: 15px;
@@ -114,12 +118,13 @@ tooltip label {
 #custom-menu{
     padding-left: 8px;
     padding-right: 11px;
-    background-color: rgba(114, 101, 138, 0.5);
+    background-color: @color1;
     border-radius: 4px;
-    margin-top: 3px;
+    margin-top: 5px;
     margin-bottom: 3px;
     margin-left: 5px;
-    color: @foreground;
+    color: @color7;
+    border: 1.2px solid @color7;
 
 }
 
@@ -136,10 +141,17 @@ tooltip label {
     padding-right: 10px;
 }
 #custom-updates{
-    padding-left: 10px;
-    color: @foreground;
-    
+    padding-left: 5px;
+    padding-right: 5px;
+    color: @color7;
+    background-color: @color1;
+    border: 1.2px solid @color7;
+    border-radius: 4px;
+    margin-top: 5px;
+    margin-bottom: 3px;
+    margin-left: 4px;
 }
+
 #pulseaudio.muted{
     color: rgb(189, 5, 5);
     font-weight: bold;
@@ -149,28 +161,33 @@ tooltip label {
 #custom-power{
     margin-right: 5px;
     margin-left: 2px;
-    margin-top: 3px;
+    margin-top: 5px;
     margin-bottom: 3px;
     border-radius: 4px;
     padding-right: 2px;
-    background-color: rgba(114, 101, 138, 0.5);
-    color: @foreground;
+    background-color: @color1;
+    color: @color7;
+    border: 1.2px solid @color7;
 }
 #network{
     border-radius: 4px 0px 0px 4px;
 }
 
-#custom-playerctl{
+#custom-playerctl,
+#custom-playerlabel{
+
     padding-top: 5px;
     padding-left: 5px;
     padding-right: 5px;
     padding-bottom: 5px;
-    background-color: rgba(114, 101, 138, 0.5);
+    background-color: @color1;
     margin-bottom: 3px;
-    margin-top: 3px;
+    margin-top: 5px;
     margin-right: 5px;
     border-radius: 4px;
     margin-left: 5px;
+    border: 1.2px solid @color7;
+    color: @color7;
 }
 
 #custom-name{