Skip to content

B
branding-etersoft-ximper
Commit 1479aead authored by Kirill Unitsaev's avatar Kirill Unitsaev
Browse files
Options

hyprland/waybar: improve the style

parent e690af64
Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 243 deletions
configs/hyprland/waybar/config
View file @ 1479aead
{
"layer": "top",
"layer": "top",
"position": "top",
"margin-left": 35,
"margin-top": 5,
......@@ -10,15 +10,14 @@
"gtk-layer-shell": true,
"passthrough": false,
"fixed-center": true,
"reload_style_on_change": true, // Релоад при изменении css
"reload_style_on_change": true, // Релоад при изменении css
"include": [
"/etc/ximperdistro/hyprland/waybar/modules.json"
],
"modules-left": [
"image#menu",
"hyprland/workspaces#icons",
"tray",
"hyprland/submap"
"group/hypr-windowcount-workspaces",
"tray"
],
"modules-center": [
"clock"
......@@ -27,6 +26,7 @@
"custom/media#mini",
"idle_inhibitor",
"hyprland/language",
"hyprland/submap",
"group/volume",
"network",
"bluetooth",
......@@ -34,4 +34,4 @@
"backlight",
"custom/notification"
]
}
}
\ No newline at end of file
configs/hyprland/waybar/modules.json
View file @ 1479aead
{
"image#menu": {
"path": "/usr/share/pixmaps/ximperlinux.svg",
"size": 18,
"on-click": "pkill wofi || wofi --show drun -x 8 -y 10 --height 35% --width 25%"
},
"hyprland/workspaces#icons": {
"active-only": false,
"all-outputs": false,
"format": "{icon}",
"show-special": true,
"on-click": "activate",
"on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1",
"format-icons": {
"default": "",
"special": "󰓏"
}
},
"hyprland/workspaces#numbers": {
"active-only": false,
"all-outputs": false,
"format": "{name}",
"show-special": true,
"on-click": "activate",
"on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1",
},
"image#menu": {
"path": "/usr/share/pixmaps/ximperlinux.svg",
"size": 18,
"on-click": "pkill wofi || wofi --show drun -x 8 -y 10 --height 35% --width 25%"
},
"hyprland/workspaces#icons": {
"active-only": false,
"all-outputs": false,
"format": "{icon}",
"show-special": true,
"on-click": "activate",
"on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1",
"format-icons": {
"default": "",
"special": "󰓏"
}
},
"hyprland/workspaces#numbers": {
"active-only": false,
"all-outputs": false,
"format": "{name}",
"show-special": true,
"on-click": "activate",
"on-scroll-up": "hyprctl dispatch workspace e+1",
"on-scroll-down": "hyprctl dispatch workspace e-1",
},
"hyprland/window": {
"format": "{title}",
"icon": "true",
"icon-size": 16,
"max-length": 30,
},
"tray": {
"icon-size": 15,
"show-passive-items": true,
"spacing": 8
},
"hyprland/submap": {
"format": "{}",
"on-click": "hyprctl dispatch submap reset",
"always-on": "true",
"default-submap": "reset",
},
"custom/media": {
"format": "{icon} {0}",
"return-type": "json",
"format-icons": {
"Playing": "",
"Paused": ""
},
"max-length": 50,
"exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
"on-click": "playerctl play-pause",
"on-scroll-up": "playerctl next",
"on-scroll-down": "playerctl previous"
},
"hyprland/windowcount": {
"format": "{}",
"separate-outputs": true
},
"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": {
"format": "{}",
"on-click": "hyprctl dispatch submap reset",
"always-on": "true",
"default-submap": "reset",
},
"tray": {
"icon-size": 15,
"show-passive-items": true,
"spacing": 8
},
"custom/media": {
"format": "{icon} {0}",
"return-type": "json",
"format-icons": {
"Playing": "",
"Paused": ""
},
"max-length": 50,
"exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
"on-click": "playerctl play-pause",
"on-scroll-up": "playerctl next",
"on-scroll-down": "playerctl previous"
},
"custom/media#mini": {
"format": "{icon} {0}",
"return-type": "json",
......@@ -71,187 +75,161 @@
"Paused": ""
},
"max-length": 30,
"exec": "playerctl -a metadata --format '{\"text\": \"{{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(artist)}} - {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
"on-click": "playerctl play-pause",
"on-scroll-up": "playerctl next",
"on-scroll-down": "playerctl previous"
"exec": "playerctl -a metadata --format '{\"text\": \"{{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(artist)}} - {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
"on-click": "playerctl play-pause",
"on-scroll-up": "playerctl next",
"on-scroll-down": "playerctl previous"
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "󰅶",
"deactivated": "󰾫"
},
"tooltip-format-activated": "Кофеин: активен\nРежим ожидания: отключен",
"tooltip-format-deactivated": "Кофеин: отключен\nРежим ожидания: активен"
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "󰅶",
"deactivated": "󰾫"
},
"tooltip-format-activated": "Кофеин: активен\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,
"format": "{icon} {volume}%",
"format-bluetooth": " {icon} {volume}%",
"format-muted": " ",
"tooltip-format": "{desc}",
"format-icons": {
"headphone": "",
"default": [
"",
"",
""
]
},
"on-click": "hyprctl dispatch exec '[size 820 400; move 100%-840 4%]' pwvucontrol",
"on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
"format": "{icon} {volume}%",
"format-bluetooth": " {icon} {volume}%",
"format-muted": " ",
"tooltip-format": "{desc}",
"format-icons": {
"headphone": "",
"default": [
"",
"",
""
]
},
"on-click": "hyprctl dispatch exec '[size 820 400; move 100%-840 4%]' pwvucontrol",
"on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
},
"pulseaudio#microphone": {
"format": "{format_source}",
"format-source": " {volume}%",
"format-source-muted": " ",
"on-click": "hyprctl dispatch exec '[size 820 400; move 100%-840 4%]' pwvucontrol",
"on-click-right": "wpctl set-mute @DEFAULT_SOURCE@ toggle",
"on-scroll-up": "wpctl set-volume @DEFAULT_SOURCE@ 10%+ -l 1.0",
"pulseaudio#microphone": {
"format": "{format_source}",
"format-source": " {volume}%",
"format-source-muted": " ",
"on-click": "hyprctl dispatch exec '[size 820 400; move 100%-840 4%]' pwvucontrol",
"on-click-right": "wpctl set-mute @DEFAULT_SOURCE@ toggle",
"on-scroll-up": "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}"
},
"group/volume": {
"orientation": "horizontal",
"modules": [
"pulseaudio#volume",
"pulseaudio#microphone",
]
},
"tooltip-format": "{source_desc}"
},
"network": {
"tooltip": true,
"format-wifi": " ",
"rotate": 0,
"format-ethernet": "󰈀",
"format-linked": "󰈀 (No IP)",
"format-disconnected": "󰖪 ",
"tooltip-format-disconnected": "Нет соединения",
"format-alt": "<span foreground='#90ceaa'> {bandwidthDownBytes}</span> <span foreground='#dd6777'>  {bandwidthUpBytes}</span>",
"interval": 2,
"on-click-right": "hyprctl dispatch exec '[size 910 460; move 100%-930 4%]' kitty nmtui"
},
"tooltip": true,
"format-wifi": " ",
"rotate": 0,
"format-ethernet": "󰈀",
"format-linked": "󰈀 (No IP)",
"format-disconnected": "󰖪 ",
"tooltip-format-disconnected": "Нет соединения",
"format-alt": "<span foreground='#90ceaa'> {bandwidthDownBytes}</span> <span foreground='#dd6777'>  {bandwidthUpBytes}</span>",
"interval": 2,
"on-click-right": "hyprctl dispatch exec '[size 910 460; move 100%-930 4%]' kitty nmtui"
},
"bluetooth": {
"format": "",
"format-disabled": "󰂳",
"format-on": "󰂱",
"format-off": "󰂲",
"format-disconnected": "󰂲",
"format-connected": "󰂱 {num_connections}",
"tooltip": true,
"tooltip-format": "",
"tooltip-format-disabled": "󰂳 Отключено",
"tooltip-format-off": "󰂳 Выключено",
"tooltip-format-connected": "{device_enumerate}",
"tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
"on-click-right": "hyprctl dispatch exec '[size 530 350; move 100%-550 4%]' blueman-manager"
},
"battery": {
"states": {
"good": 95,
"warning": 30,
"critical": 15
},
"format": "{icon} {capacity}%",
"rotate": 0,
"format-charging": " {capacity}%",
"format-plugged": " {capacity}%",
"format-alt": "{time} {icon}",
"format-icons": [
"󰂎",
"󰁺",
"󰁻",
"󰁼",
"󰁽",
"󰁾",
"󰁿",
"󰂀",
"󰂁",
"󰂂",
"󰁹"
]
},
"backlight": {
"format": "{icon} {percent}%",
"format-icons": [
"",
"",
"",
"",
"",
"",
"",
"",
""
],
"on-scroll-up": "brightnessctl s +5%",
"on-scroll-down": "brightnessctl s 5%-"
},
"clock": {
"format": "{:%H:%M}",
"tooltip-format": "<tt><big>{calendar}</big></tt>",
"format-alt": "{:%Y-%m-%d}",
"calendar": {
"mode": "month",
"weeks-pos": "left",
"format": {
"months": "<span color='#d0d3d8'><b>{}</b></span>",
"days": "<span color='#cbced3'><b>{}</b></span>",
"weeks": "<span color='#95d3af'><b>W{}</b></span>",
"weekdays": "<span color='#98d3ee'><b>{}</b></span>",
"today": "<span color='#e26c7c'><b><u>{}</u></b></span>"
}
}
},
"custom/notification": {
"format": "{icon} {0}",
"format-icons": {
"notification": " <span foreground='red'><sup></sup></span>",
"none": " ",
"dnd-notification": " <span foreground='red'><sup></sup></span>",
"dnd-none": " ",
"inhibited-notification": " <span foreground='red'><sup></sup></span>",
"inhibited-none": " ",
"dnd-inhibited-notification": " <span foreground='red'><sup></sup></span>",
"dnd-inhibited-none": " "
},
"return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb",
"on-click": "swaync-client -t -sw",
"on-click-right": "swaync-client -d -sw",
"escape": true
},
"format": "",
"format-disabled": "󰂳",
"format-on": "󰂱",
"format-off": "󰂲",
"format-disconnected": "󰂲",
"format-connected": "󰂱 {num_connections}",
"tooltip": true,
"tooltip-format": "",
"tooltip-format-disabled": "󰂳 Отключено",
"tooltip-format-on": "󰂱 Включено",
"tooltip-format-off": "󰂳 Выключено",
"tooltip-format-connected": "{device_enumerate}",
"tooltip-format-enumerate-connected": " {device_alias} 󰂄{device_battery_percentage}%",
"on-click-right": "hyprctl dispatch exec '[size 530 350; move 100%-550 4%]' blueman-manager"
},
"battery": {
"states": {
"good": 95,
"warning": 30,
"critical": 15
},
"format": "{icon} {capacity}%",
"rotate": 0,
"format-charging": " {capacity}%",
"format-plugged": " {capacity}%",
"format-alt": "{time} {icon}",
"format-icons": [
"󰂎",
"󰁺",
"󰁻",
"󰁼",
"󰁽",
"󰁾",
"󰁿",
"󰂀",
"󰂁",
"󰂂",
"󰁹"
]
},
"backlight": {
"format": "{icon} {percent}%",
"format-icons": [
"",
"",
"",
"",
"",
"",
"",
"",
""
],
"on-scroll-up": "brightnessctl s +5%",
"on-scroll-down": "brightnessctl s 5%-"
},
"clock": {
"format": "{:%H:%M}",
"tooltip-format": "<tt><big>{calendar}</big></tt>",
"format-alt": "{:%Y-%m-%d}",
"calendar": {
"mode": "month",
"weeks-pos": "left",
"format": {
"months": "<span color='#d0d3d8'><b>{}</b></span>",
"days": "<span color='#cbced3'><b>{}</b></span>",
"weeks": "<span color='#95d3af'><b>W{}</b></span>",
"weekdays": "<span color='#98d3ee'><b>{}</b></span>",
"today": "<span color='#e26c7c'><b><u>{}</u></b></span>"
}
}
},
"custom/notification": {
"format": "{icon} {0}",
"format-icons": {
"notification": " <span foreground='red'><sup></sup></span>",
"none": " ",
"dnd-notification": " <span foreground='red'><sup></sup></span>",
"dnd-none": " ",
"inhibited-notification": " <span foreground='red'><sup></sup></span>",
"inhibited-none": " ",
"dnd-inhibited-notification": " <span foreground='red'><sup></sup></span>",
"dnd-inhibited-none": " "
},
"return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb",
"on-click": "swaync-client -t -sw",
"on-click-right": "swaync-client -d -sw",
"escape": true
},
"cpu": {
"interval": 1,
"format": " {usage}%",
"tooltip-format": "{usage}"
"interval": 1,
"format": " {usage}%",
"tooltip-format": "{usage}"
},
"memory": {
"interval": 1,
"format": " {}%",
"tooltip-format": "memory: {used:0.1f}/{total:0.1f} GiB \nSWAP: {swapUsed:0.1f}/{swapTotal:0.1f} GiB"
"interval": 1,
"format": " {}%",
"tooltip-format": "memory: {used:0.1f}/{total:0.1f} GiB \nSWAP: {swapUsed:0.1f}/{swapTotal:0.1f} GiB"
},
"custom/ddclight": {
"tooltip": false,
"format": "{icon}",
......@@ -272,4 +250,19 @@
"on-scroll-up": "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",
]
}
}
configs/hyprland/waybar/style-dark.css
View file @ 1479aead
......@@ -19,6 +19,7 @@ window#waybar {
}
.module {
background-color: @bg;
min-height: 0;
border-radius: 20px;
margin: 5px;
......@@ -50,10 +51,6 @@ window#waybar {
padding: 0 10px 0 5px;
}
#image:not(:hover) {
background: transparent
}
#workspaces.icons button {
padding: 0px;
margin: 0px;
......
configs/hyprland/waybar/style.css
View file @ 1479aead
......@@ -19,6 +19,7 @@ window#waybar {
}
.module {
background-color: @bg;
min-height: 0;
border-radius: 20px;
margin: 5px;
......@@ -50,10 +51,6 @@ window#waybar {
padding: 0 10px 0 5px;
}
#image:not(:hover) {
background: transparent
}
#workspaces.icons button {
padding: 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