Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some minor waybar fixes and enhancements #1469

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
5 changes: 3 additions & 2 deletions Configs/.config/waybar/modules/backlight.jsonc
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"backlight": {
"device": "intel_backlight",
"rotate": ${r_deg},
"format": "{icon} {percent}%",
"format-icons": ["", "", "", "", "", "", "", "", ""],
"format": "<span size='125%'>{icon}</span><span font_weight='ultrabold'>{percent}%</span>",
"format-tooltip": "Scroll up/down to change brightness",
"format-icons": [" ", " ", "󰪞 ", "󰪟 ", "󰪠 ", "󰪡 ", "󰪢 ", "󰪣 ", "󰪤 ", "󱨧 ", "󰪥 "],
"on-scroll-up": "brightnessctl set 1%+",
"on-scroll-down": "brightnessctl set 1%-",
"min-length": 6
Expand Down
26 changes: 14 additions & 12 deletions Configs/.config/waybar/modules/battery.jsonc
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
"battery": {
"states": {
"good": 95,
"warning": 30,
"critical": 20
},
"format": "{icon} {capacity}%",
"rotate": ${r_deg},
"format-charging": " {capacity}%",
"format-plugged": " {capacity}%",
"format-alt": "{time} {icon}",
"format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"]
"battery": {
"states": {
"good": 95,
"warning": 30,
"critical": 20
},
// "format": "<span color='#1793d1' size='125%'>{icon}</span> <span font_weight='ultrabold'>{capacity}%</span>",
"format": "<span size='125%'>{icon}</span> <span font_weight='ultrabold'>{capacity}%</span>",
"rotate": ${r_deg},
"interval": 1,
"format-charging": "<span color='#00FFAB' size='130%'>󰂄</span> {capacity}%",
"format-plugged": " {capacity}%",
"format-alt": "{time} {icon}",
"format-icons": ["<span color='#FF8080'>󰂃</span>", "<span color='#FF8080'>󰁺</span>", "<span color='#FF8080'>󰁻</span>", "<span color=#F6F193'>󰁼</span>", "<span color='#F6F193'>󰁽</span>", "<span color='#F6F193'>󰁾</span>", "<span color='#9DDE8B'>󰁿</span>", "<span color='#9DDE8B'>󰂀</span>", "<span color='#40A578'>󰂁</span>", "<span color='#40A578'>󰂂</span>", "<span color='#40A2E3'>󰁹</span>"]
},

2 changes: 1 addition & 1 deletion Configs/.config/waybar/modules/cliphist.jsonc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"custom/cliphist": {
"format": "{}",
"format": "<span rise='-13.5pt' size='125%'></span>{}",
"rotate": ${r_deg},
"exec": "echo ; echo 󰅇 clipboard history",
"on-click": "sleep 0.1 && cliphist.sh c",
Expand Down
5 changes: 3 additions & 2 deletions Configs/.config/waybar/modules/clock.jsonc
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
"clock": {
"format": "{:%I:%M %p}",
"format": "<span rise='1pt'>{:%I:%M %p}</span>",
"rotate": ${r_deg},
"format-alt": "{:%R 󰃭 %d·%m·%y}",
"interval": 1,
"format-alt": "{:%R:%S 󰃭 %d·%m·%y}",
"tooltip-format": "<tt>{calendar}</tt>",
"calendar": {
"mode": "month",
Expand Down
20 changes: 14 additions & 6 deletions Configs/.config/waybar/modules/cpu.jsonc
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
"cpu": {
"interval": 10,
"format": "󰍛 {usage}%",
"rotate": ${r_deg},
"format-alt": "{icon0}{icon1}{icon2}{icon3}",
"format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
"cpu": {
"states": {
"c": 90, //critical
"h": 60, // high
"m": 30, // medium
},
"interval": 5,
"format": "<span size='125%'></span> {usage}% 󰇙",
"rotate": ${r_deg},
"format-m": "<span color='light green' size='125%'></span> <span color='light green'>{usage}% </span>󰇙",
"format-h": "<span color='#FFFD37' size='125%'></span> <span color='#FFFD37'>{usage}% </span>󰇙",
"format-c": "<span color='#e32526' size='125%'></span> <span color='#e32526'>{usage}% </span>󰇙",
"format-alt": "{icon0}{icon1}{icon2}{icon3}",
"format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"]
},

6 changes: 3 additions & 3 deletions Configs/.config/waybar/modules/idle_inhibitor.jsonc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
"idle_inhibitor": {
"format": "{icon}",
"format": "<span size='155%'>{icon}</span>",
"rotate": ${r_deg},
"format-icons": {
"activated": "󰥔",
"deactivated": ""
"activated": "󰥔 ",
"deactivated": "󱑎 "
}
},

2 changes: 1 addition & 1 deletion Configs/.config/waybar/modules/keybindhint.jsonc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"custom/keybindhint": {
"format": "",
"format": "<span size='130%'> </span>",
"rotate": ${r_deg},
"on-click": "keybinds_hint.sh"
},
Expand Down
32 changes: 16 additions & 16 deletions Configs/.config/waybar/modules/memory.jsonc
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
"memory": {
"states": {
"c": 90, // critical
"h": 60, // high
"m": 30, // medium
},
"interval": 30,
"format": "󰾆 {used}GB",
"rotate": ${r_deg},
"format-m": "󰾅 {used}GB",
"format-h": "󰓅 {used}GB",
"format-c": " {used}GB",
"format-alt": "󰾆 {percentage}%",
"max-length": 10,
"tooltip": true,
"tooltip-format": "󰾆 {percentage}%\n {used:0.1f}GB/{total:0.1f}GB"
"memory": {
"states": {
"c": 90, // critical
"h": 60, // high
"m": 30, // medium
},
"interval": 1,
"format": "<span size='125%'>󰾆</span> {used}GB",
"rotate": ${r_deg},
"format-m": "<span color='light green' size='125%'>󰾅</span> <span color='light green'>{used}GB</span>",
"format-h": "<span color='#FFFD37' size='125%'>󰓅</span> <span color='#FFFD37'>{used}GB</span>",
"format-c": "<span color='#e32526' size='125%'></span> <span color='#e32526'>{used}GB</span>",
"format-alt": "<span size='125%'>󰾆</span> {percentage}%",
"max-length": 10,
"tooltip": true,
"tooltip-format": "󰾆 {percentage}%\n {used:0.1f}GB/{total:0.1f}GB"
},

4 changes: 2 additions & 2 deletions Configs/.config/waybar/modules/mpris.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
"rotate": ${r_deg},
"format-paused": "{status_icon} <i>{dynamic}</i>",
"player-icons": {
"default": "",
"default": "<span rise='1.5pt'>▶</span>",
"mpv": "🎵"
},
"status-icons": {
"paused": ""
"paused": "<span size='125%'>⏸</span>"
},
// "ignored-players": ["firefox"]
"max-length": 1000,
Expand Down
24 changes: 12 additions & 12 deletions Configs/.config/waybar/modules/network.jsonc
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
"network": {
"tooltip": true,
"format-wifi": " ",
"rotate": ${r_deg},
"format-ethernet": "󰈀 ",
"tooltip-format": "Network: <big><b>{essid}</b></big>\nSignal strength: <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency: <b>{frequency}MHz</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>",
"format-linked": "󰈀 {ifname} (No IP)",
"format-disconnected": "󰖪 ",
"tooltip-format-disconnected": "Disconnected",
"format-alt": "<span foreground='#99ffdd'> {bandwidthDownBytes}</span> <span foreground='#ffcc66'> {bandwidthUpBytes}</span>",
"interval": 2,
},
"network": {
"tooltip": true,
"format-wifi": "<span size='115%'></span> ",
"rotate": ${r_deg},
"format-ethernet": "<span rise='-1pt' size='125%'>󰈀</span> ",
"tooltip-format": "Network: <big><b>{essid}</b></big>\nSignal strength: <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency: <b>{frequency}MHz</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>",
"format-linked": "<span rise='-13pt' size='125%'>󰈀</span> {ifname} (No IP)",
"format-disconnected": "<span size='115%'>󰖪</span> ",
"tooltip-format-disconnected": "Disconnected",
"format-alt": "<span foreground='#99ffdd'> {bandwidthDownBytes}</span> <span foreground='#ffcc66'> {bandwidthUpBytes}</span>",
"interval": 1,
},

2 changes: 1 addition & 1 deletion Configs/.config/waybar/modules/power.jsonc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"custom/power": {
"format": "{}",
"format": "<span rise='-11pt' size='125%'></span>{}",
"rotate": ${r_deg},
"exec": "echo ; echo  logout",
"on-click": "logoutlaunch.sh 2",
Expand Down
73 changes: 39 additions & 34 deletions Configs/.config/waybar/modules/pulseaudio.jsonc
Original file line number Diff line number Diff line change
@@ -1,34 +1,39 @@
"pulseaudio": {
"format": "{icon} {volume}",
"rotate": ${r_deg},
"format-muted": "婢",
"on-click": "pavucontrol -t 3",
"on-click-middle": "volumecontrol.sh -o m",
"on-scroll-up": "volumecontrol.sh -o i",
"on-scroll-down": "volumecontrol.sh -o d",
"tooltip-format": "{icon} {desc} // {volume}%",
"scroll-step": 5,
"format-icons": {
"headphone": "",
"hands-free": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": ["", "", ""]
}
},

"pulseaudio#microphone": {
"format": "{format_source}",
"rotate": ${r_deg},
"format-source": "",
"format-source-muted": "",
"on-click": "pavucontrol -t 4",
"on-click-middle": "volumecontrol.sh -i m",
"on-scroll-up": "volumecontrol.sh -i i",
"on-scroll-down": "volumecontrol.sh -i d",
"tooltip-format": "{format_source} {source_desc} // {source_volume}%",
"scroll-step": 5
},

"pulseaudio": {
"format": "{icon} {volume}%",
"rotate": ${r_deg
},
"format-muted": "<span rise='-15pt' size='150%'>󰖁</span>",
"on-click": "pavucontrol -t 3",
"on-click-right": "volumecontrol.sh -s ''",
"on-click-middle": "volumecontrol.sh -o m",
"on-scroll-up": "volumecontrol.sh -o i",
"on-scroll-down": "volumecontrol.sh -o d",
"tooltip-format": "{desc} // {volume}%",
"scroll-step": 5,
"format-icons": {
"headphone": "<span size='125%'> </span>",
"hands-free": "<span size='125%'> </span>",
"headset": "<span size='125%'> </span>",
"phone": "<span size='125%'> </span>",
"portable": "<span size='125%'> </span>",
"car": "<span size='125%'> </span>",
"default": [
"<span size='125%'> </span>",
"<span size='125%'></span>",
"<span size='125%'></span>"
]
}
},
"pulseaudio#microphone": {
"format": "{format_source}",
"rotate": ${r_deg
},
"format-source": "<span size='115%'> </span>",
"format-source-muted": "<span size='115%'> </span>",
"on-click": "pavucontrol -t 4",
"on-click-middle": "volumecontrol.sh -i m",
"on-scroll-up": "volumecontrol.sh -i i",
"on-scroll-down": "volumecontrol.sh -i d",
"tooltip-format": "{source_desc} // {source_volume}%",
"scroll-step": 5
},
2 changes: 1 addition & 1 deletion Configs/.config/waybar/modules/spotify.jsonc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"custom/spotify": {
"exec": "mediaplayer.py --player spotify",
"format": " {}",
"format": "<span color='#1db954' size='155%'> </span> {}",
"rotate": ${r_deg},
"return-type": "json",
"on-click": "playerctl play-pause --player spotify",
Expand Down
6 changes: 4 additions & 2 deletions Configs/.config/waybar/modules/style.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
* {
border: none;
border-radius: 0px;
font-family: "JetBrainsMono Nerd Font";
font-family: "Noto Sans, Symbols Nerd Font";
font-weight: bold;
font-size: ${s_fontpx}px;
min-height: 10px;
min-height: 13px;
}

@import "theme.css";
Expand Down Expand Up @@ -105,6 +105,8 @@ ${modules_ls}
background: @main-bg;
opacity: 1;
margin: ${x1g_margin}px ${x2g_margin}px ${x3g_margin}px ${x4g_margin}px;
padding-${x1}: ${g_paddin}px;
padding-${x2}: ${g_paddin}px;
padding-${x3}: ${g_paddin}px;
padding-${x4}: ${g_paddin}px;
}
Expand Down
2 changes: 1 addition & 1 deletion Configs/.config/waybar/modules/theme.jsonc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"custom/theme": {
"format": "{}",
"format": "<span rise='-13.5pt' size='125%'></span>{}",
"rotate": ${r_deg},
"exec": "echo ; echo 󰟡 switch theme",
"on-click": "themeswitch.sh -n",
Expand Down
2 changes: 1 addition & 1 deletion Configs/.config/waybar/modules/wallchange.jsonc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"custom/wallchange": {
"format": "{}",
"format": "<span rise='-13.5pt' size='125%'>󰸉</span>{}",
"rotate": ${r_deg},
"exec": "echo ; echo 󰆊 switch wallpaper",
"on-click": "swwwallpaper.sh -n",
Expand Down
2 changes: 1 addition & 1 deletion Configs/.config/waybar/modules/wbar.jsonc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"custom/wbar": {
"format": "{}", //   //
"format": "<span rise='-13.5pt' size='125%'></span>{}", //   //
"rotate": ${r_deg},
"exec": "echo ; echo  switch bar //  dock",
"on-click": "wbarconfgen.sh n",
Expand Down
30 changes: 15 additions & 15 deletions Configs/.config/waybar/modules/window.jsonc
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
"hyprland/window": {
"format": "  {}",
"rotate": ${r_deg},
"separate-outputs": true,
"rewrite": {
"${USER}@${set_sysname}:(.*)": "$1 ",
"(.*) — Mozilla Firefox": "$1 󰈹",
"(.*)Mozilla Firefox": "Firefox 󰈹",
"(.*) - Visual Studio Code": "$1 󰨞",
"(.*)Visual Studio Code": "Code 󰨞",
"(.*) — Dolphin": "$1 󰉋",
"(.*)Spotify": "Spotify 󰓇",
"(.*)Steam": "Steam 󰓓"
},
"max-length": 1000
"hyprland/window": {
"format": " <span color='#1793d1' size='125%'></span> <span rise='.5pt' size='115%'>{}</span>",
"rotate": ${r_deg},
"separate-outputs": true,
"rewrite": {
"${USER}@${set_sysname}:(.*)": "$1 <span color='light green' size='125%'></span>",
"(.*) — Mozilla Firefox": "$1 <span color='#ee8424' size='125%'>󰈹</span>",
"(.*)Mozilla Firefox": "Firefox <span color='#ee8424' size='125%'>󰈹</span>",
"(.*) - Visual Studio Code": "$1 <span color='#0078d7' size='125%'>󰨞</span>",
"(.*)Visual Studio Code": "Code <span color='#0078d7' size='125%'>󰨞</span>",
"(.*) — Dolphin": "$1 <span color='#0078d7' size=125%>󰉋</span>",
"(.*)Spotify": "Spotify <span size='125%>'󰓇</span>",
"(.*)Steam": "Steam <span size='125%'>󰓓</span>"
},
"max-length": 1000
},

2 changes: 1 addition & 1 deletion Configs/.config/waybar/modules/workspaces.jsonc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"hyprland/workspaces": {
"disable-scroll": true,
// "disable-scroll": true,
"rotate": ${r_deg},
"all-outputs": true,
"active-only": false,
Expand Down
6 changes: 3 additions & 3 deletions Configs/.local/share/bin/systemupdate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ upd=$(( ofc + aur + fpk ))

# Show tooltip
if [ $upd -eq 0 ] ; then
upd="" #Remove Icon completely
# upd="󰮯" #If zero Display Icon only
# upd="" #Remove Icon completely
upd="<span color='#FFD966' size='125%'>󰮯</span>" #If zero Display Icon only
echo "{\"text\":\"$upd\", \"tooltip\":\" Packages are up to date\"}"
else
echo "{\"text\":\"󰮯 $upd\", \"tooltip\":\"󱓽 Official $ofc\n󱓾 AUR $aur$fpk_disp\"}"
echo "{\"text\":\"<span color='#FFD966' size='125%'>󰮯</span> <span font_size='125%' font_weight='ultrabold'>$upd</span><span size='115%'>⇡</span>\", \"tooltip\":\"󱓽 Official $ofc\n󱓾 AUR $aur$fpk_disp\"}"
fi
Binary file added Source/arcs/SymbolsNerdFont.tar.gz
Binary file not shown.