From 985b12cc6e344535d28ede868bc9071b208b38c0 Mon Sep 17 00:00:00 2001
From: Yingjie Wang <phywyj@gmail.com>
Date: Sun, 26 May 2024 00:50:57 -0400
Subject: [PATCH] update: wazbar

---
 .../themes/ml4w-blur-custom/colored/style.css |  8 +++----
 waybar/themes/ml4w-blur-custom/config         |  8 +++----
 waybar/themes/ml4w-blur-custom/modules.json   | 21 ++++++++++++-------
 waybar/themes/ml4w-blur-custom/style.css      | 10 +++++----
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/waybar/themes/ml4w-blur-custom/colored/style.css b/waybar/themes/ml4w-blur-custom/colored/style.css
index f9008da..414f780 100644
--- a/waybar/themes/ml4w-blur-custom/colored/style.css
+++ b/waybar/themes/ml4w-blur-custom/colored/style.css
@@ -8,9 +8,9 @@
 @define-color workspacesbackground1 @color5;
 @define-color workspacesbackground2 @color11;
 @define-color bordercolor @color11;
-@define-color textcolor1 #FFFFFF;
-@define-color textcolor2 #FFFFFF;
-@define-color textcolor3 #FFFFFF;
-@define-color iconcolor #FFFFFF;
+@define-color textcolor1 @foreground;
+@define-color textcolor2 @foreground;
+@define-color textcolor3 @foreground;
+@define-color iconcolor @foreground;
 
 @import '../style.css';
diff --git a/waybar/themes/ml4w-blur-custom/config b/waybar/themes/ml4w-blur-custom/config
index 70cdfcb..0d6bf53 100644
--- a/waybar/themes/ml4w-blur-custom/config
+++ b/waybar/themes/ml4w-blur-custom/config
@@ -45,10 +45,10 @@
         //"bluetooth",
         "battery",
         "battery#charging",
-        "network",
-        "cpu",
-        "memory",
-        //"group/hardware",
+        // "network",
+        // "cpu",
+        // "memory",
+        "group/hardware",
         //"custom/cliphist",
         "tray",
         "idle_inhibitor",
diff --git a/waybar/themes/ml4w-blur-custom/modules.json b/waybar/themes/ml4w-blur-custom/modules.json
index a5cefb7..16777e6 100644
--- a/waybar/themes/ml4w-blur-custom/modules.json
+++ b/waybar/themes/ml4w-blur-custom/modules.json
@@ -216,6 +216,18 @@
         }
     },
 
+    "group/tray": {
+        "orientation": "inherit",
+        "drawer": {
+            "transition-duration": 300,
+            "children-class": "not-memory",
+            "transition-left-to-right": false
+        },
+        "modules": [
+            "tray"
+        ]
+    },
+
     // System tray
     "tray": {
         "icon-size": 21,
@@ -267,17 +279,10 @@
     // Group Hardware
     "group/hardware": {
         "orientation": "inherit",
-        "drawer": {
-            "transition-duration": 300,
-            "children-class": "not-memory",
-            "transition-left-to-right": false
-        },        
         "modules": [
-            "custom/system",
-            "disk",
             "cpu",
             "memory",
-            "hyprland/language"
+            "network"
         ]
     },
     
diff --git a/waybar/themes/ml4w-blur-custom/style.css b/waybar/themes/ml4w-blur-custom/style.css
index b7c4a52..0250786 100644
--- a/waybar/themes/ml4w-blur-custom/style.css
+++ b/waybar/themes/ml4w-blur-custom/style.css
@@ -285,7 +285,7 @@ window#waybar.empty #window {
  * Hardware Group
  * ----------------------------------------------------- */
 
- #disk,#memory,#cpu,#language {
+ /* #disk,#memory,#cpu,#language {
     background-color: @backgroundlight;
     font-size: 16px;
     color: @textcolor2;
@@ -293,7 +293,9 @@ window#waybar.empty #window {
     padding: 2px 10px 0px 10px;
     margin: 8px 10px 8px 0px;
     opacity:0.8;
-}
+} */
+
+#groups
 
 #language {
     margin-right:10px;
@@ -337,7 +339,7 @@ window#waybar.empty #window {
  * Network
  * ----------------------------------------------------- */
 
-#network {
+/* #network {
     background-color: @backgroundlight;
     font-size: 16px;
     color: @textcolor2;
@@ -355,7 +357,7 @@ window#waybar.empty #window {
 #network.wifi {
     background-color: @backgroundlight;
     color: @textcolor2;
-}
+} */
 
 /* -----------------------------------------------------
  * Bluetooth