notxia/dotfiles
1
0
Fork 0
mirror of https://github.com/NotXia/dotfiles.git synced 2025-12-14 18:11:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Waybar

Browse Source
This commit is contained in:
Tian Cheng (Riccardo) Xia
2024-07-28 11:21:57 +02:00
parent a184774e77
commit d02c324c60
3 changed files with 108 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.config/hypr/hyprland.conf
View File

@ -18,7 +18,7 @@ exec-once = dbus-update-activation-environment --systemd &
# Wallpaper # Wallpaper
exec-once = hyprpaper exec-once = hyprpaper
exec-once = hypridle & exec-once = hypridle &
exec-once = waybar -c .config/waybar/config-hypr & exec-once = waybar -c ~/.config/waybar/config &
exec-once = fcitx5 -d & exec-once = fcitx5 -d &
exec-once = mako & exec-once = mako &
exec-once = bash -c "mkfifo /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob && tail -f /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob | wob & disown" & exec-once = bash -c "mkfifo /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob && tail -f /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob | wob & disown" &

86
.config/waybar/config-hypr → .config/waybar/config
View File

@ -6,23 +6,22 @@
"margin-bottom": 0, "margin-bottom": 0,
"margin-right": 3, "margin-right": 3,
"spacing": 1, "spacing": 0,
"modules-left": [ "modules-left": [
"hyprland/workspaces", "hyprland/workspaces",
"custom/screenshot_t", "custom/screenshot_t",
"idle_inhibitor" "idle_inhibitor",
"tray"
], ],
"modules-right": [ "modules-right": [
"cpu",
"memory",
"network", "network",
"bluetooth", "bluetooth",
"memory",
"cpu",
"pulseaudio", "pulseaudio",
"battery", "battery",
"clock", "clock"
// "custom/power",
"tray"
], ],
@ -38,16 +37,16 @@
"cpu": { "cpu": {
"interval": 3, "interval": 3,
"format": "<span rise='1000'></span> {usage}%", "format": "{usage}% <span rise='1000'></span>",
"max-length": 7, "max-length": 6,
"min-length": 7 "min-length": 6
}, },
"memory": { "memory": {
"interval": 3, "interval": 3,
"format": "<span rise='1000'></span> {used:0.2f}GB", "format": "{used:0.2f}GB <span rise='1000'></span>",
"max-length": 12, "max-length": 9,
"min-length": 12 "min-length": 9
}, },
"battery": { "battery": {
@ -57,9 +56,9 @@
"warning": 30, "warning": 30,
"critical": 15 "critical": 15
}, },
"format": "<span rise='1000'>{icon}</span> {capacity}%", "format": "{capacity}% <span rise='1000'>{icon}</span>",
"format-charging": "{capacity}%", "format-charging": "{capacity}% <span rise='1000'></span>",
"format-plugged": "{capacity}%", "format-plugged": "{capacity}% <span rise='1000'></span>",
"format-icons": [ "format-icons": [
"", "",
"", "",
@ -70,22 +69,21 @@
}, },
"network": { "network": {
"format-wifi": "<span rise='1000'></span> {signalStrength}% <span rise='1000'>|</span> <span rise='1000'></span> {bandwidthUpBytes} <span rise='1000'></span> {bandwidthDownBytes}", "format-wifi": "<span rise='1000'></span> {signalStrength}% <span rise='1000'>|</span> {bandwidthUpBytes:>3} <span rise='1000'>󰇚</span> {bandwidthDownBytes:>3} <span rise='1000'>󰕒</span>",
"format-ethernet": "{ifname} <span rise='1000'>|</span> <span rise='1000'></span> {bandwidthUpBytes} <span rise='1000'></span> {bandwidthDownBytes}", "format-ethernet": "{ifname} <span rise='1000'>|</span> {bandwidthUpBytes:>3} <span rise='1000'>󰇚</span> {bandwidthDownBytes:>3} <span rise='1000'>󰕒</span>",
"format-linked": "{ifname} No IP", "format-linked": "{ifname} No IP",
"format": "", "format": "",
"format-disconnected": "¯\\_(ツ)_/¯", "format-disconnected": "¯\\_(ツ)_/¯",
"on-click": "alacritty -e 'nmtui'", "on-click": "alacritty -e 'nmtui'",
"tooltip-format": "{ifname}\n{ipaddr}/{cidr}", "tooltip-format": "{ifname}\n{ipaddr}/{cidr}",
"tooltip-format-wifi": "{essid} {frequency}MHz\nStrength: {signaldBm}dBm ({signalStrength}%)\nIP: {ipaddr}/{cidr}", "tooltip-format-wifi": "{essid} {frequency}MHz\nStrength: {signaldBm}dBm ({signalStrength}%)\nIP: {ipaddr}/{cidr}",
"interval": 3, "interval": 3
"min-length": 32
}, },
"bluetooth": { "bluetooth": {
"format-disabled": "<span rise='1200'></span> off", "format-disabled": "off <span rise='1200'></span>",
"format-off": "<span rise='1200'></span> off", "format-off": "off <span rise='1200'></span>",
"format-on": "<span rise='1200'></span> on", "format-on": "on <span rise='1200'></span>",
"interval": 3, "interval": 3,
"on-click": "blueman-manager" "on-click": "blueman-manager"
}, },
@ -99,14 +97,8 @@
"tooltip": "true" "tooltip": "true"
}, },
"custom/power": {
"format": "",
"tooltip": false,
"on-click": "wlogout"
},
"clock": { "clock": {
"format": "<span rise='1500'> </span> {:%d %b %Y <span rise='1000'>|</span> <span rise='800'></span> %H:%M}", "format": "{:%d %b %Y <span rise='1000'>|</span> %H:%M}",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>" "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
}, },
@ -131,17 +123,12 @@
"active-only": false "active-only": false
}, },
"hyprland/window": {
"max-length": 100,
"separate-outputs": true
},
"pulseaudio": { "pulseaudio": {
"scroll-step": 2, // %, can be a float "scroll-step": 2,
"format": "<span rise='1000'>{icon}</span> {volume}% <span rise='1000'>|</span> <span rise='1000'>{format_source}</span>", "format": "{volume}% <span rise='1000'>{icon} | {format_source}</span>",
"format-bluetooth": "{volume}% {icon} <span rise='1000'>|</span> <span rise='1000'>{format_source}</span>", "format-bluetooth": "{volume}% {icon} <span rise='1000'>|</span> <span rise='1000'>{format_source}</span>",
"format-bluetooth-muted": " {icon} <span rise='1000'>|</span> <span rise='1000'>{format_source}</span>", "format-bluetooth-muted": " {icon} <span rise='1000'>|</span> <span rise='1000'>{format_source}</span>",
"format-muted": "<span rise='1000'></span> <span rise='1000'>|</span> <span rise='1000'>{format_source}</span>", "format-muted": "<span rise='1000'>󰖁</span> <span rise='1000'>|</span> <span rise='1000'>{format_source}</span>",
//"format-source": "{volume}% ", //"format-source": "{volume}% ",
//"format-source-muted": "", //"format-source-muted": "",
"format-source": "", "format-source": "",
@ -159,29 +146,6 @@
"on-click-right": "amixer sset Master toggle" "on-click-right": "amixer sset Master toggle"
}, },
"wireplumber": {
"on-click": "pavucontrol",
"on-click-right": "amixer sset Master toggle 1>/dev/null",
//on-click: "${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle";
//on-scroll-down: "${wpctl} set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 0.04+";
//on-scroll-up: "${wpctl} set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 0.04-";
"format": "<span foreground='#fab387'>{icon}</span> {volume}%",
"format-muted": " ",
"format-source": "",
"format-source-muted": "",
//"format-muted": "<span foreground='#fab387'> </span>",
//"format-icons": [ "<span foreground='#fab387'></span>" ]
"format-icons": {
"headphone": " ",
"hands-free": " ",
"headset": " ",
"phone": " ",
"portable": " ",
"car": " ",
"default": [" ", " ", " "]
}
},
"tray": { "tray": {
"icon-size": 15, "icon-size": 15,
"spacing": 5 "spacing": 5

199
.config/waybar/style.css
View File

@ -1,61 +1,18 @@
* { * {
font-family: "Mono"; font-family: "Mono";
font-size: 9pt; font-size: 9pt;
font-weight: 600; font-weight: 600;
padding: 0; margin: 0.2em 0 0.2em 0;
transition-property: background-color; padding: 0;
transition-duration: 0.5s;
border: none;
border-radius: 3px;
min-height: 0;
margin: 0.2em 0.2em 0.2em 0.2em;
} }
/* The whole bar */
#waybar { #waybar {
/*background: @bg;*/
background-color: transparent; background-color: transparent;
/*color: @light;*/
color: #ffffff; color: #ffffff;
transition-property: background-color;
transition-duration: 0.5s;
/*border-top: 8px transparent;*/
border-radius: 0px;
margin: 0px 0px;
} }
window#waybar.hidden {
opacity: 0.2;
}
#workspaces button {
padding: 0 0px;
color: #7984a4;
background-color: transparent;
box-shadow: inset 0 -3px transparent;
border: none;
border-radius: 0;
}
#workspaces button.focused {
background-color: transparent;
}
#workspace button.hover {
background-color: transparent;
}
#workspaces button.active {
color: #fff;
}
#workspaces button.urgent {
background-color: #eb4d4b;
}
#window {
color: #64727d;
}
/* Each module */
#clock, #clock,
#battery, #battery,
#cpu, #cpu,
@ -72,122 +29,130 @@ window#waybar.hidden {
#custom-hyprPicker, #custom-hyprPicker,
#custom-power-menu, #custom-power-menu,
#custom-power { #custom-power {
padding: 0px 15px; padding-right: 15px;
color: #e5e5e5; padding-left: 15px;
/* color: #bf616a; */ background-color: #1e1e1e;
border-radius: 20px;
background-color: #1e1e1e;
} }
#window,
#workspaces { .modules-right > widget:last-child > * {
border-radius: 20px; border-top-right-radius: 15px;
padding: 0px 10px; border-bottom-right-radius: 15px;
background-color: #1e1e1e;
} }
.modules-right > widget:first-child > * {
border-top-left-radius: 15px;
border-bottom-left-radius: 15px;
}
.modules-left > widget > * {
border-radius: 20px;
margin-left: 0.2em;
margin-right: 0.2em;
}
#workspaces {
border-radius: 20px;
padding: 0px 10px;
background-color: #1e1e1e;
}
#workspaces button {
color: #7984a4;
background-color: transparent;
}
#workspaces button.focused {
background-color: transparent;
}
#workspace button.hover {
background-color: transparent;
}
#workspaces button.active {
color: #ffffff;
}
#workspaces button.urgent {
background-color: #eb4d4b;
}
#cpu { #cpu {
color: #fb958b; color: #fb958b;
background-color: #1e1e1e;
} }
#memory { #memory {
color: #ebcb8b; color: #ebcb8b;
background-color: #1e1e1e;
} }
#custom-power-menu {
border-radius: 9.5px;
background-color: #1b242b;
border-radius: 7.5px;
padding: 0 0px;
}
#custom-launcher {
background-color: #1b242b;
color: #6a92d7;
border-radius: 7.5px;
padding: 0 0px;
}
/* If workspaces is the leftmost module, omit left margin */
.modules-left > widget:first-child > #workspaces {
margin-left: 0;
}
/* If workspaces is the rightmost module, omit right margin */
.modules-right > widget:last-child > #workspaces {
margin-right: 0;
}
#pulseaudio { #pulseaudio {
color: #7d9bba; color: #629e67;
} }
#clock { #clock {
color: #c8d2e0; color: #c8d2e0;
} }
#battery { #battery {
color: #c0caf5; color: #c0caf5;
} }
#battery.charging, #battery.charging,
#battery.full, #battery.full,
#battery.plugged { #battery.plugged {
color: #26a65b; color: #26a65b;
} }
@keyframes blink { @keyframes blink {
to { to {
background-color: rgba(30, 34, 42, 0.5); background-color: rgba(30, 34, 42, 0.5);
color: #abb2bf; color: #abb2bf;
} }
} }
#battery.critical:not(.charging) { #battery.critical:not(.charging) {
color: #f53c3c; color: #f53c3c;
animation-name: blink; animation-name: blink;
animation-duration: 0.5s; animation-duration: 0.5s;
animation-timing-function: linear; animation-timing-function: linear;
animation-iteration-count: infinite; animation-iteration-count: infinite;
animation-direction: alternate; animation-direction: alternate;
} }
label:focus { label:focus {
background-color: #000000; background-color: #000000;
} }
#bluetooth { #bluetooth {
color: #707d9d; color: #707d9d;
} }
/* #bluetooth.disconnected {
color: #f53c3c;
} */
#network { #network {
color: #b48ead; color: #b48ead;
} }
/* #network.disconnected {
color: #f53c3c;
} */
#tray > .passive { #tray > .passive {
-gtk-icon-effect: dim; -gtk-icon-effect: dim;
} }
#tray > .needs-attention { #tray > .needs-attention {
-gtk-icon-effect: highlight; -gtk-icon-effect: highlight;
background-color: #eb4d4b; background-color: #eb4d4b;
} }
/* #idle_inhibitor {
background-color: #2d3436;
} */
#idle_inhibitor.activated { #idle_inhibitor.activated {
background-color: #ecf0f1; background-color: #ffffff;
color: #2d3436; color: #2d3436;
} }