From 366d97d7e5f17bc258351c8f4c2b72a27d821747 Mon Sep 17 00:00:00 2001 From: Andre Ramnitz Date: Thu, 10 Oct 2024 23:15:26 +0200 Subject: [PATCH] waybar: fix sensors --- config/dot-config/waybar/config.jsonc | 269 ++++++++++++-------------- 1 file changed, 122 insertions(+), 147 deletions(-) diff --git a/config/dot-config/waybar/config.jsonc b/config/dot-config/waybar/config.jsonc index 98f2acc6..0ff33485 100644 --- a/config/dot-config/waybar/config.jsonc +++ b/config/dot-config/waybar/config.jsonc @@ -1,12 +1,19 @@ -// vim ft=json:ts=2:sw=2 { - "layer": "top", // Waybar at top layer - "position": "top", // Waybar position (top|bottom|left|right) - "width": 3440, // Waybar width - "height": 30, // Waybar height, leave blank for auto - "spacing": 1, // Gaps between modules (4px) - "modules-left": ["custom/launcher", "hyprland/workspaces", "custom/voidspacer", "mpd"], - "modules-center": ["hyprland/window", "hyprland/submap"], + "layer": "top", + "position": "top", + "width": 3440, + "height": 30, + "spacing": 1, + "modules-left": [ + "custom/launcher", + "hyprland/workspaces", + "custom/voidspacer", + "mpd" + ], + "modules-center": [ + "hyprland/window", + "hyprland/submap" + ], "modules-right": [ "custom/voidspacer", "cpu", @@ -21,19 +28,14 @@ "clock", "idle_inhibitor", "custom/voidspacer", - "custom/notification", + "custom/notification" ], - - // Modules configuration - // "format": "",  󰀻 - "custom/launcher": { "format": "󰀻", "on-click": "killall fuzzel || fuzzel --config=$HOME/.config/fuzzel/fuzzel-startmenu.ini", "on-click-right": "$HOME/.local/bin/reloadwb.sh", - "tooltip": false, + "tooltip": false }, - "hyprland/workspaces": { "format": "{icon}", "format-icons": { @@ -46,17 +48,13 @@ "7": "7", "8": "8", "9": "9", - "0": "0", - // "urgent": "", - // "active": "", - // "default": "", + "0": "0" }, "persistent-workspaces": { - "*": 6, + "*": 6 }, - "sort-by-number": true, + "sort-by-number": true }, - "hyprland/window": { "format": "{title}", "rewrite-default": "👉 {title}", @@ -67,35 +65,31 @@ "(.*) - Dolphin": " $1", "lfrun(.*)": "󰀶 $1", "NCMPCPP(.*)": "󰲹 $1", - "Threema(.*)": "󰭺 $1", + "Threema(.*)": "󰭺 $1" }, "on-click": "hyprctl dispatch pseudo", "on-click-right": "~/.config/hypr/scripts/mousefocus_toggle.sh", - "separate-outputs": true, + "separate-outputs": true + }, + "hyprland/submap": { + "format": " {} ", + "max-length": 10, + "tooltip": false + }, + "hyprland/language": { + "format": " 󰌌 {} ", + "format-en": "en", + "format-de": "de" }, - - "hyprland/submap": { - "format": " {} ", - "max-length": 10, - "tooltip": false - }, - - "hyprland/language": { - "format": " 󰌌 {} ", - "format-en": "en", - "format-de": "de", - }, - "keyboard-state": { "numlock": true, "capslock": true, "format": "{icon} {name}", "format-icons": { "locked": " ", - "unlocked": " ", - }, + "unlocked": " " + } }, - "mpd": { "format": "mpd: {stateIcon} {artist} - {album} - {title} ⸨{songPosition}|{queueLength}⸩ {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}", "format-disconnected": "", @@ -103,31 +97,29 @@ "unknown-tag": "N/A", "interval": 2, "consume-icons": { - "on": " ", + "on": " " }, "random-icons": { - //"off": " ", "off": "", - "on": " ", + "on": " " }, "repeat-icons": { - "on": " ", + "on": " " }, "single-icons": { - "on": "1 ", + "on": "1 " }, "state-icons": { "paused": "", - "playing": "", + "playing": "" }, "tooltip-format": "{artist} - {album} - {title} | {volume}%", "tooltip-format-disconnected": "mpd disconnected!", "on-click": "mpc toggle", "on-click-backward": "mpc stop && playerctld unshift", "on-click-middle": "mpc next", - "on-click-right": "mpc prev", + "on-click-right": "mpc prev" }, - "mpris": { "format": "{player}: {player_icon} {dynamic}", "format-paused": "{status_icon} {dynamic}", @@ -137,19 +129,21 @@ "album", "title", "position", - "length", + "length" ], "player-icons": { "default": "▶", - "mpv": "▶", + "mpv": "▶" }, "status-icons": { "paused": "⏸", - "stopped": "", + "stopped": "" }, - "ignored-players": ["firefox", "mpd"], + "ignored-players": [ + "firefox", + "mpd" + ] }, - "mpd#volume": { "format": "{volume} 󱄠", "format-disconnected": "--- 󱄠", @@ -157,63 +151,54 @@ "on-click": "mpc volume 70 > /dev/null 2>&1", "on-click-right": "mpc volume 100 > /dev/null 2>&1", "on-scroll-up": "mpc volume +5 > /dev/null 2>&1", - "on-scroll-down": "mpc volume -5 > /dev/null 2>&1", + "on-scroll-down": "mpc volume -5 > /dev/null 2>&1" }, - "tray": { "icon-size": 24, - "spacing": 8, + "spacing": 8 }, - "cpu": { "format": "{usage:2}% ", "on-click": "footclient -a popup btop -p 3", - "interval": 1, + "interval": 1 }, - "memory": { "format": "{percentage:2}% 󰳿", "on-click": "footclient -a popup btop -p 4", - "interval": 1, + "interval": 1 }, - - "temperature": { + "temperature#water": { "hwmon-path": "/sys/class/hwmon/hwmon5/temp1_input", "critical-threshold": 42, "format": "{temperatureC}°C 󰞍", - "on-click-right": "foot -a popup /usr/local/bin/fan2go-tui", + "on-click-right": "foot -a popup /usr/local/bin/fan2go-tui" }, - "temperature#cpu": { "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", "critical-threshold": 95, - "format": "{temperatureC}°C ", + "format": "{temperatureC}°C " }, - "temperature#board": { "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input", "critical-threshold": 85, - "format": "{temperatureC}°C 󰇅", + "format": "{temperatureC}°C 󰇅" }, - "temperature#gpu": { - "hwmon-path": "/sys/class/drm/card0/device/hwmon/hwmon0/temp2_input", + "hwmon-path": "/sys/class/drm/card0/device/hwmon/hwmon6/temp2_input", "critical-threshold": 110, - "format": "{temperatureC}°C 󰍹", + "format": "{temperatureC}°C 󰍹" }, - "network": { - "interface": "wlan0*", // (Optional) To force the use of this interface + "interface": "wlan0*", "format-wifi": " {essid} ({signalStrength}%)", "format-ethernet": "{ipaddr}/{cidr} ", "tooltip-format": "{ifname} via {gwaddr} ", "format-linked": "{ifname} (No IP) ", "format-disconnected": "⚠ ", - "format-alt": "{ifname}: {ipaddr}/{cidr}", + "format-alt": "{ifname}: {ipaddr}/{cidr}" }, - "pulseaudio": { - "scroll-step": 5, // %, can be a float + "scroll-step": 5, "format": "{volume} {icon} {format_source}", "format-bluetooth": "{icon} {volume}% {format_source}", "format-bluetooth-muted": " {icon} {format_source}", @@ -227,13 +212,16 @@ "phone": "", "portable": "", "car": "", - "default": ["", "", ""], + "default": [ + "", + "", + "" + ] }, - "on-click": "pavucontrol", + "on-click": "pavucontrol" }, - "wireplumber": { - "scroll-step": 5, // %, can be a float + "scroll-step": 5, "format": "{volume} {icon}", "format-bluetooth": "{icon} {volume}%", "format-bluetooth-muted": " {icon}", @@ -247,12 +235,15 @@ "phone": "", "portable": "", "car": "", - "default": ["", "", ""], + "default": [ + "", + "", + "" + ] }, "on-click": "pavucontrol", - "on-click-right": "helvum", + "on-click-right": "helvum" }, - "clock": { "timezone": "Europe/Berlin", "tooltip-format": "{calendar}", @@ -268,18 +259,15 @@ "days": "{}", "weeks": "W{}", "weekdays": "{}", - "today": "{}", - }, + "today": "{}" + } }, "actions": { "on-click-right": "mode", "on-scroll-up": "shift_down", - "on-scroll-down": "shift_up", - }, + "on-scroll-down": "shift_up" + } }, - - /* "none": "", */ - "custom/notification": { "tooltip": false, "format": "{icon}", @@ -291,44 +279,33 @@ "inhibited-notification": "", "inhibited-none": "", "dnd-inhibited-notification": "", - "dnd-inhibited-none": "", + "dnd-inhibited-none": "" }, "return-type": "json", "exec-if": "pidof swaync-client", "exec": "swaync-client -swb", "on-click": "swaync-client -t -sw", "on-click-right": "swaync-client -d -sw", - "escape": true, + "escape": true }, - "idle_inhibitor": { "format": "{icon}", "format-icons": { "activated": "", - "deactivated": "", - }, + "deactivated": "" + } }, - "custom/wallpaper": { "format": "  ", "on-click": "$HOME/.local/bin/rndwallpaper swww", "tooltip": false, - "interval": "once", + "interval": "once" }, - - // "custom/powermenu": { - // "format": " ⏻ ", - // "on-click": "killall fuzzel || $HOME/.config/hypr/scripts/powermenu.sh", - // "tooltip": false, - // "interval": "once", - // }, - "custom/spacer": { "format": " ", "max-length": 30, - "tooltip": false, + "tooltip": false }, - "custom/gammarelay-temperature": { "format": "{} ", "exec": "wl-gammarelay-rs watch {t}", @@ -336,61 +313,59 @@ "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateTemperature n -100", "on-click-middle": "$HOME/.config/hypr/scripts/gammarelay-auto-temp.py > /dev/null 2>&1 &", "on-click-right": "pkill -f '/usr/lib/python-exec/python3.12/python /home/andy/.config/hypr/scripts/gammarelay-auto-temp.py'", - "interval": "2", + "interval": "2" }, "custom/gammarelay-brightness": { "format": "{}% ", "exec": "wl-gammarelay-rs watch {bp}", "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d +0.02", "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateBrightness d -0.02", - "interval": "2", + "interval": "2" }, "custom/gammarelay-gamma": { "format": "{} 𝛄", "exec": "wl-gammarelay-rs watch {g}", "on-scroll-up": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateGamma d +0.02", "on-scroll-down": "busctl --user -- call rs.wl-gammarelay / rs.wl.gammarelay UpdateGamma d -0.02", - "interval": "2", + "interval": "2" }, - "group/gammarelay": { - "orientation": "horizontal", - "drawer": { - "transition-duration": 500, - "children-class": "not-gammarelay", - "transition-left-to-right": false, - "click-to-reveal": 1, - }, - "modules": [ - "custom/gammarelay-temperature", - "custom/gammarelay-gamma", - "custom/gammarelay-brightness", - ], - }, - - "group/temps": { - "orientation": "horizontal", - "drawer": { - "transition-duration": 500, - "children-class": "not-temps", - "transition-left-to-right": false, - "click-to-reveal": 1, - }, - "modules": [ - "temperature", - "temperature#cpu", - "temperature#board", - "temperature#gpu", - ], - }, - "custom/pipespacer": { - "format": "󰇙", - "max-length": 1, - "tooltip": false, + "orientation": "inherit", + "drawer": { + "click-to-reveal": false, + "transition-duration": 500, + "children-class": "not-gammarelay", + "transition-left-to-right": false }, - "custom/voidspacer": { - "format": " ", - "max-length": 1, - "tooltip": false, + "modules": [ + "custom/gammarelay-temperature", + "custom/gammarelay-gamma", + "custom/gammarelay-brightness" + ] + }, + "group/temps": { + "orientation": "inherit", + "drawer": { + "click-to-reveal": false, + "transition-duration": 500, + "children-class": "not-temps", + "transition-left-to-right": false }, + "modules": [ + "temperature#water", + "temperature#cpu", + "temperature#board", + "temperature#gpu" + ] + }, + "custom/pipespacer": { + "format": "󰇙", + "max-length": 1, + "tooltip": false + }, + "custom/voidspacer": { + "format": " ", + "max-length": 1, + "tooltip": false + } } -- 2.51.2