From 4f3850ddc38391a9b1d2a766009269ee00cf5d3b Mon Sep 17 00:00:00 2001 From: Niktia Bykov Date: Thu, 20 Jun 2024 22:55:40 +0500 Subject: [PATCH] rename config --- .config/waybar/config | 182 --------------------------- .config/waybar/config.jsonc | 208 +++++++++++++++++++++++++++++++ .config/waybar/style.css | 2 +- .config/waybar/weather-plugin.sh | 11 +- 4 files changed, 219 insertions(+), 184 deletions(-) delete mode 100644 .config/waybar/config create mode 100644 .config/waybar/config.jsonc diff --git a/.config/waybar/config b/.config/waybar/config deleted file mode 100644 index c7fe829..0000000 --- a/.config/waybar/config +++ /dev/null @@ -1,182 +0,0 @@ -{ - "layer": "top", // Waybar at top layer - "position": "bottom", // Waybar position (top|bottom|left|right) - "margin-bottom": 0, - "margin-left": 0, - "margin-right": 0, - "height": 10, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width - "spacing": 10, // Gaps between modules (4px) - // Choose the order of the modules - "modules-left": [ - "hyprland/workspaces", - ], - "modules-center": ["mpd"], - "modules-right": [ - "hyprland/language", - "pulseaudio", - "cpu", - "memory", - "custom/weather", - "clock", - ], - "hyprland/language": { - "format": "{}", - "format-en": "en", - "format-ru": "ru", - "keyboard-name": "keychron-keychron-q1-keyboard" -}, - // Modules configuration - "custom/weather": { - "exec": "$HOME/.config/waybar/weather-plugin.sh", - "interval": 600, - "signal": "8", - }, - "hyprland/workspaces": { - "format": "{name}", - "tooltip": false, - "on-click": "activate", - "sort-by-number": true, - "all-outputs": true, - "disable-scroll": true, - "show-special": true, - "format-icons": { - "active": "", - "default": "" - } - }, - "keyboard-state": { - "numlock": true, - "capslock": true, - "format": "{name} {icon}", - "format-icons": { - "locked": "", - "unlocked": "" - } - }, - "mpd": { - "on-click": "mpc toggle", - "tooltip": false, - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {title}", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", - "interval": 2, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "max-length": 40, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)", - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - // "timezone": "America/New_York", - "format": "{:%a, %b %d %H:%M}", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" - }, - "cpu": { - "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", "", "", "", "", "", "", "", ""] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}% {icon}", - "format-charging": "{capacity}% ", - "format-plugged": "{capacity}% ", - "format-alt": "{time} {icon}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "{essid} ({signalStrength}%) ", - "format-ethernet": "{ipaddr}/{cidr} ", - "tooltip-format": "{ifname} via {gwaddr} ", - "format-linked": "{ifname} (No IP) ", - "format-disconnected": "Disconnected ⚠", - "format-alt": "{ifname}: {ipaddr}/{cidr}" - }, - "pulseaudio": { - "tooltip": false, - // "scroll-step": 1, // %, can be a float - //"format": "{volume}% {icon} {format_source}", - "format": "{volume}% {icon}", - "format-bluetooth": "{volume}% {icon} {format_source}", - "format-bluetooth-muted": " {icon} {format_source}", - "format-muted": "󰟎", - "format-source": "{volume}% ", - "format-source-muted": "", - "format-icons": { - "headphone": "󰋋", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "on-click": "pavucontrol" - }, - "custom/media": { - "format": "{icon} {}", - "return-type": "json", - "max-length": 40, - "format-icons": { - "spotify": "", - "default": "🎜" - }, - "escape": true, - "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder - // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name - } -} diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc new file mode 100644 index 0000000..a248d5f --- /dev/null +++ b/.config/waybar/config.jsonc @@ -0,0 +1,208 @@ +{ + "layer": "top", // Waybar at top layer + "position": "bottom", // Waybar position (top|bottom|left|right) + "margin-bottom": 0, + "margin-left": 0, + "margin-right": 0, + "height": 10, // Waybar height (to be removed for auto height) + // "width": 1280, // Waybar width + "spacing": 10, // Gaps between modules (4px) + // Choose the order of the modules + "modules-left": [ + "hyprland/workspaces" + ], + "modules-center": [ + "mpd" + ], + "modules-right": [ + "hyprland/language", + "pulseaudio", + "cpu", + "memory", + "custom/weather", + "clock" + ], + // Modules configuration + "hyprland/language": { + "format": "{}", + "format-en": "en", + "format-ru": "ru", + "keyboard-name": "keychron-keychron-q1-keyboard" + }, + "custom/weather": { + "exec": "$HOME/.config/waybar/weather-plugin.sh", + "interval": 600, + "signal": "8" + }, + "hyprland/workspaces": { + "format": "{name}", + "tooltip": false, + "on-click": "activate", + "sort-by-number": true, + "all-outputs": true, + "disable-scroll": true, + "show-special": true, + "format-icons": { + "active": "", + "default": "" + } + }, + "keyboard-state": { + "numlock": true, + "capslock": true, + "format": "{name} {icon}", + "format-icons": { + "locked": "", + "unlocked": "" + } + }, + "mpd": { + "on-click": "mpc toggle", + "tooltip": false, + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {title}", + "format-disconnected": "Disconnected ", + "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", + "unknown-tag": "N/A", + "interval": 2, + "consume-icons": { + "on": " " + }, + "random-icons": { + "off": " ", + "on": " " + }, + "repeat-icons": { + "on": " " + }, + "single-icons": { + "on": "1 " + }, + "state-icons": { + "paused": "", + "playing": "" + }, + "max-length": 40, + "tooltip-format": "MPD (connected)", + "tooltip-format-disconnected": "MPD (disconnected)" + }, + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + // "timezone": "America/New_York", + "format": "{:%a, %b %d %H:%M}", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}" + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "temperature": { + // "thermal-zone": 2, + // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 80, + // "format-critical": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C {icon}", + "format-icons": [ + "", + "", + "" + ] + }, + "backlight": { + // "device": "acpi_video1", + "format": "{percent}% {icon}", + "format-icons": [ + "", + "", + "", + "", + "", + "", + "", + "", + "" + ] + }, + "battery": { + "states": { + // "good": 95, + "warning": 30, + "critical": 15 + }, + "format": "{capacity}% {icon}", + "format-charging": "{capacity}% ", + "format-plugged": "{capacity}% ", + "format-alt": "{time} {icon}", + // "format-good": "", // An empty format will hide the module + // "format-full": "", + "format-icons": [ + "", + "", + "", + "", + "" + ] + }, + "battery#bat2": { + "bat": "BAT2" + }, + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "{essid} ({signalStrength}%) ", + "format-ethernet": "{ipaddr}/{cidr} ", + "tooltip-format": "{ifname} via {gwaddr} ", + "format-linked": "{ifname} (No IP) ", + "format-disconnected": "Disconnected ⚠", + "format-alt": "{ifname}: {ipaddr}/{cidr}" + }, + "pulseaudio": { + "tooltip": false, + // "scroll-step": 1, // %, can be a float + //"format": "{volume}% {icon} {format_source}", + "format": "{volume}% {icon}", + "format-bluetooth": "{volume}% {icon} {format_source}", + "format-bluetooth-muted": " {icon} {format_source}", + "format-muted": "󰟎", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "󰋋", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": [ + "", + "", + "" + ] + }, + "on-click": "pavucontrol" + }, + "custom/media": { + "format": "{icon} {}", + "return-type": "json", + "max-length": 40, + "format-icons": { + "spotify": "", + "default": "🎜" + }, + "escape": true, + "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder + // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + } +} diff --git a/.config/waybar/style.css b/.config/waybar/style.css index b1f4109..9987930 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -3,7 +3,7 @@ padding: 0; border: none; border-radius: 0; - font-family: 'MonaspiceNe Nerd Font'; + font-family: 'Input Nerd Font'; font-size: 13px; min-height: 1.5em; } diff --git a/.config/waybar/weather-plugin.sh b/.config/waybar/weather-plugin.sh index ade97b1..c54840d 100755 --- a/.config/waybar/weather-plugin.sh +++ b/.config/waybar/weather-plugin.sh @@ -132,6 +132,9 @@ function getData { # echo `date +%s` >> "$HOME/.weather-last" fi } +function getDataWttrIn { + RESPONSE_WTTR_IN=`curl -s wttr.in` +} function setIcons { if [ $WID -le 232 ]; then #Thunderstorm @@ -260,8 +263,14 @@ function setIcons { function outputCompact { OUTPUT="$WIND $ICON $ERR_MSG$COLOR_TEXT_BEGIN$DESCRIPTION$COLOR_TEXT_END| $TEMP" + # getDataWttrIn + # # echo "Output: $OUTPUT" >> "$HOME/.weather.log" - echo "$OUTPUT" + # printf "$OUTPUT\n$RESPONSE_WTTR_IN" + # echo $OUTPUT + echo "$OUTPUT" + # $RESPONSE_WTTR_IN" + # printf '{"text": "%s", "tooltip": "%s"}', "$OUTPUT", "$OUTPUT" } getData $1