Commit 1479aead authored by Kirill Unitsaev's avatar Kirill Unitsaev

hyprland/waybar: improve the style

parent e690af64
...@@ -16,9 +16,8 @@ ...@@ -16,9 +16,8 @@
], ],
"modules-left": [ "modules-left": [
"image#menu", "image#menu",
"hyprland/workspaces#icons", "group/hypr-windowcount-workspaces",
"tray", "tray"
"hyprland/submap"
], ],
"modules-center": [ "modules-center": [
"clock" "clock"
...@@ -27,6 +26,7 @@ ...@@ -27,6 +26,7 @@
"custom/media#mini", "custom/media#mini",
"idle_inhibitor", "idle_inhibitor",
"hyprland/language", "hyprland/language",
"hyprland/submap",
"group/volume", "group/volume",
"network", "network",
"bluetooth", "bluetooth",
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
"size": 18, "size": 18,
"on-click": "pkill wofi || wofi --show drun -x 8 -y 10 --height 35% --width 25%" "on-click": "pkill wofi || wofi --show drun -x 8 -y 10 --height 35% --width 25%"
}, },
"hyprland/workspaces#icons": { "hyprland/workspaces#icons": {
"active-only": false, "active-only": false,
"all-outputs": false, "all-outputs": false,
...@@ -18,7 +17,6 @@ ...@@ -18,7 +17,6 @@
"special": "󰓏" "special": "󰓏"
} }
}, },
"hyprland/workspaces#numbers": { "hyprland/workspaces#numbers": {
"active-only": false, "active-only": false,
"all-outputs": false, "all-outputs": false,
...@@ -28,27 +26,34 @@ ...@@ -28,27 +26,34 @@
"on-scroll-up": "hyprctl dispatch workspace e+1", "on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1", "on-scroll-down": "hyprctl dispatch workspace e-1",
}, },
"hyprland/window": { "hyprland/window": {
"format": "{title}", "format": "{title}",
"icon": "true", "icon": "true",
"icon-size": 16, "icon-size": 16,
"max-length": 30, "max-length": 30,
}, },
"hyprland/windowcount": {
"tray": { "format": "{}",
"icon-size": 15, "separate-outputs": true
"show-passive-items": true, },
"spacing": 8 "hyprland/language": {
"format": "{}",
"format-en": "EN",
"format-ru": "RU",
"on-scroll-up": "hyprctl switchxkblayout all next",
"on-scroll-down": "hyprctl switchxkblayout all prev",
}, },
"hyprland/submap": { "hyprland/submap": {
"format": "{}", "format": "{}",
"on-click": "hyprctl dispatch submap reset", "on-click": "hyprctl dispatch submap reset",
"always-on": "true", "always-on": "true",
"default-submap": "reset", "default-submap": "reset",
}, },
"tray": {
"icon-size": 15,
"show-passive-items": true,
"spacing": 8
},
"custom/media": { "custom/media": {
"format": "{icon} {0}", "format": "{icon} {0}",
"return-type": "json", "return-type": "json",
...@@ -62,7 +67,6 @@ ...@@ -62,7 +67,6 @@
"on-scroll-up": "playerctl next", "on-scroll-up": "playerctl next",
"on-scroll-down": "playerctl previous" "on-scroll-down": "playerctl previous"
}, },
"custom/media#mini": { "custom/media#mini": {
"format": "{icon} {0}", "format": "{icon} {0}",
"return-type": "json", "return-type": "json",
...@@ -76,7 +80,6 @@ ...@@ -76,7 +80,6 @@
"on-scroll-up": "playerctl next", "on-scroll-up": "playerctl next",
"on-scroll-down": "playerctl previous" "on-scroll-down": "playerctl previous"
}, },
"idle_inhibitor": { "idle_inhibitor": {
"format": "{icon}", "format": "{icon}",
"format-icons": { "format-icons": {
...@@ -86,15 +89,6 @@ ...@@ -86,15 +89,6 @@
"tooltip-format-activated": "Кофеин: активен\nРежим ожидания: отключен", "tooltip-format-activated": "Кофеин: активен\nРежим ожидания: отключен",
"tooltip-format-deactivated": "Кофеин: отключен\nРежим ожидания: активен" "tooltip-format-deactivated": "Кофеин: отключен\nРежим ожидания: активен"
}, },
"hyprland/language": {
"format": "{}",
"format-en": "EN",
"format-ru": "RU",
"on-scroll-up": "hyprctl switchxkblayout all next",
"on-scroll-down": "hyprctl switchxkblayout all prev",
},
"pulseaudio#volume": { "pulseaudio#volume": {
"scroll-step": 5, "scroll-step": 5,
"format": "{icon} {volume}%", "format": "{icon} {volume}%",
...@@ -122,15 +116,6 @@ ...@@ -122,15 +116,6 @@
"on-scroll-down": "wpctl set-volume @DEFAULT_SOURCE@ 10%- -l 1.0", "on-scroll-down": "wpctl set-volume @DEFAULT_SOURCE@ 10%- -l 1.0",
"tooltip-format": "{source_desc}" "tooltip-format": "{source_desc}"
}, },
"group/volume": {
"orientation": "horizontal",
"modules": [
"pulseaudio#volume",
"pulseaudio#microphone",
]
},
"network": { "network": {
"tooltip": true, "tooltip": true,
"format-wifi": " ", "format-wifi": " ",
...@@ -143,7 +128,6 @@ ...@@ -143,7 +128,6 @@
"interval": 2, "interval": 2,
"on-click-right": "hyprctl dispatch exec '[size 910 460; move 100%-930 4%]' kitty nmtui" "on-click-right": "hyprctl dispatch exec '[size 910 460; move 100%-930 4%]' kitty nmtui"
}, },
"bluetooth": { "bluetooth": {
"format": "", "format": "",
"format-disabled": "󰂳", "format-disabled": "󰂳",
...@@ -154,12 +138,12 @@ ...@@ -154,12 +138,12 @@
"tooltip": true, "tooltip": true,
"tooltip-format": "", "tooltip-format": "",
"tooltip-format-disabled": "󰂳 Отключено", "tooltip-format-disabled": "󰂳 Отключено",
"tooltip-format-on": "󰂱 Включено",
"tooltip-format-off": "󰂳 Выключено", "tooltip-format-off": "󰂳 Выключено",
"tooltip-format-connected": "{device_enumerate}", "tooltip-format-connected": "{device_enumerate}",
"tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%", "tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
"on-click-right": "hyprctl dispatch exec '[size 530 350; move 100%-550 4%]' blueman-manager" "on-click-right": "hyprctl dispatch exec '[size 530 350; move 100%-550 4%]' blueman-manager"
}, },
"battery": { "battery": {
"states": { "states": {
"good": 95, "good": 95,
...@@ -185,7 +169,6 @@ ...@@ -185,7 +169,6 @@
"󰁹" "󰁹"
] ]
}, },
"backlight": { "backlight": {
"format": "{icon} {percent}%", "format": "{icon} {percent}%",
"format-icons": [ "format-icons": [
...@@ -202,7 +185,6 @@ ...@@ -202,7 +185,6 @@
"on-scroll-up": "brightnessctl s +5%", "on-scroll-up": "brightnessctl s +5%",
"on-scroll-down": "brightnessctl s 5%-" "on-scroll-down": "brightnessctl s 5%-"
}, },
"clock": { "clock": {
"format": "{:%H:%M}", "format": "{:%H:%M}",
"tooltip-format": "<tt><big>{calendar}</big></tt>", "tooltip-format": "<tt><big>{calendar}</big></tt>",
...@@ -219,7 +201,6 @@ ...@@ -219,7 +201,6 @@
} }
} }
}, },
"custom/notification": { "custom/notification": {
"format": "{icon} {0}", "format": "{icon} {0}",
"format-icons": { "format-icons": {
...@@ -239,19 +220,16 @@ ...@@ -239,19 +220,16 @@
"on-click-right": "swaync-client -d -sw", "on-click-right": "swaync-client -d -sw",
"escape": true "escape": true
}, },
"cpu": { "cpu": {
"interval": 1, "interval": 1,
"format": " {usage}%", "format": " {usage}%",
"tooltip-format": "{usage}" "tooltip-format": "{usage}"
}, },
"memory": { "memory": {
"interval": 1, "interval": 1,
"format": " {}%", "format": " {}%",
"tooltip-format": "memory: {used:0.1f}/{total:0.1f} GiB \nSWAP: {swapUsed:0.1f}/{swapTotal:0.1f} GiB" "tooltip-format": "memory: {used:0.1f}/{total:0.1f} GiB \nSWAP: {swapUsed:0.1f}/{swapTotal:0.1f} GiB"
}, },
"custom/ddclight": { "custom/ddclight": {
"tooltip": false, "tooltip": false,
"format": "{icon}", "format": "{icon}",
...@@ -272,4 +250,19 @@ ...@@ -272,4 +250,19 @@
"on-scroll-up": "ddclight set +5", "on-scroll-up": "ddclight set +5",
"on-scroll-down": "ddclight set 5-" "on-scroll-down": "ddclight set 5-"
}, },
// ---------- ГРУППЫ ---- GROUPS
"group/hypr-windowcount-workspaces": {
"orientation": "horizontal",
"modules": [
"hyprland/windowcount",
"hyprland/workspaces#icons"
]
},
"group/volume": {
"orientation": "horizontal",
"modules": [
"pulseaudio#volume",
"pulseaudio#microphone",
]
}
} }
...@@ -19,6 +19,7 @@ window#waybar { ...@@ -19,6 +19,7 @@ window#waybar {
} }
.module { .module {
background-color: @bg;
min-height: 0; min-height: 0;
border-radius: 20px; border-radius: 20px;
margin: 5px; margin: 5px;
...@@ -50,10 +51,6 @@ window#waybar { ...@@ -50,10 +51,6 @@ window#waybar {
padding: 0 10px 0 5px; padding: 0 10px 0 5px;
} }
#image:not(:hover) {
background: transparent
}
#workspaces.icons button { #workspaces.icons button {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
......
...@@ -19,6 +19,7 @@ window#waybar { ...@@ -19,6 +19,7 @@ window#waybar {
} }
.module { .module {
background-color: @bg;
min-height: 0; min-height: 0;
border-radius: 20px; border-radius: 20px;
margin: 5px; margin: 5px;
...@@ -50,10 +51,6 @@ window#waybar { ...@@ -50,10 +51,6 @@ window#waybar {
padding: 0 10px 0 5px; padding: 0 10px 0 5px;
} }
#image:not(:hover) {
background: transparent
}
#workspaces.icons button { #workspaces.icons button {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment