diff --git a/dot-config/waybar/waybar.css b/dot-config/waybar/waybar.css index 5d4395f..fa965b6 100644 --- a/dot-config/waybar/waybar.css +++ b/dot-config/waybar/waybar.css @@ -1,30 +1,30 @@ @import "mocha.css"; * { - font-family: JetBrainsMono, "Font Awesome 6 Free", SymbolsNerdFont; + font-family: Cantarell, "Font Awesome 6 Free", SymbolsNerdFont; font-weight: bold; font-size: 14px; min-height: 0px; } window#waybar { - background-color: transparent; + background-color: @base; /* background: @base; */ transition-property: background-color; transition-duration: .5s; - border-radius: 14px; + border-radius: 14px 14px 0px 0px; } #workspaces { background-color: @mantle; - margin: 3px 5px 3px 5px; + margin: 4px 5px 4px 5px; padding: 3px; border-radius: 14px; } #workspaces button, #workspaces button:hover, #workspaces button.active { - padding: 0px 3px; + padding: 0px 4px; margin: 2px; border-radius: 10px; } @@ -45,17 +45,17 @@ window#waybar { color: @base; } -#custom-power, #custom-runner, -#wireplumber, #wireplumber.muted, +#custom-power, #custom-runner, #battery, +#backlight, #wireplumber, #wireplumber.muted, #tray, #language, #clock { background: @mantle; border-radius: 14px; color: @text; - margin: 3px 2.5px 3px 2.5px; + margin: 4px 2.5px 4px 2.5px; } #custom-power { - margin: 3px 2.5px 3px 2.5px; + margin: 4px 2.5px 4px 2.5px; padding: 0px 9px; } @@ -63,11 +63,16 @@ window#waybar { padding: 0px 10px; } -#tray { +#battery { padding: 0px 10px; } -#wireplumber, #wireplumber.muted { +#tray { + margin: 4px 2.5px 4px 5px; + padding: 0px 10px; +} + +#backlight, #wireplumber, #wireplumber.muted { padding: 0px 10px; min-width: 55px; } @@ -76,10 +81,11 @@ window#waybar { } #language { - padding: 0px 7px 0px 7px; + padding: 0px 9px 0px 8px; } #clock { padding: 0px 10px; - margin: 3px 5px 3px 2.5px; + margin: 4px 5px 4px 2.5px; + font-size: 15px; } diff --git a/dot-config/waybar/waybar.jsonc b/dot-config/waybar/waybar.jsonc index d18aaa4..6783f38 100644 --- a/dot-config/waybar/waybar.jsonc +++ b/dot-config/waybar/waybar.jsonc @@ -1,57 +1,75 @@ { "position": "bottom", - "height": 31, - "width": 900, + "height": 36, + "width": 900, "spacing": 0, - "margin-bottom": 5, - "layer": "top", - "modules-left": ["custom/power", "custom/runner"], - "modules-center": ["hyprland/workspaces"], - "modules-right": ["tray", "wireplumber", "hyprland/language", "clock"], - + "margin-bottom": 0, + "layer": "top", + "modules-left": ["tray"], + "modules-center": ["hyprland/workspaces"], + "modules-right": ["wireplumber", "hyprland/language", "clock"], + "custom/power": { - "format": "", - "on-click": "~/.config/hypr/bin/powermenu" - }, + "format": "", + "on-click": "~/.config/hypr/bin/powermenu" + }, - "custom/runner": { - "format": "", - "on-click": "~/.config/hypr/bin/runner" - }, + "custom/runner": { + "format": "", + "on-click": "hyprlauncher" + }, - "hyprland/workspaces": { + "hyprland/workspaces": { "format": "{name}", "on-click": "activate", "tooltip": false, - "persistent_workspaces": { - "*": 1 - } + "persistent_workspaces": { + "*": 1 + } }, - "tray": { + "tray": { "icon-size": 14, "spacing": 15 - }, - - "wireplumber": { + }, + + "battery": { + "bat": "qcom-battery", + "interval": 1, + "states": { + "warning": 30, + "critical": 15 + }, + "format": "{icon} {capacity}%", + "format-charging": " {capacity}%", + "format-icons": ["", "", "", "", ""], + "max-length": 25 + }, + + "backlight": { + "device": "ktz8866-backlight", + "format": " {percent}%" + }, + + "wireplumber": { "scroll-step": 2, "format": "{icon} {volume}%", - "format-icons":["", "", ""], - "format-muted": " mute", + "format-icons":["", "", ""], + "format-muted": " mute", "on-click": "pavucontrol", "max-volume": 100 }, "hyprland/language": { - "format": "{}", + "format": " {}", "format-en": "Eng", "format-ru": "Rus" }, "clock": { "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": " {:%Y-%m-%d}", - "format": "{:%H:%M}", - "timezone": "Asia/Yekaterinburg" + "format-alt": "{:%Y-%m-%d}", + "format": "{:%H:%M}", + "timezone": "Asia/Yekaterinburg" } }