Redo waybar config for cla

1 files changed, 50 insertions, 26 deletions

diff --git a/waybar/config b/waybar/config
index 0fc3730..b99db47 100644
--- a/waybar/config
+++ b/waybar/config
@@ -11,7 +11,7 @@
 
     "modules-left":[ "hyprland/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#cpu0", "temperature#gpu2", "backlight",  "network", "clock", "tray", "custom/power"],
 
     // Modules configuration
 
@@ -40,24 +40,24 @@
         "18": "9",
       },
       "persistent_workspaces": {
-        "1": ["DP-1"],
-        "2": ["DP-1"],
-        "3": ["DP-1"],
-        "4": ["DP-1"],
-        "5": ["DP-1"],
-        "6": ["DP-1"],
-        "7": ["DP-1"],
-        "8": ["DP-1"],
-        "9": ["DP-1"],
-        "10": ["HDMI-A-1"],
-        "11": ["HDMI-A-1"],
-        "12": ["HDMI-A-1"],
-        "13": ["HDMI-A-1"],
-        "14": ["HDMI-A-1"],
-        "15": ["HDMI-A-1"],
-        "16": ["HDMI-A-1"],
-        "17": ["HDMI-A-1"],
-        "18": ["HDMI-A-1"]
+        "1": ["DP-1", "HDMI-A-1"],
+        "2": ["DP-1", "HDMI-A-1"],
+        "3": ["DP-1", "HDMI-A-1"],
+        "4": ["DP-1", "HDMI-A-1"],
+        "5": ["DP-1", "HDMI-A-1"],
+        "6": ["DP-1", "HDMI-A-1"],
+        "7": ["DP-1", "HDMI-A-1"],
+        "8": ["DP-1", "HDMI-A-1"],
+        "9": ["DP-1", "HDMI-A-1"],
+        // "10": ["HDMI-A-1"],
+        // "11": ["HDMI-A-1"],
+        // "12": ["HDMI-A-1"],
+        // "13": ["HDMI-A-1"],
+        // "14": ["HDMI-A-1"],
+        // "15": ["HDMI-A-1"],
+        // "16": ["HDMI-A-1"],
+        // "17": ["HDMI-A-1"],
+        // "18": ["HDMI-A-1"]
       },
       "on-scroll-up": "hyprctl dispatch split-workspace e+1",
       "on-scroll-down": "hyprctl dispatch split-workspace e-1",
@@ -120,20 +120,44 @@
         "format": "{capacity}%",
         "max-length": 25
     },
-    "temperature#cpu": {
+    "temperature#cpu0": {
         // "thermal-zone": 2,
-        "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
+        "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
         "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C",
+        // "format-critical": "CPU TCT {temperatureC}°C {icon}",
+        "format": "C{temperatureC}°C",
         "format-icons": ["", "", ""]
     },
-    "temperature#gpu": {
+    "temperature#cpu1": {
+        // "thermal-zone": 2,
+        "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input",
+        "critical-threshold": 80,
+        // "format-critical": "CPU TCC {temperatureC}°C {icon}",
+        "format": "C{temperatureC}°C",
+        "format-icons": ["", "", ""]
+    },
+    "temperature#gpu0": {
+        // "thermal-zone": 2,
+        "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+        "critical-threshold": 100,
+        // "format-critical": "GPU EDG {temperatureC}°C {icon}",
+        "format": "G{temperatureC}°C", //°C
+        "format-icons": ["", "", ""]
+    },
+    "temperature#gpu1": {
         // "thermal-zone": 2,
         "hwmon-path": "/sys/class/hwmon/hwmon1/temp2_input",
         "critical-threshold": 110,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C",
+        // "format-critical": "GPU JUN {temperatureC}°C {icon}",
+        "format": "G{temperatureC}°C",
+        "format-icons": ["", "", ""]
+    },
+    "temperature#gpu2": {
+        // "thermal-zone": 2,
+        "hwmon-path": "/sys/class/hwmon/hwmon1/temp3_input",
+        "critical-threshold": 105,
+        // "format-critical": "GPU MEM {temperatureC}°C {icon}",
+        "format": "G{temperatureC}°C",
         "format-icons": ["", "", ""]
     },
     "backlight": {