diff options
| -rw-r--r-- | dot_config/waybar/config.jsonc | 13 | ||||
| -rwxr-xr-x | dot_config/waybar/executable_memory-status.sh | 12 |
2 files changed, 8 insertions, 17 deletions
diff --git a/dot_config/waybar/config.jsonc b/dot_config/waybar/config.jsonc index 93180cb..275d795 100644 --- a/dot_config/waybar/config.jsonc +++ b/dot_config/waybar/config.jsonc @@ -9,7 +9,6 @@ "cpu", "temperature", "custom/memory", - "disk", "network#bond", "battery", "privacy", @@ -18,8 +17,8 @@ "idle_inhibitor", "custom/notifications", "custom/thunderbird", - "tray", "clock", + "tray", ], "sway/workspaces": { @@ -31,11 +30,11 @@ }, "cpu": { - "format": "CPU {usage}% LOAD {load:0.2f}", - "format-low": "CPU <span color='#b8bb26'>{usage}%</span> LOAD {load:0.2f}", - "format-medium": "CPU <span color='#fabd2f'>{usage}%</span> LOAD {load:0.2f}", - "format-high": "CPU <span color='#fe8019'>{usage}%</span> LOAD {load:0.2f}", - "format-critical": "CPU <span color='#fb4934'>{usage}%</span> LOAD {load:0.2f}", + "format": "CPU {usage}% {load:0.2f}", + "format-low": "CPU <span color='#b8bb26'>{usage}%</span> {load:0.2f}", + "format-medium": "CPU <span color='#fabd2f'>{usage}%</span> {load:0.2f}", + "format-high": "CPU <span color='#fe8019'>{usage}%</span> {load:0.2f}", + "format-critical": "CPU <span color='#fb4934'>{usage}%</span> {load:0.2f}", "states": { "low": 0, "medium": 30, diff --git a/dot_config/waybar/executable_memory-status.sh b/dot_config/waybar/executable_memory-status.sh index c68f5a4..33ccc04 100755 --- a/dot_config/waybar/executable_memory-status.sh +++ b/dot_config/waybar/executable_memory-status.sh @@ -10,20 +10,12 @@ function heat(p) { if (p < 80) return "#fe8019" return "#fb4934" } -function cool(p) { - if (p < 20) return "#fb4934" - if (p < 40) return "#fe8019" - if (p < 70) return "#fabd2f" - return "#b8bb26" -} /^MemTotal:/ { t = $2 } /^MemAvailable:/ { a = $2 } END { u = t - a up = u * 100 / t - ap = a * 100 / t - printf "{\"text\":\"MEM %.1fG (<span color=\x27%s\x27>%d%%</span>) / %.1fG (<span color=\x27%s\x27>%d%%</span>)\"}\n", \ - u / 1048576, heat(up), up, \ - a / 1048576, cool(ap), ap + printf "{\"text\":\"MEM %.1fG <span color=\x27%s\x27>%d%%</span>\"}\n", \ + u / 1048576, heat(up), up } ' /proc/meminfo |