Merge branch 'upstream-custom' into dev

This commit is contained in:
Yingjie Wang 2024-05-26 02:54:37 -04:00
commit 1f63a28eeb
2 changed files with 22 additions and 6 deletions

View File

@ -246,21 +246,27 @@
// END CLOCK FORMAT // END CLOCK FORMAT
}, },
// System // spacer
"custom/system": { "custom/spacer": {
"format": "", "format": " ",
"tooltip": false
},
// div
"custom/div": {
"format": " | ",
"tooltip": false "tooltip": false
}, },
// CPU // CPU
"cpu": { "cpu": {
"format": "󰒇 {usage}%", "format": "󰒇 {usage}% ",
"on-click": "alacritty -e htop" "on-click": "alacritty -e htop"
}, },
// Memory // Memory
"memory": { "memory": {
"format": " {used:0.1f}G", "format": " {used:0.1f}G ",
"on-click": "alacritty -e htop" "on-click": "alacritty -e htop"
}, },
@ -281,7 +287,9 @@
"orientation": "inherit", "orientation": "inherit",
"modules": [ "modules": [
"cpu", "cpu",
"div",
"memory", "memory",
"div",
"network" "network"
] ]
}, },

View File

@ -295,7 +295,15 @@ window#waybar.empty #window {
opacity:0.8; opacity:0.8;
} */ } */
#groups #hardware {
background-color: @backgroundlight;
font-size: 16px;
color: @textcolor2;
border-radius: 15px;
padding: 2px 10px 0px 10px;
margin: 8px 10px 8px 0px;
opacity:0.8;
}
#language { #language {
margin-right:10px; margin-right:10px;