EvolutionOS
/
neofetch
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes gpu count and added battery support to Mac OS X and Windows

This commit is contained in:
Dylan 2016-02-03 09:26:47 +11:00
parent 683043c481
commit 5ca3666055
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config
View File

@ -119,11 +119,13 @@ gtk3="on"
# Which battery to display. # Which battery to display.
# By default we display all batteries. # By default we display all batteries.
# NOTE: Only works on Linux.
# --battery_num all, 0, 1, 2, etc # --battery_num all, 0, 1, 2, etc
battery_num="all" battery_num="all"
# Whether or not to print each battery on the same line. # Whether or not to print each battery on the same line.
# By default each battery gets its own line and title. # By default each battery gets its own line and title.
# NOTE: Only works on Linux.
# --battery_shorthand on/off # --battery_shorthand on/off
battery_shorthand="off" battery_shorthand="off"

21
fetch
View File

@ -139,11 +139,13 @@ gtk3="on"
# Which battery to display. # Which battery to display.
# By default we display all batteries. # By default we display all batteries.
# NOTE: Only works on Linux.
# --battery_num all, 0, 1, 2, etc # --battery_num all, 0, 1, 2, etc
battery_num="all" battery_num="all"
# Whether or not to print each battery on the same line. # Whether or not to print each battery on the same line.
# By default each battery gets its own line and title. # By default each battery gets its own line and title.
# NOTE: Only works on Linux.
# --battery_shorthand on/off # --battery_shorthand on/off
battery_shorthand="off" battery_shorthand="off"
@ -835,11 +837,12 @@ getgpu () {
case "$os" in case "$os" in
"Linux") "Linux")
# Get the GPUs # Get the GPUs
gpu="$(lspci | grep -F "VGA" | uniq -c)" gpu="$(lspci | grep -F "VGA")"
gpu=${gpu/??':'??'.'?} gpu=${gpu//??':'??'.'?}
# Count the number of GPUs # Count the number of GPUs
count=${gpu/ VGA*} count="$(printf "%s" "$gpu" | uniq -c)"
count=${count/ VGA*}
count=${count//[[:space:]]} count=${count//[[:space:]]}
# If there's more than one gpu # If there's more than one gpu
@ -1238,6 +1241,18 @@ getbattery () {
battery="None" battery="None"
fi fi
;; ;;
"Mac OS X")
battery="$(pmset -g batt | grep -o '[0-9]*%')"
;;
"Windows")
battery="$(wmic path Win32_Battery Get EstimatedChargeRemaining /value)"
battery=${battery/EstimatedChargeRemaining'='}
battery=${battery//[[:space:]]/ }
battery=${battery// }
battery+="%"
;;
esac esac
} }