From e55e7ea84cf7a4071d16ed44bd7b38bea5305580 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Fri, 10 Feb 2017 15:18:56 -0500
Subject: [PATCH] Updates including cayla's scripts

---
 INSTALL.sh                      | 25 ++++++++++++++++++++++---
 bin/packages/homebrew-casks.txt |  3 +++
 bin/packages/homebrew.txt       | 22 ++++++++++++++++++++++
 bin/packages/pip.txt            |  3 +++
 bin/setup-usr-local.sh          | 20 ++++++++++++++++++++
 config/fish/functions/cg.fish   |  4 ++++
 config/fish/functions/dots.fish |  3 +++
 zshrc                           |  3 +++
 8 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 bin/packages/homebrew-casks.txt
 create mode 100644 bin/packages/homebrew.txt
 create mode 100644 bin/packages/pip.txt
 create mode 100755 bin/setup-usr-local.sh
 create mode 100644 config/fish/functions/cg.fish
 create mode 100644 config/fish/functions/dots.fish

diff --git a/INSTALL.sh b/INSTALL.sh
index 9d16593..6e7ed4f 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -1,24 +1,43 @@
 #!/bin/bash
 
+# get initial directories setup 
+mv ~/bin/* $(pwd)/bin/
+rm -rf ~/bin/
+ln -s $(pwd)/bin ~/bin
+if [[ $OSTYPE == darwin* ]]; then
+    ~/bin/setup-usr-local.sh
+fi
 
+# install oh my zsh
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
+
+# delete existing dotfiles
+rm -rf ~/.bash_aliases 
+rm -rf ~/.gitconfig 
+rm -rf ~/.gitignore 
+rm -rf ~/.hushlogin 
+rm -rf ~/.vim 
+rm -rf ~/.vimrc 
+rm -rf ~/.zshrc 
+rm -rf ~/.oh-my-zsh/themes/tyrel.zsh-theme
+rm -rf ~/.pythonstartup.py
+# set Symlinks to configs
 ln -s $(pwd)/bash_aliases ~/.bash_aliases 
 ln -s $(pwd)/gitconfig ~/.gitconfig 
 ln -s $(pwd)/gitignore ~/.gitignore 
 ln -s $(pwd)/hushlogin ~/.hushlogin 
 ln -s $(pwd)/vim ~/.vim 
 ln -s $(pwd)/vimrc ~/.vimrc 
-ln -s ~/.config/nvim ~/.vim
-ln -s ~/.config/nvim/init.vim ~/.vimrc
 ln -s $(pwd)/zshrc ~/.zshrc 
 ln -s $(pwd)/tyrel.zsh-theme ~/.oh-my-zsh/themes/tyrel.zsh-theme
 ln -s $(pwd)/pythonstartup.py ~/.pythonstartup.py
 
+
 # cleanup fish config
 mkdir -p ~/.config/fish
 rm -rf ~/.config/fish
 ln -s $(pwd)/config/fish ~/.config/fish
 
-
 # Setup vim
 mkdir -p ~/.vim/bundle
 cd ~/.vim/bundle
diff --git a/bin/packages/homebrew-casks.txt b/bin/packages/homebrew-casks.txt
new file mode 100644
index 0000000..0618a3e
--- /dev/null
+++ b/bin/packages/homebrew-casks.txt
@@ -0,0 +1,3 @@
+macvim
+vagrant
+virtualbox
diff --git a/bin/packages/homebrew.txt b/bin/packages/homebrew.txt
new file mode 100644
index 0000000..617a718
--- /dev/null
+++ b/bin/packages/homebrew.txt
@@ -0,0 +1,22 @@
+ack
+awscli
+cli53
+gawk
+git
+gnu-sed
+graphviz
+homebrew/versions/gnupg21
+htop-osx
+mariadb
+mtr
+nmap
+openssl
+packer
+python
+reattach-to-user-namespace
+terraform
+tmux
+vim
+watch
+wget
+zsh-completions
diff --git a/bin/packages/pip.txt b/bin/packages/pip.txt
new file mode 100644
index 0000000..63e57ef
--- /dev/null
+++ b/bin/packages/pip.txt
@@ -0,0 +1,3 @@
+virtualenv
+virtualenv-clone
+virtualenvwrapper
diff --git a/bin/setup-usr-local.sh b/bin/setup-usr-local.sh
new file mode 100755
index 0000000..d898838
--- /dev/null
+++ b/bin/setup-usr-local.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+# Taken from Cayla Fauver https://cay.la/
+
+#rm -rf /usr/local/*
+
+test -d /usr/local/Homebrew || /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
+brew update
+
+while read homebrew; do
+    brew install ${homebrew}
+done < ~/bin/packages/homebrew.txt
+
+while read casks; do
+    brew cask install ${casks}
+done < ~/bin/packages/homebrew-casks.txt
+
+while read pips; do
+    pip install ${pips}
+done < ~/bin/packages/pip.txt
diff --git a/config/fish/functions/cg.fish b/config/fish/functions/cg.fish
new file mode 100644
index 0000000..9480c4d
--- /dev/null
+++ b/config/fish/functions/cg.fish
@@ -0,0 +1,4 @@
+function cg
+	set toplev (git rev-parse --show-toplevel)
+    cd $toplev
+end
diff --git a/config/fish/functions/dots.fish b/config/fish/functions/dots.fish
new file mode 100644
index 0000000..e8e5df3
--- /dev/null
+++ b/config/fish/functions/dots.fish
@@ -0,0 +1,3 @@
+function dots
+	cd ~/code/gitlab/tyrelsouza/dotfiles/
+end
diff --git a/zshrc b/zshrc
index 4ceabc6..d5bc34e 100644
--- a/zshrc
+++ b/zshrc
@@ -26,6 +26,9 @@ export WORKON_HOME=$HOME/.virtualenvs
 if [ -e $HOME/.local/bin/virtualenvwrapper.sh ];then
     source $HOME/.local/bin/virtualenvwrapper.sh
 fi
+if [ -e /usr/local/bin/virtualenvwrapper.sh ]; then
+    source /usr/local/bin/virtualenvwrapper.sh
+fi
 
 
 export PATH="$NPM_PACKAGES/bin:$GOPATH/bin:$HOME/bin:$PATH"