diff --git a/bin/omarchy-battery-monitor b/bin/omarchy-battery-monitor index fd16afb1..20d6a1e1 100755 --- a/bin/omarchy-battery-monitor +++ b/bin/omarchy-battery-monitor @@ -4,33 +4,18 @@ BATTERY_THRESHOLD=10 NOTIFICATION_FLAG="/run/user/$UID/omarchy_battery_notified" - -get_battery_percentage() { - upower -i "$(upower -e | grep 'BAT')" \ - | awk -F: '/percentage/ { - gsub(/[%[:space:]]/, "", $2); - val=$2; - printf("%d\n", (val+0.5)) - exit - }' -} - -get_battery_state() { - upower -i $(upower -e | grep 'BAT') | grep -E "state" | awk '{print $2}' -} +BATTERY_LEVEL=$(omarchy-battery-remaining) +BATTERY_STATE=$(upower -i $(upower -e | grep 'BAT') | grep -E "state" | awk '{print $2}') send_notification() { notify-send -u critical "󱐋 Time to recharge!" "Battery is down to ${1}%" -i battery-caution -t 30000 } -BATTERY_LEVEL=$(get_battery_percentage) -BATTERY_STATE=$(get_battery_state) - -if [[ "$BATTERY_STATE" == "discharging" && "$BATTERY_LEVEL" -le "$BATTERY_THRESHOLD" ]]; then - if [[ ! -f "$NOTIFICATION_FLAG" ]]; then - send_notification "$BATTERY_LEVEL" - touch "$NOTIFICATION_FLAG" +if [[ $BATTERY_STATE == "discharging" && $BATTERY_LEVEL -le $BATTERY_THRESHOLD ]]; then + if [[ ! -f $NOTIFICATION_FLAG ]]; then + send_notification $BATTERY_LEVEL + touch $NOTIFICATION_FLAG fi else - rm -f "$NOTIFICATION_FLAG" + rm -f $NOTIFICATION_FLAG fi diff --git a/bin/omarchy-battery-remaining b/bin/omarchy-battery-remaining new file mode 100755 index 00000000..855b4c6b --- /dev/null +++ b/bin/omarchy-battery-remaining @@ -0,0 +1,11 @@ +#!/bin/bash + +# Returns the battery percentage remaining as an integer. + +upower -i $(upower -e | grep BAT) \ +| awk -F: '/percentage/ { + gsub(/[%[:space:]]/, "", $2); + val=$2; + printf("%d\n", (val+0.5)) + exit + }'