From 748a68ce75ff7075376cddbb9b3d9eb89b82e6b5 Mon Sep 17 00:00:00 2001
From: Andrew Miner <andrew.miner@boom.aero>
Date: Sun, 17 Dec 2017 20:01:26 -0700
Subject: [PATCH] Tweak profile/vim settings & add installation of Python

---
 home/.profile |  2 +-
 home/.vimrc   |  1 -
 install.sh    | 65 +++++++++++++++++++++++++++------------------------
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/home/.profile b/home/.profile
index 4d2d404..541e205 100644
--- a/home/.profile
+++ b/home/.profile
@@ -1,4 +1,4 @@
-export EDITOR=vi
+export EDITOR=vim
 export PS1='[\h:\w]\$ '
 export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin
 export PATH=$PATH:$HOME/bin:$HOME/node_modules/.bin
diff --git a/home/.vimrc b/home/.vimrc
index 8c5cb62..cb8b93e 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -108,7 +108,6 @@ let g:ale_completion_enabled = 1
 let g:ale_lint_on_text_changed = 'never'
 let g:ale_open_list = 1
 let g:ale_set_loclist = 0
-let g:ale_set_quickfix = 1
 let g:ale_sign_column_always = 1
 
 let g:ale_linters = {
diff --git a/install.sh b/install.sh
index b6d4920..387ea38 100755
--- a/install.sh
+++ b/install.sh
@@ -21,37 +21,42 @@ pushd $HOME >/dev/null
       [[ -e "$FILE" ]] && rm -rf "$FILE"
       ln -sf "$CONFIG_DIR/home/$FILE" "$FILE"
   done
-
-  echo "Updating brew, one moment..."
-  brew update
-
-  echo "Installing standard brew packages..."
-  which -s ag      || brew install ag
-  which -s ctags   || brew install ctags
-  which -s fswatch || brew install fswatch
-  which -s gvim    || brew install macvim
-  which -s node    || brew install node
-  which -s rbenv   || brew install rbenv
-  which -s watch   || brew install watch
-  which -s wget    || brew install wget
-
-  echo "Installing standard NPM packages..."
-  which -s browserify || sudo npm install -g browserify
-  which -s coffee     || sudo npm install -g coffee-script
-  which -s eslint     || sudo npm install -g eslint
-  which -s grunt      || sudo npm install -g grunt-cli
-  which -s sass       || sudo npm install -g node-sass
-  which -s nodemon    || sudo npm install -g nodemon
-  which -s pug        || sudo npm install -g pug-cli
-  which -s tsc        || sudo npm install -g typescript
-  which -s tslint     || sudo npm install -g tslint
-  which -s ts-node    || sudo npm install -g ts-node
-  which -s tsserver   || sudo npm install -g typescript
-
-  echo "Installing vi plugins..."
-  vim +PlugClean +PlugInstall +qall
-
 popd >/dev/null
 
+echo "Updating brew, one moment..."
+brew update
+
+echo "Installing standard brew packages..."
+which -s ag      || brew install ag
+which -s ctags   || brew install ctags
+which -s fswatch || brew install fswatch
+which -s python  || brew install python # must preceed macvim
+which -s gvim    || brew install macvim
+which -s node    || brew install node
+which -s rbenv   || brew install rbenv
+which -s watch   || brew install watch
+which -s wget    || brew install wget
+
+pushd /usr/local/bin >/dev/null
+    ln -sf pip2 pip
+    ln -sf python2 python
+popd >/dev/null
+
+echo "Installing standard NPM packages..."
+which -s browserify || npm install -g browserify
+which -s coffee     || npm install -g coffee-script
+which -s eslint     || npm install -g eslint
+which -s grunt      || npm install -g grunt-cli
+which -s sass       || npm install -g node-sass
+which -s nodemon    || npm install -g nodemon
+which -s pug        || npm install -g pug-cli
+which -s tsc        || npm install -g typescript
+which -s tslint     || npm install -g tslint
+which -s ts-node    || npm install -g ts-node
+which -s tsserver   || npm install -g typescript
+
+echo "Installing vi plugins..."
+vim +PlugClean +PlugInstall +qall
+
 echo "Done."
 echo