cla: reconfigure waybar

This adds in the specific temp sensors for CLA, as well as splits the
config into two bars; on DP-1, is the resource monitoring, and on
HDMI-A-1 is the temp monitoring.

1 files changed, 230 insertions, 14 deletions

diff --git a/waybar/config b/waybar/config
index ec04dec..2e6b691 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,17 +1,15 @@
-{
+[{
     "layer": "top",
     "position": "top",
     "height": 36,
-    //"output": "%%DISPLAY%%",
+    "output": "DP-1",
     "spacing": 4,
-    //"margin-top": 5,
-    //"margin-bottom":5,
 
     // Choose the order of the modules
 
     "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":[ "idle_inhibitor", "pulseaudio", "cpu", "memory", "network", "clock", "tray"],
 
     // Modules configuration
 
@@ -41,7 +39,7 @@
       },
       "persistent-workspaces": {
         "DP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
-        "HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
+        //"DP-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ],
       },
       "on-scroll-up": "hyprctl dispatch split-workspace e+1",
       "on-scroll-down": "hyprctl dispatch split-workspace e-1",
@@ -104,20 +102,238 @@
         "format": "{capacity}%",
         "max-length": 25
     },
-    "temperature#cpu": {
+    "temperature#cpu0": {
+        // "thermal-zone": 2,
+        "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "CPU TCT {temperatureC}°C {icon}",
+        "format": "C{temperatureC}°C",
+        "format-icons": ["", "", ""]
+    },
+    "temperature#cpu1": {
         // "thermal-zone": 2,
-        "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input",
+        "hwmon-path": "/sys/class/hwmon/hwmon2/temp3_input",
         "critical-threshold": 80,
-        // "format-critical": "{temperatureC}°C {icon}",
-        "format": "{temperatureC}°C",
+        // "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#gpu": {
+    "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": {
+        // "device": "acpi_video1",
+        "format": "{percent}%"
+        //"format-icons": ["", ""]
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "Connected  ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}",
+        "max-length": 22,
+        "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon}",
+        "format-bluetooth": "{volume}% {icon}",
+        "format-bluetooth-muted": "{icon} {format_source}",
+        "format-muted": "{format_source}",
+        "format-source": "",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/launcher":{
+        "format": "",
+        "on-click": "exec $(tofi-drun)",
+        "on-click-right": "killall tofi"
+    },
+    "custom/power":{
+        "format": "  ",
+        "on-click": "nwg-bar",
+        "on-click-right": "killall nwg-bar"
+    },
+    "custom/snip":{
+        "format": " ",
+        "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
+    }
+},
+{
+    "layer": "top",
+    "position": "top",
+    "height": 36,
+    "output": "HDMI-A-1",
+    "spacing": 4,
+
+    // Choose the order of the modules
+
+    "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
+    "modules-center":[],
+    "modules-right":[ "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "network", "clock", "tray"],
+
+    // Modules configuration
+
+    "hyprland/workspaces": {
+      "format": "{icon}",
+      "active-only": false,
+      "all-outputs": false,
+      "format-icons": {
+        "1": "1",
+        "2": "2",
+        "3": "3",
+        "4": "4",
+        "5": "5",
+        "6": "6",
+        "7": "7",
+        "8": "8",
+        "9": "9",
+        "10": "1",
+        "11": "2",
+        "12": "3",
+        "13": "4",
+        "14": "5",
+        "15": "6",
+        "16": "7",
+        "17": "8",
+        "18": "9",
+      },
+      "persistent-workspaces": {
+        //"HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ],
+        "HDMI-A-1": [ 10, 11, 12, 13, 14, 15, 16, 17, 18 ],
+      },
+      "on-scroll-up": "hyprctl dispatch split-workspace e+1",
+      "on-scroll-down": "hyprctl dispatch split-workspace e-1",
+      "on-click": "activate"
+    },
+    "hyprland/window": {
+      "separate-outputs": true,
+      "format": "{}"
+    },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": " {name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "mpd": {
+      "format": "{artist} - {title}",
+      "format-stopped": "",
+      "format-paused": "{artist} - {title}",
+      "format-disconnected": "",
+      "artist-len": 15,
+      "title-len": 15,
+      //"album-len": 15,
+      //"max-length": 200,
+      "on-click": "mpc toggle"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        "icon-size": 20,
+        "spacing": 10
+    },
+    "clock": {
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "battery": {
+        "bat": "BAT0",
+        "interval": 60,
+        "state": {
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}%",
+        "max-length": 25
+    },
+    "temperature#cpu0": {
+        // "thermal-zone": 2,
+        "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "CPU TCT {temperatureC}°C {icon}",
+        "format": "C{temperatureC}°C",
+        "format-icons": ["", "", ""]
+    },
+    "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": "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": {
@@ -169,4 +385,4 @@
         "format": " ",
         "on-click": "grimshot --notify save area $HOME/Pictures/$(zenity --entry --text 'Set filename:' --entry-text '.png')"
     }
-}
+}]