update all modules

This commit is contained in:
speedie 2022-12-01 22:51:43 +01:00
parent 738410ffc5
commit 17d92aa5da
4 changed files with 105 additions and 16 deletions

View file

@ -34,14 +34,29 @@ CLICK() {
exit 1
}
# get icon
GETICON() {
[ "$BATTERYPERC_0" = "100" ] && ICON="$ITEM11_ICON_FULL"
[ "$BATTERYPERC_0" -lt "76" ] && ICON="$ITEM11_ICON_75"
[ "$BATTERYPERC_0" -lt "51" ] && ICON="$ITEM11_ICON_50"
[ "$BATTERYPERC_0" -lt "26" ] && ICON="$ITEM11_ICON_25"
[ "$BATTERYPERC_0" -lt "6" ] && ICON="$ITEM11_ICON_5"
command -v acpi > /dev/null && acpi | grep -q "Charging" && ICON="$ITEM11_ICON_CHARGING"
command -v acpi > /dev/null && acpi | grep -q "Discharging" && ICON="$ITEM11_ICON_DISCHARGING"
[ -z "$ICON" ] && ICON="$ITEM11_ICON"
}
# information itself
PRINT() {
[ "$ENABLE_ITEM11" != "true" ] && return
# battery 0, copy + paste this if you need more than one battery
[ -e "/sys/class/power_supply/BAT0/capacity" ] && BATTERY="${BATTERY}$(cat /sys/class/power_supply/BAT0/capacity)%" || return
[ -e "/sys/class/power_supply/BAT0/capacity" ] && BATTERY="${BATTERY}$(cat /sys/class/power_supply/BAT0/capacity)%" && BATTERYPERC_0="$(cat /sys/class/power_supply/BAT0/capacity)" || return
GETICON
echo "$ITEM11_SEPARATOR $ITEM11_ICON $BATTERY"
echo "$ITEM11_SEPARATOR $ICON $BATTERY"
# print charging status
command -v acpi > /dev/null && [ "$ITEM11_SHOW_CHARGING_STATUS" ] && \

View file

@ -33,17 +33,17 @@ ENABLE_ITEM11=true # Enable battery percentage and charging status (true/false)
# Status bar module icons
# Make sure dwm supports this icon/glyph.
ITEM1_ICON=" " # Icon for ITEM1
ITEM2_ICON=" " # Icon for ITEM2
ITEM3_ICON=" " # Icon for ITEM3
ITEM1_ICON=" " # Icon for ITEM1
ITEM2_ICON=" " # Icon for ITEM2
ITEM3_ICON=" " # Icon for ITEM3
ITEM4_ICON=" " # Icon for ITEM4
ITEM5_ICON="" # Icon for ITEM5
ITEM5_ICON="" # Icon for ITEM5
ITEM6_ICON=" " # Icon for ITEM6
ITEM7_ICON=" " # Icon for ITEM7
ITEM8_ICON=" " # Icon for ITEM8
ITEM9_ICON=" " # Icon for ITEM9
ITEM10_ICON=" " # Icon for ITEM10
ITEM11_ICON=" " # Icon for ITEM11
ITEM8_ICON=" " # Icon for ITEM8
ITEM9_ICON=" " # Icon for ITEM9
ITEM10_ICON=" " # Icon for ITEM10
ITEM11_ICON=" " # Icon for ITEM11
# Status bar module separators
ITEM1_SEPARATOR="\$SEPARATOR" # Separator for ITEM1
@ -87,9 +87,29 @@ ITEM2_FORMAT="@h:@m"
# Example: @d/@m/@y
ITEM3_FORMAT="@d/@m/@y"
ITEM4_SHOW_MUTE="true" # Show mute status (true/false)
ITEM4_SHOW_MUTE="false" # Show mute status (true/false)
ITEM4_MUTE_TEXT="(Muted)" # Text to display when muted (text)
ITEM4_ICON_100="" # Icon when volume is at 100 or higher.
ITEM4_ICON_75="墳" # Icon when volume is at 75 or lower.
ITEM4_ICON_50="奔" # Icon when volume is at 50 or lower.
ITEM4_ICON_25="奄" # Icon when volume is at 25 or lower.
ITEM4_ICON_0="婢" # Icon when volume is at 0.
ITEM4_ICON_MUTED="婢" # Icon when muted.
# Weather icon
#
# Icon to display depending on the weather.
#
ITEM5_SUNNY_ICON="滛" # Icon for when it's sunny and life's good.
ITEM5_WINDY_ICON="煮" # Icon for when it's windy.
ITEM5_CLOUDY_ICON=" " # Icon for when it's cloudy.
ITEM5_FOGGY_ICON="敖" # Icon for when it's foggy.
ITEM5_RAIN_ICON="歹" # Icon for when it's raining.
ITEM5_SNOW_ICON="流" # Icon for when it's snowing.
ITEM5_STORM_ICON="朗" # Icon for when there's a storm.
ITEM5_HAIL_ICON="晴" # Icon for when it's hailing.
# Net format
# Format to display the transmitted/received bytes in
#
@ -120,11 +140,21 @@ ITEM9_FORMAT="@a - @t from @ab (@g) [@te/@tt]"
ITEM10_TEXT="unread articles!" # Text to display next to unread article count (text)
# Battery module options
ITEM11_SHOW_CHARGING_STATUS=true # Show 'Charging', 'Not charging' or 'Fully charged' status after the percentage. (true/false)
ITEM11_DISCHARGING_TEXT="Not charging" # Text when not charging (text)
ITEM11_CHARGING_TEXT="Charging" # Text when charging (text)
ITEM11_FULL_TEXT="Fully charged" # Text when fully charged (text)
# Icons that will be printed depending on your percentage.
ITEM11_ICON_CHARGING=" " # Icon when your battery is charging. Yay!
ITEM11_ICON_DISCHARGING="$ITEM11_ICON" # Icon when your battery is discharging.
ITEM11_ICON_FULL=" " # Icon when your battery is full.
ITEM11_ICON_75=" " # Icon when you have 75% battery left or less.
ITEM11_ICON_50=" " # Icon when you have 50% battery left or less.
ITEM11_ICON_25=" " # Icon when you have 25% battery left or less.
ITEM11_ICON_5=" " # Icon when you have 5% battery left or less.
# For the rest of the options, see status.h.
CONFIG

View file

@ -17,7 +17,7 @@ CLICK() {
VOL_VOLUME="$(speedwm-audioctrl -getvol)"
VOL_ISPULSE="$(speedwm-audioctrl -getbackend)"
ICON="$ITEM4_ICON"
GETDATA
[ -e "/tmp/speedwm-button" ] && BUTTON="$(cat /tmp/speedwm-button)" || BUTTON="0"
[ -z "$TERMINAL" ] && TERMINAL=st
@ -45,10 +45,26 @@ CLICK() {
return
}
# get data
GETDATA() {
[ "$BACKEND" = "pactl" ] && VOL="$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{ print $5; exit }' | sed "s/\%//g")" || VOL="$(amixer -c 0 get Master | tail -n1 | sed -r "s/.*\[(.*)%\].*/\1/")"
[ "$VOL" -gt "99" ] && ICON="$ITEM4_ICON_100 "
[ "$VOL" -lt "100" ] && ICON="$ITEM4_ICON_75"
[ "$VOL" -lt "51" ] && ICON="$ITEM4_ICON_50"
[ "$VOL" -lt "26" ] && ICON="$ITEM4_ICON_25"
[ "$VOL" -lt "1" ] && ICON="$ITEM4_ICON_0"
# mute status
[ "$BACKEND" = "pactl" ] && pactl get-sink-mute @DEFAULT_SINK@ | grep -q yes && ICON="$ITEM4_ICON_MUTED" && MUTEDATA=" $ITEM4_MUTE_TEXT" || MUTEDATA=""
[ "$ITEM4_SHOW_MUTE" != "true" ] && MUTEDATA=""
}
# information itself
PRINT() {
[ "$BACKEND" = "pactl" ] && echo "$(echo $ITEM4_SEPARATOR $ITEM4_ICON $(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5;exit}'))" || echo "$ITEM4_SEPARATOR $ITEM4_ICON $(amixer -c 0 get Master | tail -n1 | sed -r "s/.*\[(.*)%\].*/\1/")%)"
[ "$ITEM4_SHOW_MUTE" = "true" ] && [ "$BACKEND" = "pactl" ] && pactl get-sink-mute @DEFAULT_SINK@ | grep -q yes && echo " $ITEM4_MUTE_TEXT"
GETDATA
VOL="${VOL}%"
echo "$ITEM4_SEPARATOR $ICON $VOL$MUTEDATA"
}
# argument 1

View file

@ -10,11 +10,38 @@ command -v curl > /dev/null || exit
WEATHER_FULL="$(echo "$(curl -s wttr.in/?format="%C" || exit), $(curl -s wttr.in/?format=3 | sed 's/.* //; s/.*\(.....\)/\1/')")"
echo "$WEATHER_FULL" | grep -qE "Unknown location|<html>| ," && exit
GETICON() {
ICON=""
echo "$WEATHER_FULL" | grep -qE "Cloudy|cloudy" && ICON=CLOUDY
echo "$WEATHER_FULL" | grep -qE "Windy|windy|wind" && ICON=WINDY
echo "$WEATHER_FULL" | grep -qE "Fog|fog|Foggy|foggy" && ICON=FOGGY
echo "$WEATHER_FULL" | grep -qE "Sunny|sunny|sun" && ICON=SUNNY
echo "$WEATHER_FULL" | grep -qE "Rain|rain" && ICON=RAIN
echo "$WEATHER_FULL" | grep -qE "Snow|snow" && ICON=SNOW
echo "$WEATHER_FULL" | grep -qE "Hail|hail" && ICON=HAIL
echo "$WEATHER_FULL" | grep -qE "Thunder|thunder|lightning|Lightning|Storm|storm" && ICON=STORM
case "$ICON" in
"SUNNY") ICON="$ITEM5_SUNNY_ICON" ;;
"CLOUDY") ICON="$ITEM5_CLOUDY_ICON" ;;
"WINDY") ICON="$ITEM5_WINDY_ICON" ;;
"FOGGY") ICON="$ITEM5_FOGGY_ICON" ;;
"RAIN") ICON="$ITEM5_RAIN_ICON" ;;
"SNOW") ICON="$ITEM5_SNOW_ICON" ;;
"STORM") ICON="$ITEM5_STORM_ICON" ;;
"HAIL") ICON="$ITEM5_HAIL_ICON" ;;
esac
[ -z "$ICON" ] && ICON="$ITEM5_ICON"
}
# clicking
CLICK() {
GETICON
# values
WEATHER_TERM="speedwm-core -curl-weather"
ICON="$ITEM5_ICON"
ICON="$ICON"
BUTTON="$(cat /tmp/speedwm-button)"
[ -z "$TERMINAL" ] && TERMINAL=st
@ -44,7 +71,8 @@ CLICK() {
# information itself
PRINT() {
echo "$ITEM5_SEPARATOR $ITEM5_ICON $WEATHER_FULL"
GETICON
echo "$ITEM5_SEPARATOR $ICON $WEATHER_FULL"
}
# argument 1