From c153cfaaa3e96e5ac2511efa26a697ed973dd468 Mon Sep 17 00:00:00 2001 From: Logan Date: Fri, 17 Apr 2015 00:38:59 -0700 Subject: [PATCH] Added battery script and cleaned up vim plugins and tmux.conf --- scripts/battery.sh | 116 +++++++++++++++++++++++++++++++++++++++++++++ tmux.conf | 6 +-- vimrc | 3 +- 3 files changed, 121 insertions(+), 4 deletions(-) create mode 100755 scripts/battery.sh diff --git a/scripts/battery.sh b/scripts/battery.sh new file mode 100755 index 0000000..5ce9945 --- /dev/null +++ b/scripts/battery.sh @@ -0,0 +1,116 @@ +#!/bin/sh +#Created by richo on GitHub + +HEART_FULL=♥ +HEART_EMPTY=♡ +[ -z "$NUM_HEARTS" ] && + NUM_HEARTS=5 + +cutinate() +{ + perc=$1 + inc=$(( 100 / $NUM_HEARTS)) + + + for i in `seq $NUM_HEARTS`; do + if [ $perc -lt 100 ]; then + echo $HEART_EMPTY + else + echo $HEART_FULL + fi + perc=$(( $perc + $inc )) + done +} + +linux_get_bat () +{ + bf=$(cat $BAT_FULL) + bn=$(cat $BAT_NOW) + echo $(( 100 * $bn / $bf )) +} + +freebsd_get_bat () +{ + echo "$(sysctl -n hw.acpi.battery.life)" + +} + +# Do with grep and awk unless too hard + +# TODO Identify which machine we're on from teh script. + +battery_status() +{ +case $(uname -s) in + "Linux") + BATPATH=/sys/class/power_supply/BAT0 + STATUS=$BATPATH/status + BAT_FULL=$BATPATH/energy_full + BAT_NOW=$BATPATH/energy_now + if [ "$1" = `cat $STATUS` -o "$1" = "" ]; then + linux_get_bat + fi + ;; + "FreeBSD") + STATUS=`sysctl -n hw.acpi.battery.state` + case $1 in + "Discharging") + if [ $STATUS -eq 1 ]; then + freebsd_get_bat + fi + ;; + "Charging") + if [ $STATUS -eq 2 ]; then + freebsd_get_bat + fi + ;; + "") + freebsd_get_bat + ;; + esac + ;; + "Darwin") + case $1 in + "Discharging") + ext="No";; + "Charging") + ext="Yes";; + esac + + ioreg -c AppleSmartBattery -w0 | \ + grep -o '"[^"]*" = [^ ]*' | \ + sed -e 's/= //g' -e 's/"//g' | \ + sort | \ + while read key value; do + case $key in + "MaxCapacity") + export maxcap=$value;; + "CurrentCapacity") + export curcap=$value;; + "ExternalConnected") + if [ "$ext" != "$value" ]; then + exit + fi + ;; + "FullyCharged") + if [ "$value" = "Yes" ]; then + exit + fi + ;; + esac + if [[ -n "$maxcap" && -n $curcap ]]; then + echo $(( 100 * $curcap / $maxcap )) + break + fi + done +esac +} + +BATTERY_STATUS=`battery_status $1` +[ -z "$BATTERY_STATUS" ] && exit + +#if [ -n "$CUTE_BATTERY_INDICATOR" ]; then + echo `cutinate $BATTERY_STATUS` +#else + echo ${BATTERY_STATUS}% +#fi diff --git a/tmux.conf b/tmux.conf index 7f2cd1d..02a4bc9 100644 --- a/tmux.conf +++ b/tmux.conf @@ -30,7 +30,7 @@ setw -g window-status-activity-fg "colour150" setw -g window-status-separator "" setw -g window-status-bg "colour238" set -g status-left "#[fg=colour236,bg=colour150] #S #[fg=colour150,bg=colour238,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=colour237,bg=colour238,nobold,nounderscore,noitalics] #[fg=colour249,bg=colour237] #(~/.scripts/tmux_battery_charge_indicator.sh) %m/%e/%y %I:%m %p #[fg=colour150,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour236,bg=colour150] #h " -setw -g window-status-format "#[fg=colour150,bg=colour238] #I #[fg=colour150,bg=colour238] #W " -setw -g window-status-current-format "#[fg=colour238,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #I #[fg=colour249,bg=colour237] #W #[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]" +set -g status-right "#[fg=colour237,bg=colour238,nobold,nounderscore,noitalics] #[fg=colour249,bg=colour237] #(~/.scripts/battery.sh) %m/%e/%y %I:%m %p #[fg=colour150,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour236,bg=colour150] #h " +setw -g window-status-format "#[fg=colour150,bg=colour238] #I #[fg=colour150,bg=colour238] #W " +setw -g window-status-current-format "#[fg=colour238,bg=colour237,nobold,nounderscore,noitalics]#[fg=colour249,bg=colour237] #I #[fg=colour249,bg=colour237] #W #[fg=colour237,bg=colour238,nobold,nounderscore,noitalics]" set -g status-utf8 on diff --git a/vimrc b/vimrc index 3dc7476..5be41b8 100644 --- a/vimrc +++ b/vimrc @@ -35,7 +35,8 @@ Plugin 'airblade/vim-gitgutter' Plugin 'scrooloose/nerdtree' Plugin 'bling/vim-airline' Plugin 'Townk/vim-autoclose' -Plugin 'kchmck/vim-coffee-script' +Plugin 'godlygeek/tabular' +Plugin 'plasticboy/vim-markdown' Bundle 'mattn/webapi-vim' Bundle 'mattn/gist-vim' Bundle 'vim-ruby/vim-ruby'