dotfiles

commit ae7ff4fcb6e546934fa99150ee4e3fa69fdc75c9
parent 2477471c2c111e4c1789282eeebdc144cc33182a
Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date:   Tue,  9 Feb 2016 06:51:40 -0800

Merge branch 'master' of github.com:anders-dc/dotfiles

Diffstat:
M
.vimrc
 | 
1
+
M
bin/battery-osx
 | 
5
+++--
M
bin/uu
 | 
2
+-
M
osx-install.sh
 | 
8
++++----

4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.vimrc b/.vimrc
@@ -22,6 +22,7 @@ NeoBundle 'Shougo/neobundle.vim'
 "NeoBundle 'Lokaltog/vim-powerline'
 "NeoBundle 'Lokaltog/powerline'
 NeoBundle 'bling/vim-airline'
+NeoBundle 'vim-airline/vim-airline-themes'
 
 " file system browser
 NeoBundle 'scrooloose/nerdtree'
diff --git a/bin/battery-osx b/bin/battery-osx
@@ -1,5 +1,5 @@
 #!/bin/bash -e
-pmset -g batt | tail -n 1 |\
+pmset -g batt | head -n 2 | tail -n 1 |\
     awk '{ print $2 $3 $4 }' |\
     sed 's/;/ /g' |\
     sed 's/(no//' |\
@@ -10,4 +10,5 @@ pmset -g batt | tail -n 1 |\
     sed 's/ACattached/☇/' |\
     sed 's/finishingcharge/☇/' |\
     sed 's/ $//' |\
-    sed "s/drawingfrom'AC//"
+    sed "s/drawingfrom'AC//" |\
+    sed 's/failure.*/batt fail/'
diff --git a/bin/uu b/bin/uu
@@ -44,4 +44,4 @@ git submodule sync; git submodule update
 echo "## Updating pip"
 pip install --upgrade pip
 echo "## Updating pip packages"
-pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs sudo pip install -U
+pip freeze --local | grep -v '^\-e' | cut -d = -f 1  | xargs sudo -H pip install -U
diff --git a/osx-install.sh b/osx-install.sh
@@ -82,11 +82,11 @@ casks=("adobe-reader"\
     "vlc"\
     "xquartz" )
 
-read -p "Do you want to install brew casks? [y/n]" -n 1 -r
+read -p "Do you want to install brew casks? [y/n] " -n 1 -r
 echo
 if [[ $REPLY =~ ^[Yy]$ ]]; then
     for cask in "${casks[@]}"; do
-        read -p "Do you want to install $cask? [y/n]" -n 1 -r
+        read -p "Do you want to install $cask? [y/n] " -n 1 -r
         echo
         if [[ $REPLY =~ ^[Yy]$ ]]; then
             brew cask install $cask
@@ -94,7 +94,7 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
     done
 fi
 
-read -p "Do you want to clone terminal.app themes? [y/n]" -n 1 -r
+read -p "Do you want to clone terminal.app themes? [y/n] " -n 1 -r
 echo
 if [[ $REPLY =~ ^[Yy]$ ]]; then
     git clone https://github.com/tomislav/osx-terminal.app-colors-solarized \
@@ -103,7 +103,7 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
     wget https://raw.githubusercontent.com/altercation/solarized/master/iterm2-colors-solarized/Solarized%20Dark.itermcolors
 fi
 
-read -p "Do you want to create symlinks in the home folder? [y/n]" -n 1 -r
+read -p "Do you want to create symlinks in the home folder? [y/n] " -n 1 -r
 echo
 if [[ $REPLY =~ ^[Yy]$ ]]; then
     ln -s ~/Library/Mobile\ Documents/com\~apple\~CloudDocs ~/iCloud