diff --git a/Configs/.config/waybar/modules/backlight.jsonc b/Configs/.config/waybar/modules/backlight.jsonc index b289e6866..4adf4e174 100644 --- a/Configs/.config/waybar/modules/backlight.jsonc +++ b/Configs/.config/waybar/modules/backlight.jsonc @@ -1,8 +1,9 @@ "backlight": { "device": "intel_backlight", "rotate": ${r_deg}, - "format": "{icon} {percent}%", - "format-icons": ["", "", "", "", "", "", "", "", ""], + "format": "{icon}{percent}%", + "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 diff --git a/Configs/.config/waybar/modules/battery.jsonc b/Configs/.config/waybar/modules/battery.jsonc index 51d64828b..c3d95d687 100644 --- a/Configs/.config/waybar/modules/battery.jsonc +++ b/Configs/.config/waybar/modules/battery.jsonc @@ -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": "{icon} {capacity}%", + "format": "{icon} {capacity}%", + "rotate": ${r_deg}, + "interval": 1, + "format-charging": "󰂄 {capacity}%", + "format-plugged": " {capacity}%", + "format-alt": "{time} {icon}", + "format-icons": ["󰂃", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"] +}, diff --git a/Configs/.config/waybar/modules/cliphist.jsonc b/Configs/.config/waybar/modules/cliphist.jsonc index 02024facf..e0b18df64 100644 --- a/Configs/.config/waybar/modules/cliphist.jsonc +++ b/Configs/.config/waybar/modules/cliphist.jsonc @@ -1,5 +1,5 @@ "custom/cliphist": { - "format": "{}", + "format": "{}", "rotate": ${r_deg}, "exec": "echo ; echo 󰅇 clipboard history", "on-click": "sleep 0.1 && cliphist.sh c", diff --git a/Configs/.config/waybar/modules/clock.jsonc b/Configs/.config/waybar/modules/clock.jsonc index fd8bdc3fa..211bd2777 100644 --- a/Configs/.config/waybar/modules/clock.jsonc +++ b/Configs/.config/waybar/modules/clock.jsonc @@ -1,7 +1,8 @@ "clock": { - "format": "{:%I:%M %p}", + "format": "{:%I:%M %p}", "rotate": ${r_deg}, - "format-alt": "{:%R 󰃭 %d·%m·%y}", + "interval": 1, + "format-alt": "{:%R:%S 󰃭 %d·%m·%y}", "tooltip-format": "{calendar}", "calendar": { "mode": "month", diff --git a/Configs/.config/waybar/modules/cpu.jsonc b/Configs/.config/waybar/modules/cpu.jsonc index cc89cb082..969e866eb 100644 --- a/Configs/.config/waybar/modules/cpu.jsonc +++ b/Configs/.config/waybar/modules/cpu.jsonc @@ -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": " {usage}% 󰇙", + "rotate": ${r_deg}, + "format-m": " {usage}% 󰇙", + "format-h": " {usage}% 󰇙", + "format-c": " {usage}% 󰇙", + "format-alt": "{icon0}{icon1}{icon2}{icon3}", + "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"] +}, diff --git a/Configs/.config/waybar/modules/idle_inhibitor.jsonc b/Configs/.config/waybar/modules/idle_inhibitor.jsonc index d109a95a9..ca1675729 100644 --- a/Configs/.config/waybar/modules/idle_inhibitor.jsonc +++ b/Configs/.config/waybar/modules/idle_inhibitor.jsonc @@ -1,9 +1,9 @@ "idle_inhibitor": { - "format": "{icon}", + "format": "{icon}", "rotate": ${r_deg}, "format-icons": { - "activated": "󰥔", - "deactivated": "" + "activated": "󰥔 ", + "deactivated": "󱑎 " } }, diff --git a/Configs/.config/waybar/modules/keybindhint.jsonc b/Configs/.config/waybar/modules/keybindhint.jsonc index e9edd2196..71aef1be5 100644 --- a/Configs/.config/waybar/modules/keybindhint.jsonc +++ b/Configs/.config/waybar/modules/keybindhint.jsonc @@ -1,5 +1,5 @@ "custom/keybindhint": { - "format": " ", + "format": "", "rotate": ${r_deg}, "on-click": "keybinds_hint.sh" }, diff --git a/Configs/.config/waybar/modules/memory.jsonc b/Configs/.config/waybar/modules/memory.jsonc index 1e2c8d85a..81a663faf 100644 --- a/Configs/.config/waybar/modules/memory.jsonc +++ b/Configs/.config/waybar/modules/memory.jsonc @@ -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": "󰾆 {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" +}, diff --git a/Configs/.config/waybar/modules/mpris.jsonc b/Configs/.config/waybar/modules/mpris.jsonc index 1b155699e..b895fb3cb 100644 --- a/Configs/.config/waybar/modules/mpris.jsonc +++ b/Configs/.config/waybar/modules/mpris.jsonc @@ -3,11 +3,11 @@ "rotate": ${r_deg}, "format-paused": "{status_icon} {dynamic}", "player-icons": { - "default": "▶", + "default": "", "mpv": "🎵" }, "status-icons": { - "paused": "⏸" + "paused": "" }, // "ignored-players": ["firefox"] "max-length": 1000, diff --git a/Configs/.config/waybar/modules/network.jsonc b/Configs/.config/waybar/modules/network.jsonc index 1c5231dbb..f5fa0778d 100644 --- a/Configs/.config/waybar/modules/network.jsonc +++ b/Configs/.config/waybar/modules/network.jsonc @@ -1,13 +1,13 @@ - "network": { - "tooltip": true, - "format-wifi": " ", - "rotate": ${r_deg}, - "format-ethernet": "󰈀 ", - "tooltip-format": "Network: {essid}\nSignal strength: {signaldBm}dBm ({signalStrength}%)\nFrequency: {frequency}MHz\nInterface: {ifname}\nIP: {ipaddr}/{cidr}\nGateway: {gwaddr}\nNetmask: {netmask}", - "format-linked": "󰈀 {ifname} (No IP)", - "format-disconnected": "󰖪 ", - "tooltip-format-disconnected": "Disconnected", - "format-alt": " {bandwidthDownBytes}  {bandwidthUpBytes}", - "interval": 2, - }, +"network": { + "tooltip": true, + "format-wifi": " ", + "rotate": ${r_deg}, + "format-ethernet": "󰈀 ", + "tooltip-format": "Network: {essid}\nSignal strength: {signaldBm}dBm ({signalStrength}%)\nFrequency: {frequency}MHz\nInterface: {ifname}\nIP: {ipaddr}/{cidr}\nGateway: {gwaddr}\nNetmask: {netmask}", + "format-linked": "󰈀 {ifname} (No IP)", + "format-disconnected": "󰖪 ", + "tooltip-format-disconnected": "Disconnected", + "format-alt": " {bandwidthDownBytes}  {bandwidthUpBytes}", + "interval": 1, +}, diff --git a/Configs/.config/waybar/modules/power.jsonc b/Configs/.config/waybar/modules/power.jsonc index a41eaf64e..043df5c94 100644 --- a/Configs/.config/waybar/modules/power.jsonc +++ b/Configs/.config/waybar/modules/power.jsonc @@ -1,5 +1,5 @@ "custom/power": { - "format": "{}", + "format": "{}", "rotate": ${r_deg}, "exec": "echo ; echo  logout", "on-click": "logoutlaunch.sh 2", diff --git a/Configs/.config/waybar/modules/pulseaudio.jsonc b/Configs/.config/waybar/modules/pulseaudio.jsonc index 91bc2b0b6..1d2b4e115 100644 --- a/Configs/.config/waybar/modules/pulseaudio.jsonc +++ b/Configs/.config/waybar/modules/pulseaudio.jsonc @@ -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": "󰖁", + "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": "", + "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": "{source_desc} // {source_volume}%", + "scroll-step": 5 +}, diff --git a/Configs/.config/waybar/modules/spotify.jsonc b/Configs/.config/waybar/modules/spotify.jsonc index 13bd6bcc0..ae8478354 100644 --- a/Configs/.config/waybar/modules/spotify.jsonc +++ b/Configs/.config/waybar/modules/spotify.jsonc @@ -1,6 +1,6 @@ "custom/spotify": { "exec": "mediaplayer.py --player spotify", - "format": " {}", + "format": " {}", "rotate": ${r_deg}, "return-type": "json", "on-click": "playerctl play-pause --player spotify", diff --git a/Configs/.config/waybar/modules/style.css b/Configs/.config/waybar/modules/style.css index 93da5c371..9b7a62fd8 100644 --- a/Configs/.config/waybar/modules/style.css +++ b/Configs/.config/waybar/modules/style.css @@ -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"; @@ -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; } diff --git a/Configs/.config/waybar/modules/theme.jsonc b/Configs/.config/waybar/modules/theme.jsonc index 6482c6eb5..9055b9834 100644 --- a/Configs/.config/waybar/modules/theme.jsonc +++ b/Configs/.config/waybar/modules/theme.jsonc @@ -1,5 +1,5 @@ "custom/theme": { - "format": "{}", + "format": "{}", "rotate": ${r_deg}, "exec": "echo ; echo 󰟡 switch theme", "on-click": "themeswitch.sh -n", diff --git a/Configs/.config/waybar/modules/wallchange.jsonc b/Configs/.config/waybar/modules/wallchange.jsonc index 0c839ca19..37b8d1c52 100644 --- a/Configs/.config/waybar/modules/wallchange.jsonc +++ b/Configs/.config/waybar/modules/wallchange.jsonc @@ -1,5 +1,5 @@ "custom/wallchange": { - "format": "{}", + "format": "󰸉{}", "rotate": ${r_deg}, "exec": "echo ; echo 󰆊 switch wallpaper", "on-click": "swwwallpaper.sh -n", diff --git a/Configs/.config/waybar/modules/wbar.jsonc b/Configs/.config/waybar/modules/wbar.jsonc index 7738657cb..b6d136d64 100644 --- a/Configs/.config/waybar/modules/wbar.jsonc +++ b/Configs/.config/waybar/modules/wbar.jsonc @@ -1,5 +1,5 @@ "custom/wbar": { - "format": "{}", //   // + "format": "{}", //   // "rotate": ${r_deg}, "exec": "echo ; echo  switch bar //  dock", "on-click": "wbarconfgen.sh n", diff --git a/Configs/.config/waybar/modules/window.jsonc b/Configs/.config/waybar/modules/window.jsonc index b0c4c7a85..ca412f631 100644 --- a/Configs/.config/waybar/modules/window.jsonc +++ b/Configs/.config/waybar/modules/window.jsonc @@ -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": " {}", + "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 +}, diff --git a/Configs/.config/waybar/modules/workspaces.jsonc b/Configs/.config/waybar/modules/workspaces.jsonc index c1e580a6c..92bbc501e 100644 --- a/Configs/.config/waybar/modules/workspaces.jsonc +++ b/Configs/.config/waybar/modules/workspaces.jsonc @@ -1,5 +1,5 @@ "hyprland/workspaces": { - "disable-scroll": true, + // "disable-scroll": true, "rotate": ${r_deg}, "all-outputs": true, "active-only": false, diff --git a/Configs/.local/share/bin/systemupdate.sh b/Configs/.local/share/bin/systemupdate.sh index 36d80f1fc..9b96fe34e 100755 --- a/Configs/.local/share/bin/systemupdate.sh +++ b/Configs/.local/share/bin/systemupdate.sh @@ -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="󰮯" #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\":\"󰮯 $upd\", \"tooltip\":\"󱓽 Official $ofc\n󱓾 AUR $aur$fpk_disp\"}" fi diff --git a/Source/arcs/SymbolsNerdFont.tar.gz b/Source/arcs/SymbolsNerdFont.tar.gz new file mode 100644 index 000000000..f8b7cc56a Binary files /dev/null and b/Source/arcs/SymbolsNerdFont.tar.gz differ