improved zsh and vim configs

Author: nickforddev

vimrc

@@ -149,7 +149,7 @@ let g:rehash256 = 1
 
 " Set colors
 set background=dark
-colorscheme gruvbox
+colorscheme onedark
 
 " Add a more detailed theme for airline
 let g:airline_theme = 'tomorrow'
@@ -192,6 +192,8 @@ let g:go_fmt_command = "goimports"
 " Play nice with YCM
 " let g:UltiSnipsJumpForwardTrigger="<tab>"
 " let g:UltiSnipsListSnippets="<c-e>"
+"
+let g:ycm_server_python_interpreter = '/usr/local/bin/python'
 
 " Use AG
 let g:ackprg = 'ag --nogroup --nocolor --column'
@@ -233,11 +235,18 @@ let g:is_bash=1
 " Vitality
 let g:always_assume_iterm = 0
 
+let g:ale_linters = {
+  \ 'javascript': ['standard'],
+\}
+
+let g:ale_sign_column_always = 1
+let g:airline#extensions#ale#enabled = 1
+
 " Enable syntastic syntax checking
-let g:syntastic_enable_signs   = 1
+"let g:syntastic_enable_signs   = 1
 
 " Turn off jslint errors by default
-let g:JSLintHighlightErrorLine = 0
+" let g:JSLintHighlightErrorLine = 0
 
 " Stop netrw
 let g:netrw_silent = 1

vimrc.bundles

@@ -8,9 +8,11 @@ Plugin 'kien/ctrlp.vim'
 Plugin 'bling/vim-airline.git'
 Plugin 'mileszs/ack.vim'
 Plugin 'Raimondi/delimitMate'
-Plugin 'pangloss/vim-javascript'
+" Plugin 'pangloss/vim-javascript'
+Plugin 'isRuslan/vim-es6'
 Plugin 'tpope/vim-commentary'
-Plugin 'scrooloose/syntastic'
+" Plugin 'scrooloose/syntastic'
+Plugin 'w0rp/ale'
 Plugin 'tpope/vim-fugitive'
 Plugin 'godlygeek/tabular'
 Plugin 'tpope/vim-surround'
@@ -33,3 +35,5 @@ Plugin 'tpope/vim-sleuth'
 Plugin 'morhetz/gruvbox'
 Plugin 'mattn/emmet-vim'
 Plugin 'airblade/vim-gitgutter'
+Plugin 'joshdick/onedark.vim'
+Plugin 'posva/vim-vue'

zshrc

@@ -1,16 +1,20 @@
-
 # path to oh-my-zsh installation
 export ZSH=~/.oh-my-zsh
 
 # set name of the theme to load
 ZSH_THEME="powerlevel9k/powerlevel9k"
 
+# Power Level 9K settings
+# https://github.com/bhilburn/powerlevel9k#available-prompt-segments
+POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(context dir)
+POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=(status vcs virtualenv)
+
 # command auto-correction
 ENABLE_CORRECTION="true"
 
 # plugins 
 # https://github.com/robbyrussell/oh-my-zsh/wiki/plugins
-plugins=(brew git jsontools pip python sudo)
+plugins=(brew git jsontools pip python sudo virtualenv)
 
 # user path
 export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
@@ -29,4 +33,14 @@ alias vrcb='vim ~/.vimrc.bundles'
 alias vrcbl='vim ~/.vimrc.bundles.local'
 
 # get aliases and stuff from local
-source ~/.zshrc.local
+source ~/.zshrc.local
+
+# export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
+
+# android sdk
+export ANDROID_HOME=/Users/nick/Library/Android/sdk
+export PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
+
+[[ -s "$HOME/.rvm/scripts/rvm"  ]] && . "$HOME/.rvm/scripts/rvm"
+
+unsetopt correct_all

zshrc.local

@@ -1,2 +1,19 @@
+# plutus project
+alias plutus_run='cd ~/Sites/plutus/; source env/bin/activate; python run.py'
 
-" Put your local zsh settings here
+alias chrome_nocors='open -a Google\ Chrome --args --disable-web-security'
+
+alias pluterrlog='tail -f ~/Sites/plutus/logs/apache_error.log'
+alias plutacclog='tail -f ~/Sites/plutus/logs/apache_access.log'
+alias plutdeflog='tail -f ~/Sites/plutus/logs/default.log'
+
+alias plutus_db_drop='~/sites/plutus; mongo baseclass --eval "db.dropDatabase()"'
+alias plutus_db_restore='~/sites/plutus; mongorestore --dir dump/db/baseclass --db baseclass'
+
+alias plutus_build='r.js -o static/js/build.js'
+
+alias arestart='sudo apachectl restart'
+
+alias cdp='cd ~/sites/plutus'
+
+source ~/.iterm2_shell_integration.zsh