Update

.gvimrc

@@ -1 +1,8 @@
-colorscheme slate
+set guifont=SF\ Mono:h13
+set linespace=3
+
+if has("gui_macvim")
+	macmenu &File.Open\.\.\. key=<nop>
+	nnoremap <D-o> :Files<CR>
+endif
+

.vimrc

@@ -1,5 +1,61 @@
-inoremap jk <ESC>
+set nocompatible
+filetype off
+
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+
+Plugin 'VundleVim/Vundle.vim'
+Plugin 'tpope/vim-sensible'
+Plugin 'scrooloose/nerdtree'
+Plugin 'danilo-augusto/vim-afterglow'
+Plugin 'junegunn/fzf.vim'
+Plugin 'ycm-core/YouCompleteMe'
+Plugin 'elixir-editors/vim-elixir'
+Plugin 'slashmili/alchemist.vim'
+Plugin 'mattn/emmet-vim'
+Plugin 'scrooloose/nerdcommenter'
+Plugin 'tpope/vim-fugitive'
+Plugin 'jeffkreeftmeijer/vim-numbertoggle'
+Plugin 'mhinz/vim-mix-format'
+
+call vundle#end()
+
+set rtp+=/usr/local/opt/fzf
+
+map <C-n> :NERDTreeToggle<CR>
+nnoremap K :YcmCompleter GoTo<CR>
+nnoremap <D-r> :YcmCompleter RefactorRename 
+
+nnoremap <D-o> :Files<CR>
 
 filetype plugin indent on
 syntax on
+colorscheme afterglow
+set autoindent
+set hlsearch
+set number
+set relativenumber
+set shiftwidth=4
+set tabstop=4
+set scrolloff=5
+set sidescrolloff=5
+set ignorecase
+set smartcase
+
+let g:mapleader=","
+let g:mix_format_on_save = 1
+let g:NERDDefaultAlign = 'left'
+let g:NERDCommentEmptyLines = 1
+
 autocmd BufNewFile,BufRead *.md setlocal ft=markdown
+autocmd FileType elixir setlocal shiftwidth=2 tabstop=2
+
+" Add optional packages.
+"
+" The matchit plugin makes the % command work better, but it is not backwards
+" compatible.
+" The ! means the package won't be loaded right away but when plugins are
+" loaded during initialization.
+if has('syntax') && has('eval')
+  packadd! matchit
+endif

.zshrc

@@ -9,6 +9,9 @@ source $ZSH/oh-my-zsh.sh
 # Use Homebrew bin before defaults
 export PATH="/usr/local/bin:$PATH"
 
+# Use ~/bin
+export PATH="/Users/shadowfacts/bin:$PATH"
+
 # command line tools
 alias fuck='$(thefuck $(fc -ln -1))'
 
@@ -19,30 +22,51 @@ alias git=hub
 alias python=python3
 alias pip=pip3
 
-alias oldruby="/usr/local/bin/ruby"
-alias ruby="/usr/local/Cellar/ruby/2.3.1/bin/ruby"
+alias oldruby="/usr/bin/ruby"
+alias ruby="/usr/local/opt/ruby/bin/ruby"
+
+# Erlang/Elixir persistent shell history
+export ERL_AFLAGS="-kernel shell_history enabled"
 
 # lazily load nvm
-export NVM_DIR=~/.nvm
+# export NVM_DIR=~/.nvm
 #. $(brew --prefix nvm)/nvm.sh
 
-nvm() {
-	unset -f nvm
-	. $(brew --prefix nvm)/nvm.sh
-	nvm "$@"
-}
+# nvm() {
+# 	unset -f nvm
+# 	unset -f node
+# 	unset -f npm
+# 	unset -f yarn
+# 	. $(brew --prefix nvm)/nvm.sh
+# 	nvm "$@"
+# }
 
-node() {
-	unset -f node
-	. $(brew --prefix nvm)/nvm.sh
-	node "$@"
-}
+# node() {
+# 	unset -f nvm
+# 	unset -f node
+# 	unset -f npm
+# 	unset -f yarn
+# 	. $(brew --prefix nvm)/nvm.sh
+# 	node "$@"
+# }
 
-npm() {
-	unset -f npm
-	. $(brew --prefix nvm)/nvm.sh
-	npm "$@"
-}
+# npm() {
+# 	unset -f nvm
+# 	unset -f node
+# 	unset -f npm
+# 	unset -f yarn
+# 	. $(brew --prefix nvm)/nvm.sh
+# 	npm "$@"
+# }
+
+# yarn() {
+# 	unset -f nvm
+# 	unset -f node
+# 	unset -f npm
+# 	unset -f yarn
+# 	. $(brew --prefix nvm)/nvm.sh
+# 	yarn "$@"
+# }
 
 # Go up N directories
 up() {
@@ -85,3 +109,4 @@ ca() {
 
 # default file openings
 alias -s ipr=open
+alias -s xcodeproj=open