Dropped bin directory, renamed zsh

This commit is contained in:
Josh Sherman 2016-10-09 22:41:07 -05:00
parent 50a1fe9c94
commit 16a39b13f0
2 changed files with 6 additions and 16 deletions

11
bin/vim
View file

@ -1,11 +0,0 @@
#!/usr/bin/env bash
if [[ `ps -o stat= -p $PPID` == *"s"* ]]; then
echo ""
echo -e "\e[1;31mUse the alias \`v\`\e[0m"
echo -e "\e[1;31m(╯°□°)╯︵ ɯıʌ\e[0m"
exit 1;
else
/usr/local/bin/vim $@
fi

View file

@ -57,8 +57,7 @@ function uuid() {
}
# Vim aliases
# TODO: Broken in Linux
#alias v="/usr/local/bin/vim"
alias v="vim"
alias vd="vimdiff"
# Inf
@ -83,11 +82,13 @@ export NODE_ENV=development
# [ -z "$TMUX" ] && export TERM=xterm-256color && exec tmux
# Need to run this conditionally based on the tmux environment
export NVM_DIR=~/.nvm
source $(brew --prefix nvm)/nvm.sh
# TODO Barks on Linux
# export NVM_DIR=~/.nvm
# source $(brew --prefix nvm)/nvm.sh
# Need to run this conditionally on OSX
source "`brew --prefix`/etc/grc.bashrc"
# TODO: Barks on Linux
# source "`brew --prefix`/etc/grc.bashrc"
# Need to run this conditionally based on the environment (I think OSX specific)
export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting