Merge branch 'master' of github.com:meatballhat/dotfiles

vimrc

@@ -34,6 +34,7 @@ let g:terraform_align = 1
 let g:terraform_fmt_on_save = 1
 let g:vim_markdown_folding_disabled = 1
 let g:vim_markdown_frontmatter = 1
+let g:yapf_style = "pep8"
 
 call pathogen#infect()
 

zshrc

@@ -27,6 +27,29 @@ COMPLETION_WAITING_DOTS="true"
 # much faster.
 # DISABLE_UNTRACKED_FILES_DIRTY="true"
 
+path=(
+  $HOME/bin
+  $HOME/go/bin
+  $HOME/.local/bin
+  $HOME/.cargo/bin
+  $HOME/.rbenv/bin
+  $HOME/.rbenv/shims
+  $HOME/.phpenv/bin
+  $HOME/.pyenv/bin
+  $HOME/perl5/bin
+  $HOME/code/trvs/bin
+  /usr/local/sbin
+  /usr/local/bin
+  /usr/bin/vendor_perl
+  /usr/sbin
+  /usr/bin
+  /sbin
+  /bin
+  /snap/bin
+  /usr/games
+  /usr/local/games
+)
+
 plugins=(
   archlinux
   autoenv
@@ -82,29 +105,6 @@ fi
 unsetopt correct_all
 bindkey '^R' history-incremental-search-backward
 
-path=(
-  $HOME/bin
-  $HOME/go/bin
-  $HOME/.local/bin
-  $HOME/.cargo/bin
-  $HOME/.rbenv/bin
-  $HOME/.rbenv/shims
-  $HOME/.phpenv/bin
-  $HOME/.pyenv/bin
-  $HOME/perl5/bin
-  $HOME/code/trvs/bin
-  /usr/local/sbin
-  /usr/local/bin
-  /usr/bin/vendor_perl
-  /usr/sbin
-  /usr/bin
-  /sbin
-  /bin
-  /snap/bin
-  /usr/games
-  /usr/local/games
-)
-
 if which pyenv >/dev/null; then
   eval "$(pyenv init - 2>/dev/null)"
 fi