diff options
| -rwxr-xr-x | bin/status-bar | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/bin/status-bar b/bin/status-bar index 8dd249d..30fdbd7 100755 --- a/bin/status-bar +++ b/bin/status-bar @@ -52,15 +52,29 @@ pine_batt_status() { batt_status() { # sudo tlp-stat -b | awk 'BEGIN{ORS=" "} /\/status/{print $3}/^Charge/{print $3}'; + batt="BAT0" + supplyN="AC" + while [ $# -gt 0 ] ; do case $1 in + -b) batt="$2"; shift ; shift ;; + -s) supplyN="$2"; shift ; shift ;; + *) exit 2; + esac ; done printf "%s %s" \ - "$(cat /sys/class/power_supply/BAT0/capacity)" \ - "$(charging_status)" + "$(cat "/sys/class/power_supply/$batt/capacity")" \ + "$(charging_status -s "$supplyN")" } charging_status() { - if [ "$(cat /sys/class/power_supply/AC/online)" = "1" ] ; then + supplyN="AC" + while [ $# -gt 0 ] ; do case $1 in + -s) supplyN="$2"; shift ; shift ;; + *) exit 2; + esac ; done + online_f="/sys/class/power_supply/$supplyN/online" + online="$(cat "$online_f")" + if [ "$online" = "1" ] ; then printf "Charging" - elif [ "$(cat /sys/class/power_supply/AC/online)" = "0" ] ; then + elif [ "$online" = "0" ] ; then printf "Discharging" else printf "Unknown charging status" @@ -127,6 +141,7 @@ echo \ status_line() { echo \ "Temp: $(sensors | sed -n 's/^temp1:[\t ]*//p' | sed 's/ *//g' | sed 1q | tr -d '\n')|"\ + "Fan: $(_fan)|"\ "Cpu Freq: $(cpu_freq)mhz|"\ "Batt: $(batt_status)|"\ @@ -161,6 +176,16 @@ echo \ "$(date '+%m.%d.%Y %H:%M')" } +yoga6_status_line() { +echo \ +"Fan: $(_fan)|"\ +"Temp: $(k10Temp)|"\ +"CPU: $(cpu_freq)|"\ +"Batt: $(batt_status -b BAT1 -s ACAD | sed -e's/ *$//g')|"\ +"$(network_info)|"\ +"$(date '+%m.%d.%Y %H:%M')" +} + desktop_status_line() { echo \ "Temp: $(core_0_temp)|"\ @@ -169,6 +194,8 @@ echo \ "$(date '+%m.%d.%Y %H:%M')" } +# "$@" ;exit 0 + _type="$1"; shift while true ; do xsetroot -name "$("${_type}_status_line" "$@")" |