2 files changed, 16 insertions, 24 deletions
diff --git a/waybar/config b/waybar/config
index 63ac30e..2aa44d4 100644
--- a/waybar/config
+++ b/waybar/config
@@ -11,7 +11,7 @@
 
     "modules-left":[ "wlr/workspaces", "custom/launcher", "hyprland/window"],
     "modules-center":[],
-    "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature#cpu", "temperature#gpu", "backlight",  "network", "clock", "tray", "custom/power"],
+    "modules-right":[ "mpd", "idle_inhibitor", "pulseaudio", "cpu", "memory", "temperature#cpu", "backlight",  "battery#bat0", "battery#bat1", "network", "clock", "tray", "custom/power"],
 
     // Modules configuration
 
@@ -83,18 +83,10 @@
     },
     "temperature#cpu": {
         // "thermal-zone": 2,
-        "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
-        "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C",
-        "format-icons": ["", "", ""]
-    },
-    "temperature#gpu": {
-        // "thermal-zone": 2,
-        "hwmon-path": "/sys/class/hwmon/hwmon1/temp2_input",
-        "critical-threshold": 110,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C",
+        "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input",
+        "critical-threshold": 100,
+        "format-critical": "CPU {temperatureC}°C {icon}",
+        "format": "CPU {temperatureC}°C",
         "format-icons": ["", "", ""]
     },
     "backlight": {
diff --git a/waybar/style.css b/waybar/style.css
index 8b15dfb..33f459a 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -47,7 +47,7 @@ window#waybar.hidden {
 */
 
 #workspaces button.active {
-    background: #198844;
+    background: #39c1ed;
 }
 
 /*
@@ -124,7 +124,7 @@ window#waybar.hidden {
 }
 
 #battery.charging, #battery.plugged {
-    color: #26A65B;
+    color: #39c1ed;
     background-color: #1b1d1c;
 }
 
@@ -155,7 +155,7 @@ label:focus {
 }
 
 #memory {
-    background-color: #198844;
+    background-color: #39c1ed;
     color: #ffffff;
 }
 
@@ -165,12 +165,12 @@ label:focus {
 }
 
 #backlight {
-    background-color: #198844;
+    background-color: #39c1ed;
     color: #ffffff;
 }
 
 #network {
-    background-color: #198844;
+    background-color: #39c1ed;
     color: #ffffff;
 }
 
@@ -180,13 +180,13 @@ label:focus {
 }
 
 #pulseaudio {
-    background-color: #198844;
+    background-color: #39c1ed;
     color: #ffffff;
 }
 
 #pulseaudio.muted {
     background-color: #1b1d1c;
-    color: #198844;
+    color: #39c1ed;
 }
 
 #custom-media {
@@ -276,19 +276,19 @@ label:focus {
 }
 
 #tray {
-    background-color: #198844;
+    background-color: #39c1ed;
     color: #ffffff;
 }
 
 #tray > .passive {
     -gtk-icon-effect: dim;
-    background-color: #198844;
+    background-color: #39c1ed;
     color: #ffffff;
 }
 
 #tray > .needs-attention {
     -gtk-icon-effect: highlight;
-    background-color: #198844;
+    background-color: #39c1ed;
     color: #ffffff;
 }
 
@@ -299,7 +299,7 @@ label:focus {
 }
 
 #idle_inhibitor.activated {
-    background-color: #198844;
+    background-color: #39c1ed;
     color: #ffffff;
     border-radius: 20px 0px 0px 20px;