diff --git a/.config/xmobar/scripts/battery.sh b/.config/xmobar/scripts/battery.sh deleted file mode 100755 index c49c1d8..0000000 --- a/.config/xmobar/scripts/battery.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - - -batLevel=$(acpi --battery | grep -Po '(\d+)\%' | sed 's/%//') - -charging=$(acpi --ac-adapter | grep -Po '(off-line|on-line)') - -if [ $batLevel -le 20 ]; -then - if [ $charging == "on-line" ]; - then - echo " " - else - echo " " - fi -elif [ $batLevel -le 30 ]; -then - if [ $charging == "on-line" ]; - then - echo " " - else - echo " " - fi -elif [ $batLevel -le 40 ]; -then - if [ $charging == "on-line" ]; - then - echo " " - else - echo " " - fi -elif [ $batLevel -le 60 ]; -then - if [ $charging == "on-line" ]; - then - echo " " - else - echo " " - fi -elif [ $batLevel -le 80 ]; -then - if [ $charging == "on-line" ]; - then - echo " " - else - echo " " - fi -elif [ $batLevel -le 95 ]; -then - if [ $charging == "on-line" ]; - then - echo " " - else - echo " " - fi -elif [ $batLevel -g 95 ]; -then - if [ $charging == "on-line" ]; - then - echo " " - else - echo " " - fi -fi diff --git a/.config/xmobar/scripts/bluetooth.sh b/.config/xmobar/scripts/bluetooth.sh index bb88ddc..4b4304d 100755 --- a/.config/xmobar/scripts/bluetooth.sh +++ b/.config/xmobar/scripts/bluetooth.sh @@ -15,4 +15,4 @@ do fi done -echo "$ICON" +echo "$ICON" diff --git a/.config/xmobar/scripts/network.sh b/.config/xmobar/scripts/network.sh index d423eaa..de1e837 100755 --- a/.config/xmobar/scripts/network.sh +++ b/.config/xmobar/scripts/network.sh @@ -5,7 +5,7 @@ STATES=($(nmcli device show | grep "GENERAL.STATE" | awk '{print $3}')) for ((i = 0; i < "${#TYPES[@]}"; i++)); do if [[ ${STATES[$i]} = "(connected)" ]]; then if [[ ${TYPES[$i]} == *"wifi"* ]]; then - echo "直" + echo "直" else echo "ﯱ" fi diff --git a/.config/xmobar/scripts/volume.sh b/.config/xmobar/scripts/volume.sh index 81c985f..6814b3e 100755 --- a/.config/xmobar/scripts/volume.sh +++ b/.config/xmobar/scripts/volume.sh @@ -3,9 +3,9 @@ MUTE=$(pactl get-sink-mute @DEFAULT_SINK@ | sed -En 's/Mute: (.)/\1/p') VOLUME=$(pactl get-sink-volume @DEFAULT_SINK@ | grep -Po '[0-9]*%' | sed -En 's/(.)\%/\1/p' | head -n1) if [ "$MUTE" = "yes" ]; then - echo "婢" -elif [ "$VOLUME" -le 20 ]; then - echo "奔 $VOLUME" + echo "" +elif [ "$VOLUME" -eq 0 ]; then + echo "" else - echo " $VOLUME" + echo " $VOLUME" fi diff --git a/.config/xmobar/xmobarrc0 b/.config/xmobar/xmobarrc0 index ca38025..91d10c8 100644 --- a/.config/xmobar/xmobarrc0 +++ b/.config/xmobar/xmobarrc0 @@ -7,10 +7,10 @@ Config {font = "xft:Ubuntu:weight=bold:pixelsize=14:antialias=true:hinting=true" , additionalFonts = [ "xft:Font Awesome 6 Free Solid:pixelsize=14" - , "xft:Font Awesome 6 Free Solid:pixelsize=13:bold" - , "xft:FiraCode Nerd Font Mono:pixelsize=21" - , "xft:FiraCode Nerd Font Mono:pixelsize=14" - , "xft:Font Awesome 6 Free Solid:pixelsize=21" + , "xft:Font Awesome 6 Free Solid:pixelsize=12:bold" + , "xft:Font Awesome 6 Free Solid:pixelsize=16" + , "xft:Hack Nerd Font Mono:pixelsize=21" + , "xft:Hack Nerd Font Mono:pixelsize=25" ] , bgColor = "#2B2E37" , fgColor = "#929AAD" @@ -34,7 +34,6 @@ Config {font = "xft:Ubuntu:weight=bold:pixelsize=14:antialias=true:hinting=true" , Run Com "/home/afonso/.config/xmobar/scripts/volume.sh" [] "volume" 10 , Run Com "/home/afonso/.config/xmobar/scripts/bluetooth.sh" [] "bluetooth" 10 , Run Com "/home/afonso/.config/xmobar/scripts/network.sh" [] "network" 10 - , Run Com "/home/afonso/.config/xmobar/scripts/battery.sh" [] "battery" 20 , Run Com "/home/afonso/.config/xmobar/scripts/trayer-padding-icon.sh" [] "trayerpad" 20 ] , sepChar = "%" @@ -58,15 +57,12 @@ Config {font = "xft:Ubuntu:weight=bold:pixelsize=14:antialias=true:hinting=true" \ \ \|\ \ \ - \ \ \%network%\ \ \ \%bluetooth%\ \ \ \%volume%\ \ \ - \%battery%\ - \ \ \|\ \%trayerpad%" }