Merge branch 'master' of github.com:arcan1s/dotfiles

This commit is contained in:
arcan1s 2014-12-11 00:53:34 +03:00
commit 75df5ba69d
2 changed files with 17 additions and 9 deletions

View File

@ -19,15 +19,23 @@ fi
precmd() { precmd() {
# battery charge # battery charge
function batcharge { function batcharge {
bat_perc=$(acpi | awk {'print $4;'} | sed -e "s/\s//" -e "s/%.*//") local _bat_perc=0
if [[ ${bat_perc} < 15 ]]; then local _num=0
col="%{$fg_bold[red]%}" local _bat
elif [[ ${bat_perc} < 50 ]]; then for _bat in /sys/class/power_supply/BAT*; do
col="%{$fg_bold[yellow]%}" let "_bat_perc += $(cat ${_bat}/capacity)"
let "_num += 1"
done
_bat_perc=$((${_bat_perc}/${_num}))
local _col
if [[ ${_bat_perc} < 15 ]]; then
_col="%{$fg_bold[red]%}"
elif [[ ${_bat_perc} < 50 ]]; then
_col="%{$fg_bold[yellow]%}"
else else
col="%{$fg_bold[green]%}" _col="%{$fg_bold[green]%}"
fi fi
echo "%{$fg_bold[white]%}["$col$bat_perc"%{$fg_bold[white]%}%%]%{$reset_color%}" echo "%{$fg_bold[white]%}["${_col}${_bat_perc}"%{$fg_bold[white]%}%%]%{$reset_color%}"
} }
# last command # last command
returncode="%(?.%{$fg[green]%}.%{$fg[red]%})%?%{$resetcolor%}" returncode="%(?.%{$fg[green]%}.%{$fg[red]%})%?%{$resetcolor%}"

View File

@ -22,7 +22,7 @@ projctl() {
echo "Using resolution: ${RESOLUTION}" echo "Using resolution: ${RESOLUTION}"
xrandr --output ${FIRSTMON} --mode ${RESOLUTION} --output ${SECONDMON} --mode ${RESOLUTION} xrandr --output ${FIRSTMON} --mode ${RESOLUTION} --output ${SECONDMON} --mode ${RESOLUTION}
fi fi
xinput set-prop 10 137 $(get-coord-matrix.py) xinput set-prop "ELAN Touchscreen" 140 $(get-coord-matrix.py)
} }
twinmon() { twinmon() {
@ -46,5 +46,5 @@ twinmon() {
echo "Enable ${SECONDMON}" echo "Enable ${SECONDMON}"
xrandr --output ${FIRSTMON} --auto --primary --output ${SECONDMON} --auto --left-of ${FIRSTMON} xrandr --output ${FIRSTMON} --auto --primary --output ${SECONDMON} --auto --left-of ${FIRSTMON}
fi fi
xinput set-prop 10 137 $(get-coord-matrix.py) xinput set-prop "ELAN Touchscreen" 140 $(get-coord-matrix.py)
} }