diff --git a/.config/polybar/config b/.config/polybar/config index 9544559..2694039 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -106,7 +106,7 @@ ramp-13 =  [module/battery-custom] type = custom/script -exec = ~/.config/polybar/scripts/battery.sh +exec = ${env:POLYBAR_BATTERY} interval = 5 ;################################################# @@ -128,15 +128,15 @@ label = "%date% - %time%" [module/media] type=custom/script -exec = ~/.config/polybar/scripts/media.sh +exec = ${env:POLYBAR_MEDIA} interval = 1 ;################################################# [module/vpn] type = custom/script -exec = ~/.config/polybar/scripts/running-vpn.sh -click-left = ~/.config/polybar/scripts/pub-ipv4.sh & +exec = ${env:POLYBAR_VPN} +click-left = ${env:POLYBAR_VPN_CLICK_LEFT} interval = 5 ;################################################# @@ -156,13 +156,13 @@ label-disconnected = %{A1:gnome-terminal -x nmtui connect:} %ifname% disconnecte [module/bluetooth] type = custom/script -exec = ~/.config/polybar/scripts/bluetooth.sh +exec = ${env:POLYBAR_BLUETOOTH} tail = true -click-left = ~/.config/polybar/scripts/bluetooth.sh --toggle & +click-left = ${env:POLYBAR_BLUETOOTH_CLICK_LEFT} ;################################################# [module/powermenu] type = custom/text -content = %{A1:~/.config/rofi/powermenu.sh &:}%{T2}...%{T-}%{A} +content = ${env:POLYBAR_POWERMENU} diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh index 6387c51..fae12c2 100755 --- a/.config/polybar/launch.sh +++ b/.config/polybar/launch.sh @@ -1,4 +1,21 @@ -#!/bin/sh +#!/bin/bash + +XDG_CONF="${XDG_CONFIG_HOME:-$HOME/.config}" +BASE_DIR="$XDG_CONF/polybar" + +declare -A module_flags +module_flags=( + [battery]="$BASE_DIR/scripts/battery.sh" + [bluetooth]="$BASE_DIR/scripts/bluetooth.sh" + [bluetooth_click_left]="$BASE/scripts/bluetooth.sh --toggle &" + [media]="$BASE_DIR/scripts/media.sh" + [powermenu]="%{A1:$XDG_CONF/rofi/powermenu.sh &:}%{T2}...%{T-}%{A}" + [vpn]="$BASE_DIR/scripts/vpn.sh" + [vpn_click_left]="$BASE_DIR/scripts/pub_ipv4.sh &" +) +for module in "${!module_flags[@]}"; do + export POLYBAR_${module^^}="${module_flags[$module]}" +done # if there is no running instance if ! pgrep -ax polybar >/dev/null 2>&1; then @@ -9,7 +26,7 @@ if ! pgrep -ax polybar >/dev/null 2>&1; then export TRAY_POS=none [ "$m" != "$primary" ] || export TRAY_POS=right export MONITOR="$m" - polybar --reload -c "${XDG_CONFIG_HOME:-$HOME/.config}/polybar/config" main & + polybar --reload -c "$BASE_DIR/config" main & done echo "Polybar launched..." diff --git a/.config/polybar/scripts/pub-ipv4.sh b/.config/polybar/scripts/pub_ipv4.sh similarity index 100% rename from .config/polybar/scripts/pub-ipv4.sh rename to .config/polybar/scripts/pub_ipv4.sh diff --git a/.config/polybar/scripts/running-vpn.sh b/.config/polybar/scripts/vpn.sh similarity index 100% rename from .config/polybar/scripts/running-vpn.sh rename to .config/polybar/scripts/vpn.sh