diff --git a/waybar/config b/waybar/config
deleted file mode 100644
index 91374f1..0000000
--- a/waybar/config
+++ /dev/null
@@ -1,252 +0,0 @@
-{
- "layer": "top",
- "height": 30,
- "margin-top": 2,
- "margin-left": 5,
- "margin-right": 5,
- "margin-bottom": 0,
- "spacing": 4,
- "modules-left": ["custom/launcher", "cpu", "memory", "temperature", "disk", "custom/weather", "custom/updates", "hyprland/window"],
- "modules-center": ["hyprland/workspaces"],
- "modules-right": ["pulseaudio", "mpris", "backlight", "keyboard-state", "hyprland/language", "battery", "battery#bat2", "clock", "tray", "custom/power"],
- "hyprland/workspaces": {
- "format": "{icon}",
- // "format-icons": {
- // "1": "",
- // "2": "",
- // "3": "",
- // "4": "",
- // "default": "", // "",
- // "focused": "",
- // "urgent": ""
- // },
- // "icon-size": 20,
- "all-outputs": true,
- "on-scroll-up": "hyprctl dispatch workspace e+1",
- "on-scroll-down": "hyprctl dispatch workspace e-1"
- },
- "hyprland/window": {
- "format": "{}",
- "icon": true,
- "icon-size" : 20
- },
- "keyboard-state": {
- "numlock": true,
- "capslock": true,
- "format": "{name} {icon}",
- "format-icons": {
- "locked": "",
- "unlocked": ""
- }
- },
- "hyprland/language": {
- "format": "{}",
- "format-en": "US",
- "format-ru": "RU",
- "on-click": "swaync-client -t"
- },
- "tray": {
- "spacing": 10
- },
- "clock": {
- "timezone": "Asia/Tomsk",
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format-alt": "{:%Y-%m-%d}"
- },
- "cpu": {
- "format": " {usage}%",
- "tooltip": false
- },
- "memory": {
- "format": " {}%"
- },
- "temperature": {
- "critical-threshold": 80,
- "format": "{temperatureC}°C {icon}",
- "format-icons": ["", "", ""]
- },
- "backlight": {
- "format": "{percent}% {icon}",
- "format-icons": ["", "", "", "", "", "", "", "", ""]
- },
- "battery": {
- "states": {
- "warning": 30,
- "critical": 15
- },
- "format": "{capacity}% {icon}",
- "format-charging": "{capacity}% ",
- "format-plugged": "{capacity}% ",
- "format-alt": "{time} {icon}",
- "format-icons": ["", "", "", "", ""]
- },
- "battery#bat2": {
- "bat": "BAT2"
- },
- "network": {
- "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/slider": {
- "min": 0,
- "max": 100,
- "orientation": "horizontal"
- },
- "pulseaudio": {
- "format": "{volume}% {icon} {format_source}",
- "format-bluetooth": "{volume}% {icon} {format_source}",
- "format-bluetooth-muted": " {icon} {format_source}",
- "format-muted": " {format_source}",
- "format-source": "{volume}% ",
- "format-source-muted": "",
- "format-icons": {
- "headphone": "",
- "hands-free": "",
- "headset": "",
- "phone": "",
- "portable": "",
- "car": "",
- "default": [" ", " ", " "]
- },
- "on-click": "pavucontrol"
- },
- "custom/power": {
- "format": "⏻",
- "on-click": "~/dotfiles/rofi/powermenu/powermenu.sh"
- },
- "custom/launcher": {
- "format": "",
- "on-click": "~/dotfiles/rofi/launcher/launcher.sh"
- },
- "disk": {
- "interval": 30,
- "format": " {percentage_used}%",
- "unit": "GB"
- },
- "custom/spotify": {
- "format": "{} ",
- "exec": "~/.config/waybar/scripts/spotify.sh",
- "return-type": "json",
- "on-click": "playerctl -p spotify play-pause",
- "on-scroll-up": "playerctl -p spotify next",
- "on-scroll-down": "playerctl -p spotify previous",
- "exec-if": "pgrep spotfiy"
- },
- //"custom/weather": {
- // "interval": 900,
- // "return-type": "json",
- // "exec": "waybar_weather_display --latitude 56.4884 --longitude 84.9480",
- // "format-alt": "{} ",
- // "format": "{alt} ",
- // "format-alt-click": "click-right",
- // "escape": true
- //},
- //"custom/weather": {
- // "format": "{}",
- // "tooltip": true,
- // "interval": 900,
- // "exec": "wttrbar --location tomsk",
- // "return-type": "json",
- // "on-click": "~/dotfiles/hypr/bin/toggle_weather_ags"
- //},
- "custom/pacman": {
- "format": "{} ",
- "interval": 3600, // every hour
- "exec": "checkupdates | wc -l", // # of updates
- "exec-if": "exit 0", // always run; consider advanced run conditions
- "on-click": "echo click", // update system
- "signal": 8
- },
- "custom/updates": {
- "format": "{} {icon}",
- "return-type": "json",
- "format-icons": {
- "has-updates": "",
- "updated": ""
- },
- "on-click": "~/dotfiles/hypr/bin/startupdate.sh",
- "exec-if": "which waybar-module-pacman-updates",
- "exec": "waybar-module-pacman-updates --interval-seconds 5 --network-interval-seconds 300"
- },
- "custom/onscreenkeyboard": {
- "format": " ",
- "on-click": "~/dotfiles/hypr/bin/toggle_keyboard.sh"
- },
- "bluetooth": {
- "format": " {status}",
- "format-no-controller": "",
- "format-disabled": "",
- "format-connected": " {device_alias}",
- "format-connected-battery": " {device_alias} {device_battery_percentage}%",
- "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
- "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
- "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
- "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%"
- },
- "privacy": {
- "icon-spacing": 4,
- "icon-size": 18,
- "transition-duration": 250,
- "modules": [
- {
- "type": "screenshare",
- "tooltip": true,
- "tooltip-icon-size": 24
- },
- {
- "type": "audio-out",
- "tooltip": true,
- "tooltip-icon-size": 24
- },
- {
- "type": "audio-in",
- "tooltip": true,
- "tooltip-icon-size": 24
- }
- ]
- },
- "cava": {
-// "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
- "framerate": 30,
- "autosens": 1,
- "sensitivity": 100,
- "bars": 14,
- "lower_cutoff_freq": 50,
- "higher_cutoff_freq": 10000,
- "method": "pulse",
- "source": "auto",
- "stereo": true,
- "reverse": false,
- "bar_delimiter": 0,
- "monstercat": false,
- "waves": false,
- "noise_reduction": 0.77,
- "input_delay": 2,
- "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
- "actions": {
- "on-click-right": "mode"
- }
- },
- "mpris": {
- "format": "{player_icon} {status_icon}",
- "format-paused": "{player_icon} {status_icon}",
- "player-icons": {
- //"default": "▶",
- "mpv": "🎵",
- "chromium": "",
- "firefox": "",
- "TelegramDesktop": ""
- },
- "status-icons": {
- "playing": "",
- "paused": ""
- },
- "on-click-right": "~/dotfiles/ags/media/toggle_media",
- // "ignored-players": ["firefox"]
- }
-}
-
diff --git a/waybar/config.jsonc b/waybar/config.jsonc
new file mode 100644
index 0000000..938b172
--- /dev/null
+++ b/waybar/config.jsonc
@@ -0,0 +1,272 @@
+{
+ "layer": "top",
+ "height": 30,
+ "margin-top": 2,
+ "margin-left": 5,
+ "margin-right": 5,
+ "margin-bottom": 0,
+ "spacing": 4,
+ "modules-left": [
+ "custom/launcher",
+ "cpu",
+ "memory",
+ "temperature",
+ "disk",
+ "custom/weather",
+ "custom/updates",
+ "hyprland/window",
+ ],
+ "modules-center": ["hyprland/workspaces"],
+ "modules-right": [
+ "pulseaudio",
+ "mpris",
+ "backlight",
+ "keyboard-state",
+ "hyprland/language",
+ "battery",
+ "battery#bat2",
+ "clock",
+ "tray",
+ "custom/power",
+ ],
+ "hyprland/workspaces": {
+ "format": "{icon}",
+ "workspace-taskbar": true,
+ // "format-icons": {
+ // "1": "",
+ // "2": "",
+ // "3": "",
+ // "4": "",
+ // "default": "", // "",
+ // "focused": "",
+ // "urgent": ""
+ // },
+ // "icon-size": 20,
+ "all-outputs": true,
+ "on-scroll-up": "hyprctl dispatch \"hl.dsp.focus({workspace = 'e+1'})\"",
+ "on-scroll-down": "hyprctl dispatch \"hl.dsp.focus({workspace = 'e-1'})\"",
+ },
+ "hyprland/window": {
+ "format": "{}",
+ "icon": true,
+ "icon-size": 20,
+ },
+ "keyboard-state": {
+ "numlock": true,
+ "capslock": true,
+ "format": "{name} {icon}",
+ "format-icons": {
+ "locked": "",
+ "unlocked": "",
+ },
+ },
+ "hyprland/language": {
+ "format": "{}",
+ "format-en": "US",
+ "format-ru": "RU",
+ "on-click": "swaync-client -t",
+ },
+ "tray": {
+ "spacing": 10,
+ },
+ "clock": {
+ "timezone": "Asia/Tomsk",
+ "tooltip-format": "{:%Y %B}\n{calendar}",
+ "format-alt": "{:%Y-%m-%d}",
+ },
+ "cpu": {
+ "format": " {usage}%",
+ "tooltip": false,
+ },
+ "memory": {
+ "format": " {}%",
+ },
+ "temperature": {
+ "critical-threshold": 80,
+ "format": "{temperatureC}°C {icon}",
+ "format-icons": ["", "", ""],
+ },
+ "backlight": {
+ "format": "{percent}% {icon}",
+ "format-icons": ["", "", "", "", "", "", "", "", ""],
+ },
+ "battery": {
+ "states": {
+ "warning": 30,
+ "critical": 15,
+ },
+ "format": "{capacity}% {icon}",
+ "format-charging": "{capacity}% ",
+ "format-plugged": "{capacity}% ",
+ "format-alt": "{time} {icon}",
+ "format-icons": ["", "", "", "", ""],
+ },
+ "battery#bat2": {
+ "bat": "BAT2",
+ },
+ "network": {
+ "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/slider": {
+ "min": 0,
+ "max": 100,
+ "orientation": "horizontal",
+ },
+ "pulseaudio": {
+ "format": "{volume}% {icon} {format_source}",
+ "format-bluetooth": "{volume}% {icon} {format_source}",
+ "format-bluetooth-muted": " {icon} {format_source}",
+ "format-muted": " {format_source}",
+ "format-source": "{volume}% ",
+ "format-source-muted": "",
+ "format-icons": {
+ "headphone": "",
+ "hands-free": "",
+ "headset": "",
+ "phone": "",
+ "portable": "",
+ "car": "",
+ "default": [" ", " ", " "],
+ },
+ "on-click": "pavucontrol",
+ },
+ "custom/power": {
+ "format": "⏻",
+ "on-click": "~/dotfiles/rofi/powermenu/powermenu.sh",
+ },
+ "custom/launcher": {
+ "format": "",
+ "on-click": "~/dotfiles/rofi/launcher/launcher.sh",
+ },
+ "disk": {
+ "interval": 30,
+ "format": " {percentage_used}%",
+ "unit": "GB",
+ },
+ "custom/spotify": {
+ "format": "{} ",
+ "exec": "~/.config/waybar/scripts/spotify.sh",
+ "return-type": "json",
+ "on-click": "playerctl -p spotify play-pause",
+ "on-scroll-up": "playerctl -p spotify next",
+ "on-scroll-down": "playerctl -p spotify previous",
+ "exec-if": "pgrep spotfiy",
+ },
+ //"custom/weather": {
+ // "interval": 900,
+ // "return-type": "json",
+ // "exec": "waybar_weather_display --latitude 56.4884 --longitude 84.9480",
+ // "format-alt": "{} ",
+ // "format": "{alt} ",
+ // "format-alt-click": "click-right",
+ // "escape": true
+ //},
+ //"custom/weather": {
+ // "format": "{}",
+ // "tooltip": true,
+ // "interval": 900,
+ // "exec": "wttrbar --location tomsk",
+ // "return-type": "json",
+ // "on-click": "~/dotfiles/hypr/bin/toggle_weather_ags"
+ //},
+ "custom/pacman": {
+ "format": "{} ",
+ "interval": 3600, // every hour
+ "exec": "checkupdates | wc -l", // # of updates
+ "exec-if": "exit 0", // always run; consider advanced run conditions
+ "on-click": "echo click", // update system
+ "signal": 8,
+ },
+ "custom/updates": {
+ "format": "{} {icon}",
+ "return-type": "json",
+ "format-icons": {
+ "has-updates": "",
+ "updated": "",
+ },
+ "on-click": "~/dotfiles/hypr/bin/startupdate.sh",
+ "exec-if": "which waybar-module-pacman-updates",
+ "exec": "waybar-module-pacman-updates --interval-seconds 5 --network-interval-seconds 300",
+ },
+ "custom/onscreenkeyboard": {
+ "format": " ",
+ "on-click": "~/dotfiles/hypr/bin/toggle_keyboard.sh",
+ },
+ "bluetooth": {
+ "format": " {status}",
+ "format-no-controller": "",
+ "format-disabled": "",
+ "format-connected": " {device_alias}",
+ "format-connected-battery": " {device_alias} {device_battery_percentage}%",
+ "tooltip-format": "{controller_alias}\t{controller_address}\n\n{num_connections} connected",
+ "tooltip-format-connected": "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}",
+ "tooltip-format-enumerate-connected": "{device_alias}\t{device_address}",
+ "tooltip-format-enumerate-connected-battery": "{device_alias}\t{device_address}\t{device_battery_percentage}%",
+ },
+ "privacy": {
+ "icon-spacing": 4,
+ "icon-size": 18,
+ "transition-duration": 250,
+ "modules": [
+ {
+ "type": "screenshare",
+ "tooltip": true,
+ "tooltip-icon-size": 24,
+ },
+ {
+ "type": "audio-out",
+ "tooltip": true,
+ "tooltip-icon-size": 24,
+ },
+ {
+ "type": "audio-in",
+ "tooltip": true,
+ "tooltip-icon-size": 24,
+ },
+ ],
+ },
+ "cava": {
+ // "cava_config": "$XDG_CONFIG_HOME/cava/cava.conf",
+ "framerate": 30,
+ "autosens": 1,
+ "sensitivity": 100,
+ "bars": 14,
+ "lower_cutoff_freq": 50,
+ "higher_cutoff_freq": 10000,
+ "method": "pulse",
+ "source": "auto",
+ "stereo": true,
+ "reverse": false,
+ "bar_delimiter": 0,
+ "monstercat": false,
+ "waves": false,
+ "noise_reduction": 0.77,
+ "input_delay": 2,
+ "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"],
+ "actions": {
+ "on-click-right": "mode",
+ },
+ },
+ "mpris": {
+ "format": "{player_icon} {status_icon}",
+ "format-paused": "{player_icon} {status_icon}",
+ "player-icons": {
+ //"default": "▶",
+ "mpv": "🎵",
+ "chromium": "",
+ "firefox": "",
+ "TelegramDesktop": "",
+ },
+ "status-icons": {
+ "playing": "",
+ "paused": "",
+ },
+ "on-click-right": "~/dotfiles/ags/media/toggle_media",
+ // "ignored-players": ["firefox"]
+ },
+}