Stats pills: GPU usage/temp toggle, per-mount disk details, live network throughput

- GPU pill now toggles usage/temperature like CPU, icon stays fixed either way
- Disk pill cycles through every real mounted filesystem (root first); its
  tooltip lists all of them with device name, used/free space and live R/W
  speed sampled from /proc/diskstats
- Every stats tooltip (CPU/RAM/disk/GPU/volume/network) has a heading
- Network tooltip shows the network device and live up/download throughput
  in decimal bit units (Kbit/Mbit/Gbit/s), sampled every second independently
  of the slower nmcli connection/SSID lookup

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Dujsk9jYfxUVLtb5B8eC94
This commit is contained in:
nico
2026-09-27 23:01:00 +02:00
parent 85fee48d10
commit 4b8892cf90
3 changed files with 193 additions and 33 deletions

View File

@@ -28,9 +28,9 @@ Waybar has been fully retired. The whole top bar is one Quickshell shell (`quick
- **Window switcher** — `Mod+Shift+A` drops down a list of every open window across all workspaces; click one to focus it
- **Active window title** — per-monitor, shows the title of whichever window is focused on that specific screen
- **System tray** — StatusNotifierItem icons with left-click activate / right-click context menu
- **CPU / RAM / disk / GPU** — live stats pills with hover tooltips (per-core CPU breakdown, load average, memory/disk usage, GPU temperature + VRAM); click the CPU pill to toggle it between usage % and temperature
- **CPU / RAM / disk / GPU** — live stats pills, each with a titled hover tooltip; click the CPU or GPU pill to toggle it between usage % and temperature (the icon stays put, only the color/value change). The disk pill defaults to `/`; click it to cycle through every real mounted filesystem (a USB stick, `/boot`, …), hovering always lists all of them with their device name (e.g. `nvme0n1p2`), used/free space and live read/write speed
- **Volume** — click opens the mixer, right-click mutes, scroll adjusts volume (via `wpctl`)
- **Network** — shows the active connection (Wi-Fi SSID or wired); hover shows the local IP, click toggles to the public IP
- **Network** — shows the active connection (Wi-Fi SSID or wired); hover shows the local IP (click toggles to the public IP), the network device (e.g. `enp7s0`) and the live up/download rate in decimal bit units (Kbit/Mbit/Gbit/s, like a speedtest), refreshed every second independently of the slower connection/SSID lookup
- **Clock** — hover for the full date + ISO week number, click opens a small month calendar
- **Notification panel** — the bell button (with an unread badge) opens a panel down the right screen edge, top to bottom, listing recent notifications from mako's history. Click a notification (or “Mark all read”) to mark it read and drop it from the list. mako can't delete single history entries, so read state is kept by `scripts/notifs.py` in `~/.local/state/quickshell/notifs-read`
- **Power menu** — restart / shutdown / logout dropdown

View File

@@ -18,6 +18,19 @@ Variants {
property bool windowSwitcherOpen: false
function fmtRate(kbps) {
return kbps >= 1024 ? (kbps / 1024).toFixed(1) + " MB/s" : Math.round(kbps) + " KB/s"
}
// Network throughput, speedtest-style: decimal bit units (1 KB/s = 8000 bit/s), not binary bytes.
function fmtBitrate(kbps) {
var bits = kbps * 1024 * 8
if (bits >= 1000000000) return (bits / 1000000000).toFixed(2) + " Gbit/s"
if (bits >= 1000000) return (bits / 1000000).toFixed(1) + " Mbit/s"
if (bits >= 1000) return (bits / 1000).toFixed(0) + " Kbit/s"
return Math.round(bits) + " bit/s"
}
function isoWeek(d) {
let date = new Date(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()));
let day = (date.getUTCDay() + 6) % 7;
@@ -103,7 +116,13 @@ Variants {
property bool clockHovering: false
property bool netHovering: false
property bool showCpuTemp: false
property bool showGpuTemp: false
property bool showPublicIp: false
property var diskMounts: []
property int diskIndex: 0
readonly property var currentDisk: diskMounts.length > diskIndex
? diskMounts[diskIndex]
: { path: "/", pct: diskPct, total: diskTotal, used: diskUsed, avail: diskAvail, device: "", readKBps: 0, writeKBps: 0 }
// ---- stats ----
property int cpuPct: 0
@@ -130,6 +149,12 @@ Variants {
// ---- network ----
property string connType: ""
property string connName: ""
property string netDevice: ""
property real netRxKBps: 0
property real netTxKBps: 0
property real netPrevT: 0
property real netPrevRx: 0
property real netPrevTx: 0
property string localIp: ""
property string publicIp: ""
property bool publicIpLoading: false
@@ -171,6 +196,17 @@ Variants {
bar.load15 = p[10]
bar.tempC = p[11]
bar.perCore = p.length > 12 && p[12] !== "" ? p[12].split(",").map(Number) : []
if (p.length > 17 && p[17] !== "") {
bar.diskMounts = p[17].split(";").map(function (m) {
var f = m.split(",")
return {
path: f[0], pct: parseInt(f[1]) || 0, total: parseFloat(f[2]) || 0,
used: parseFloat(f[3]) || 0, avail: parseFloat(f[4]) || 0, device: f[5] || "",
readKBps: parseFloat(f[6]) || 0, writeKBps: parseFloat(f[7]) || 0
}
})
if (bar.diskIndex >= bar.diskMounts.length) bar.diskIndex = 0
}
if (p.length > 16) {
bar.gpuUtil = p[13]
bar.gpuTemp = p[14]
@@ -256,19 +292,48 @@ Variants {
Process {
id: netProc
command: ["bash", "-c", "conn=$(nmcli -t -f TYPE,STATE,CONNECTION device status 2>/dev/null | awk -F: '$2==\"connected\"{print $1; exit}'); if [ \"$conn\" = \"wifi\" ]; then name=$(nmcli -t -f active,ssid dev wifi 2>/dev/null | awk -F: '$1==\"yes\"{print $2; exit}'); else name=\"LAN\"; fi; ip=$(ip route get 1.1.1.1 2>/dev/null | awk '{for(i=1;i<=NF;i++) if ($i==\"src\") print $(i+1)}'); echo \"${conn}|${name}|${ip}\""]
command: ["bash", "-c", "conn_line=$(nmcli -t -f TYPE,STATE,CONNECTION,DEVICE device status 2>/dev/null | awk -F: '$2==\"connected\"{print $1\"|\"$4; exit}'); conn=${conn_line%%|*}; dev=${conn_line##*|}; if [ \"$conn\" = \"wifi\" ]; then name=$(nmcli -t -f active,ssid dev wifi 2>/dev/null | awk -F: '$1==\"yes\"{print $2; exit}'); else name=\"LAN\"; fi; ip=$(ip route get 1.1.1.1 2>/dev/null | awk '{for(i=1;i<=NF;i++) if ($i==\"src\") print $(i+1)}'); echo \"${conn}|${name}|${ip}|${dev}\""]
stdout: StdioCollector { id: netCollector }
onExited: {
var parts = netCollector.text.trim().split("|")
bar.connType = parts[0] || ""
bar.connName = parts[1] || ""
bar.localIp = parts[2] || ""
var dev = parts[3] || ""
if (dev !== bar.netDevice) bar.netPrevT = 0 // switched interface: drop the stale baseline
bar.netDevice = dev
}
}
Timer { interval: 300; running: true; repeat: false; onTriggered: netProc.running = true }
Timer { interval: 8000; running: true; repeat: true; onTriggered: netProc.running = true }
// Throughput for whatever netProc found as the active device, sampled every second
// independently of the (slower) connection/SSID lookup above so up/down feels live.
Process {
id: netIoProc
command: ["bash", "-c", "d=\"$0\"; if [ -n \"$d\" ] && [ -d \"/sys/class/net/$d/statistics\" ]; then cat \"/sys/class/net/$d/statistics/rx_bytes\" \"/sys/class/net/$d/statistics/tx_bytes\"; else echo 0; echo 0; fi", bar.netDevice]
stdout: StdioCollector { id: netIoCollector }
onExited: {
var lines = netIoCollector.text.trim().split("\n")
var rx = parseFloat(lines[0]) || 0
var tx = parseFloat(lines[1]) || 0
var now = Date.now()
if (bar.netPrevT > 0) {
var dt = (now - bar.netPrevT) / 1000
if (dt > 0) {
bar.netRxKBps = Math.max(0, rx - bar.netPrevRx) / 1024 / dt
bar.netTxKBps = Math.max(0, tx - bar.netPrevTx) / 1024 / dt
}
}
bar.netPrevT = now
bar.netPrevRx = rx
bar.netPrevTx = tx
}
}
Timer { interval: 1000; running: true; repeat: true; onTriggered: netIoProc.running = true }
Process {
id: publicIpProc
command: ["bash", "-c", "curl -s -m 3 https://api.ipify.org"]
@@ -800,7 +865,7 @@ Variants {
anchors.centerIn: parent
spacing: 4
Text {
text: bar.showCpuTemp ? "" : ""
text: ""
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 13
color: bar.hovered === "cpu" ? "#0f111a" : (bar.showCpuTemp ? (bar.tempCritical ? "#f7768e" : "#f9e2af") : "#7aa2f7")
@@ -879,7 +944,7 @@ Variants {
color: bar.hovered === "disk" ? "#0f111a" : "#c0caf5"
}
Text {
text: bar.diskPct + "%"
text: bar.currentDisk.pct + "%"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 13
width: valueFont.advanceWidth("100%")
@@ -893,6 +958,7 @@ Variants {
hoverEnabled: true
onEntered: bar.hovered = "disk"
onExited: bar.hovered = ""
onClicked: if (bar.diskMounts.length > 0) bar.diskIndex = (bar.diskIndex + 1) % bar.diskMounts.length
}
}
@@ -912,10 +978,10 @@ Variants {
text: "󰢮"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 13
color: bar.hovered === "gpu" ? "#0f111a" : "#a6e3a1"
color: bar.hovered === "gpu" ? "#0f111a" : (bar.showGpuTemp ? "#f9e2af" : "#a6e3a1")
}
Text {
text: bar.gpuUtil + "%"
text: bar.showGpuTemp ? (bar.gpuTemp + "°C") : (bar.gpuUtil + "%")
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 13
width: valueFont.advanceWidth("100%")
@@ -929,6 +995,7 @@ Variants {
hoverEnabled: true
onEntered: bar.hovered = "gpu"
onExited: bar.hovered = ""
onClicked: bar.showGpuTemp = !bar.showGpuTemp
}
}
@@ -1090,7 +1157,7 @@ Variants {
screen: bar.modelData
anchors { top: true; right: true }
margins { top: 34; right: bar.width - (rightRow.x + statsPopupAnchor.x + statsPopupAnchor.width) }
implicitWidth: (bar.hovered === "cpu" && bar.perCore.length > 0) ? 320 : (bar.hovered === "vol" ? 300 : 220)
implicitWidth: (bar.hovered === "cpu" && bar.perCore.length > 0) ? 320 : (bar.hovered === "vol" ? 300 : (bar.hovered === "disk" ? 300 : 220))
implicitHeight: tooltipCol.implicitHeight + 20
color: "transparent"
WlrLayershell.namespace: "stats-tooltip"
@@ -1111,6 +1178,19 @@ Variants {
anchors.margins: 10
spacing: 4
Text {
text: ({
cpu: "CPU",
mem: root.isGerman ? "Arbeitsspeicher" : "Memory",
disk: root.isGerman ? "Speicher" : "Storage",
gpu: "GPU",
vol: root.isGerman ? "Lautstärke" : "Volume",
})[bar.hovered] || ""
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 13
font.bold: true
color: "#1793d1"
}
Text {
visible: bar.hovered === "cpu"
text: (root.isGerman ? "Last (1/5/15 Min): " : "Load (1/5/15 min): ") + bar.load1 + " / " + bar.load5 + " / " + bar.load15
@@ -1157,33 +1237,49 @@ Variants {
font.pixelSize: 12
color: "#c0caf5"
}
Text {
ColumnLayout {
visible: bar.hovered === "disk"
text: "/"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 13
font.bold: true
color: "#c0caf5"
Layout.fillWidth: true
spacing: 6
Repeater {
model: bar.diskMounts
ColumnLayout {
required property int index
required property var modelData
Layout.fillWidth: true
spacing: 1
Text {
text: (index === bar.diskIndex ? "▸ " : "") + modelData.path + (modelData.device !== "" ? " (" + modelData.device + ")" : "")
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 13
font.bold: index === bar.diskIndex
elide: Text.ElideMiddle
Layout.fillWidth: true
color: index === bar.diskIndex ? "#c0caf5" : "#9aa5ce"
}
Text {
text: modelData.pct + "%" + " · " + (root.isGerman ? "Belegt " : "Used ") + modelData.used.toFixed(0) + " / " + modelData.total.toFixed(0) + " GiB" + " · " + (root.isGerman ? "Frei " : "Free ") + modelData.avail.toFixed(0) + " GiB"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 11
color: "#565f89"
}
Text {
text: "R: " + root.fmtRate(modelData.readKBps) + " W: " + root.fmtRate(modelData.writeKBps)
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 11
color: "#565f89"
}
}
}
}
Text {
visible: bar.hovered === "disk"
text: (root.isGerman ? "Belegt: " : "Used: ") + bar.diskUsed.toFixed(0) + " GiB"
text: root.isGerman ? "Klicken zum Wechseln" : "Click to toggle"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 12
color: "#7aa2f7"
}
Text {
visible: bar.hovered === "disk"
text: (root.isGerman ? "Frei: " : "Free: ") + bar.diskAvail.toFixed(0) + " GiB"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 12
color: "#565f89"
}
Text {
visible: bar.hovered === "disk"
text: (root.isGerman ? "Gesamt: " : "Total: ") + bar.diskTotal.toFixed(0) + " GiB"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 12
font.pixelSize: 11
color: "#565f89"
}
Text {
@@ -1200,6 +1296,13 @@ Variants {
font.pixelSize: 12
color: "#565f89"
}
Text {
visible: bar.hovered === "gpu"
text: root.isGerman ? "Klicken zum Wechseln" : "Click to toggle"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 11
color: "#565f89"
}
Text {
visible: bar.hovered === "vol"
Layout.preferredWidth: 280
@@ -1241,10 +1344,16 @@ Variants {
spacing: 4
Text {
text: bar.connType === "" ? (root.isGerman ? "Nicht verbunden" : "Not connected") : (bar.connType === "wifi" ? (root.isGerman ? "WLAN" : "Wi-Fi") : (root.isGerman ? "Kabelgebunden" : "Wired"))
text: root.isGerman ? "Netzwerk" : "Network"
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 13
font.bold: true
color: "#1793d1"
}
Text {
text: bar.connType === "" ? (root.isGerman ? "Nicht verbunden" : "Not connected") : (bar.connType === "wifi" ? (root.isGerman ? "WLAN" : "Wi-Fi") : (root.isGerman ? "Kabelgebunden" : "Wired"))
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 12
color: "#c0caf5"
}
Text {
@@ -1262,6 +1371,20 @@ Variants {
font.pixelSize: 12
color: "#7aa2f7"
}
Text {
visible: bar.netDevice !== ""
text: (root.isGerman ? "Gerät: " : "Device: ") + bar.netDevice
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 12
color: "#565f89"
}
Text {
visible: bar.connType !== ""
text: " " + root.fmtBitrate(bar.netRxKBps) + "  " + root.fmtBitrate(bar.netTxKBps)
font.family: "JetBrainsMono Nerd Font"
font.pixelSize: 12
color: "#c0caf5"
}
Text {
text: root.isGerman ? "Klicken zum Wechseln" : "Click to toggle"
font.family: "JetBrainsMono Nerd Font"

View File

@@ -1,12 +1,18 @@
#!/bin/bash
# Emits pipe-separated system stats for the Quickshell StatsWidget:
# cpu|memPct|memUsedGB|memTotalGB|diskPct|diskTotalGB|diskUsedGB|diskAvailGB|load1|load5|load15|tempC|core0,core1,...|gpuUtil|gpuTemp|gpuMemUsed|gpuMemTotal
# cpu|memPct|memUsedGB|memTotalGB|diskPct|diskTotalGB|diskUsedGB|diskAvailGB|load1|load5|load15|tempC|core0,core1,...|gpuUtil|gpuTemp|gpuMemUsed|gpuMemTotal|mounts
# mounts is "path,pct,totalGiB,usedGiB,availGiB,device,readKBps,writeKBps" per real mounted
# filesystem, separated by ";", root (/) always first
snap1=$(mktemp)
snap2=$(mktemp)
grep '^cpu' /proc/stat > "$snap1"
io1=$(cat /proc/diskstats)
t1=$(date +%s%N)
sleep 0.2
grep '^cpu' /proc/stat > "$snap2"
io2=$(cat /proc/diskstats)
t2=$(date +%s%N)
cpu_result=$(awk '
NR==FNR {
@@ -24,6 +30,16 @@ NR==FNR {
}' "$snap1" "$snap2")
rm -f "$snap1" "$snap2"
# Read/write throughput per block device, from the same 0.2s window as the CPU sample
# above (/proc/diskstats sector counts are in 512-byte units regardless of the device's
# real sector size).
io_result=$(awk -v dt="$(awk -v a="$t1" -v b="$t2" 'BEGIN{print (b-a)/1000000000}')" '
NR==FNR { rs[$3] = $6; ws[$3] = $10; next }
$3 in rs {
dr = $6 - rs[$3]; dw = $10 - ws[$3]
printf "%s|%.0f|%.0f\n", $3, dr*512/1024/dt, dw*512/1024/dt
}' <(echo "$io1") <(echo "$io2"))
cpu=$(echo "$cpu_result" | awk '$1=="cpu"{print $2}')
percore=$(echo "$cpu_result" | awk '$1!="cpu"{printf "%s,", $2}' | sed 's/,$//')
@@ -46,4 +62,25 @@ except Exception:
gpu_line=$(nvidia-smi --query-gpu=utilization.gpu,temperature.gpu,memory.used,memory.total --format=csv,noheader,nounits 2>/dev/null | tr -d ' ' | tr ',' '|')
[ -z "$gpu_line" ] && gpu_line="NA|NA|NA|NA"
echo "${cpu}|${mem_line}|${disk_line}|${load}|${temp}|${percore}|${gpu_line}"
# Every real mounted filesystem (skips virtual/pseudo ones), root first so the
# disk pill's default mount is stable regardless of mount order. --output (not -P)
# so the source device is right there instead of a second df call per mount.
real_mounts=$(df --output=source,pcent,size,used,avail,target \
-x tmpfs -x devtmpfs -x squashfs -x proc -x sysfs -x overlay -x efivarfs \
-x devpts -x cgroup -x cgroup2 -x pstore -x bpf -x tracefs -x mqueue \
-x hugetlbfs -x fusectl -x configfs -x debugfs -x autofs -x binfmt_misc -x ramfs \
2>/dev/null | tail -n +2)
ordered_mounts=$(printf '%s\n' "$real_mounts" | awk '$6=="/"'; printf '%s\n' "$real_mounts" | awk '$6!="/"')
mounts=$(awk -v OFS=',' '
NR==FNR { split($0, a, "|"); io_r[a[1]] = a[2]; io_w[a[1]] = a[3]; next }
NF {
gsub("%", "", $2)
dev = $1
sub("^/dev/", "", dev)
r = (dev in io_r) ? io_r[dev] : 0
w = (dev in io_w) ? io_w[dev] : 0
printf "%s,%s,%.0f,%.0f,%.0f,%s,%s,%s;", $6, $2, $3/1024/1024, $4/1024/1024, $5/1024/1024, dev, r, w
}' <(echo "$io_result") <(printf '%s\n' "$ordered_mounts"))
mounts=${mounts%;}
echo "${cpu}|${mem_line}|${disk_line}|${load}|${temp}|${percore}|${gpu_line}|${mounts}"