diff --git a/dot-config/waybar/waybar.css b/dot-config/waybar/waybar.css
index a90ebd0..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;
}
@@ -51,11 +51,11 @@ window#waybar {
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,7 +63,12 @@ window#waybar {
padding: 0px 10px;
}
-#tray, #battery {
+#battery {
+ padding: 0px 10px;
+}
+
+#tray {
+ margin: 4px 2.5px 4px 5px;
padding: 0px 10px;
}
@@ -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 de184e4..3350b08 100644
--- a/dot-config/waybar/waybar.jsonc
+++ b/dot-config/waybar/waybar.jsonc
@@ -1,11 +1,11 @@
{
"position": "bottom",
- "height": 31,
- "width": 900,
+ "height": 36,
+ // "width": 900,
"spacing": 0,
- "margin-bottom": 5,
+ "margin-bottom": 0,
"layer": "top",
- "modules-left": ["custom/power", "custom/runner", "tray"],
+ "modules-left": ["tray"],
"modules-center": ["hyprland/workspaces"],
"modules-right": ["wireplumber", "backlight", "battery", "hyprland/language", "clock"],
@@ -35,19 +35,20 @@
"battery": {
"bat": "qcom-battery",
- "interval": 60,
+ "interval": 1,
"states": {
"warning": 30,
"critical": 15
},
- "format": "{capacity}% ",
+ "format": "{icon} {capacity}%",
+ "format-charging": " {capacity}%",
+ "format-icons": ["", "", "", "", ""],
"max-length": 25
},
"backlight": {
"device": "ktz8866-backlight",
- "format": "{percent}% ",
- "format-icons": ["", ""]
+ "format": " {percent}%"
},
"wireplumber": {
@@ -60,14 +61,14 @@
},
"hyprland/language": {
- "format": "{}",
+ "format": " {}",
"format-en": "Eng",
"format-ru": "Rus"
},
"clock": {
"tooltip-format": "{:%Y %B}\n{calendar}",
- "format-alt": " {:%Y-%m-%d}",
+ "format-alt": "{:%Y-%m-%d}",
"format": "{:%H:%M}",
"timezone": "Asia/Yekaterinburg"
}