From 0b10b22dd214f20f07de2c44a1ad54be2edd2d28 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Tue, 22 Nov 2016 11:45:31 -0500
Subject: [PATCH 1/2] add ipa for getting ip addr

---
 zshrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zshrc b/zshrc
index f26a96d..52c26c0 100644
--- a/zshrc
+++ b/zshrc
@@ -46,6 +46,9 @@ export MP_FULLNAME="Tyrel Souza"
 function adg () {
     workon addgene-core
 }
+function ipa(){
+    ifconfig | grep inet
+}
 function cpbr () {
     if branch=$(git symbolic-ref --short -q HEAD)
     then

From ee244c8aad55f23a7250a8ce0920712439f63f10 Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Thu, 2 Feb 2017 14:13:37 -0500
Subject: [PATCH 2/2] Merge branch 'master' of gitlab.com:tyrelsouza/dotfiles

---
 INSTALL.sh       |  1 +
 bash_aliases     | 25 +++++++------------------
 gitignore        |  1 +
 pythonstartup.py |  3 +++
 vimrc            |  2 ++
 zshrc            |  1 +
 6 files changed, 15 insertions(+), 18 deletions(-)
 create mode 100644 pythonstartup.py

diff --git a/INSTALL.sh b/INSTALL.sh
index 928c288..cc9dd82 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -10,6 +10,7 @@ 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
 
 # Setup vim
 mkdir -p ~/.vim/bundle
diff --git a/bash_aliases b/bash_aliases
index 0c6fc6a..f028d93 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -1,20 +1,3 @@
-alias nginx.start='sudo launchctl load /Library/LaunchDaemons/homebrew.mxcl.nginx.plist'
-alias nginx.stop='sudo launchctl unload /Library/LaunchDaemons/homebrew.mxcl.nginx.plist'
-alias nginx.restart='nginx.stop && nginx.start'
-alias php-fpm.start="launchctl load -w ~/Library/LaunchAgents/homebrew.mxcl.php56.plist"
-alias php-fpm.stop="launchctl unload -w ~/Library/LaunchAgents/homebrew.mxcl.php56.plist"
-alias php-fpm.restart='php-fpm.stop && php-fpm.start'
-alias mysql.start="launchctl load -w ~/Library/LaunchAgents/homebrew.mxcl.mysql.plist"
-alias mysql.stop="launchctl unload -w ~/Library/LaunchAgents/homebrew.mxcl.mysql.plist"
-alias mysql.restart='mysql.stop && mysql.start'
-alias nginx.logs.error='tail -250f /usr/local/etc/nginx/logs/error.log'
-alias nginx.logs.access='tail -250f /usr/local/etc/nginx/logs/access.log'
-alias nginx.logs.default.access='tail -250f /usr/local/etc/nginx/logs/default.access.log'
-alias nginx.logs.default-ssl.access='tail -250f /usr/local/etc/nginx/logs/default-ssl.access.log'
-alias nginx.logs.phpmyadmin.error='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.error.log'
-alias nginx.logs.phpmyadmin.access='tail -250f /usr/local/etc/nginx/logs/phpmyadmin.access.log'
-function gi() { curl -L -s https://www.gitignore.io/api/$@ ;}
-function glate(){git for-each-ref --sort=-committerdate refs/heads/ --format='%(refname) %(committerdate) %(authorname)' | sed 's/refs\/heads\///g';}
 export HOMEBREW_GITHUB_API_TOKEN="caf4cd85c6eb6ddcf006d4571d4a294c0b0592e4"
 alias ag='\ag --pager="less"'
 alias cg='cd "$(git rev-parse --show-toplevel)"'
@@ -22,9 +5,15 @@ alias fuck='eval $(thefuck $(fc -ln -1)); history -r'
 alias g='git'
 alias pdb="python -m pdb"
 alias ppjson="python -m json.tool"
-alias rm=trash
 
 # Addgene specific
 alias adocs='cd $ADDGENE_CORE_REPO_DIR/docs && make html && open $ADDGENE_CORE_REPO_DIR/docs/build/html/index.html'
 alias deploy_all="fab -R silver-web deploy:master &&  fab -R gold-web deploy:master && fab -R jupyter fab -R jupyter deploy_jupyter && fab --parallel avail_staging_hosts deploy:master"
 alias deploy_all_migration="fab -R silver-web deploy:master,1 &&  fab -R gold-web deploy:master,1 && fab -R jupyter deploy_jupyter & fab --parallel avail_staging_hosts deploy:master,1"
+alias aenv='env | sort | grep ADDGENE'
+alias sl='source local.env'
+unalias mysql
+
+if [[ $OSTYPE == darwin* ]]; then
+    alias rm=trash;
+fi;
diff --git a/gitignore b/gitignore
index b418965..d3ef2b0 100644
--- a/gitignore
+++ b/gitignore
@@ -11,3 +11,4 @@ tmp/**/*
 !tmp/cache/.keep
 .pre-commit-config.yaml
 .ruby-version
+release_package.sh
diff --git a/pythonstartup.py b/pythonstartup.py
new file mode 100644
index 0000000..ed6f9f8
--- /dev/null
+++ b/pythonstartup.py
@@ -0,0 +1,3 @@
+import sys
+import pprint
+sys.displayhook = pprint.pprint
diff --git a/vimrc b/vimrc
index 5d4bf4f..e06f4f3 100644
--- a/vimrc
+++ b/vimrc
@@ -114,3 +114,5 @@ if filereadable($HOME . "/.vimrc.local")
   source ~/.vimrc.local
 endif
 set background=dark
+let NERDTreeIgnore = ['\.pyc$']
+
diff --git a/zshrc b/zshrc
index b850a5b..16feb6e 100644
--- a/zshrc
+++ b/zshrc
@@ -72,3 +72,4 @@ source $HOME/.profile
 if [ -e $HOME/.credentials ];then
 	source $HOME/.credentials
 fi
+export PYTHONSTARTUP=$HOME/.pythonstartup.py