Plugin updates

robmiller · Jun 15, 2015 · db0e8c7 · db0e8c7
1 parent bb910fc
commit db0e8c7
Show file tree

Hide file tree

Showing 39 changed files with 82 additions and 38 deletions.
diff --git a/oh-my-zsh b/oh-my-zsh
diff --git a/vim/bundle/ack.vim b/vim/bundle/ack.vim
diff --git a/vim/bundle/csv.vim b/vim/bundle/csv.vim
diff --git a/vim/bundle/php-indenting-for-vim b/vim/bundle/php-indenting-for-vim
diff --git a/vim/bundle/php-syntax b/vim/bundle/php-syntax
diff --git a/vim/bundle/rust.vim b/vim/bundle/rust.vim
diff --git a/vim/bundle/splitjoin b/vim/bundle/splitjoin
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
diff --git a/vim/bundle/tcomment b/vim/bundle/tcomment
diff --git a/vim/bundle/vim-abolish b/vim/bundle/vim-abolish
diff --git a/vim/bundle/vim-airline b/vim/bundle/vim-airline
diff --git a/vim/bundle/vim-bundler b/vim/bundle/vim-bundler
diff --git a/vim/bundle/vim-clojure-static b/vim/bundle/vim-clojure-static
diff --git a/vim/bundle/vim-commentary b/vim/bundle/vim-commentary
diff --git a/vim/bundle/vim-cucumber b/vim/bundle/vim-cucumber
diff --git a/vim/bundle/vim-dispatch b/vim/bundle/vim-dispatch
diff --git a/vim/bundle/vim-easymotion b/vim/bundle/vim-easymotion
diff --git a/vim/bundle/vim-endwise b/vim/bundle/vim-endwise
diff --git a/vim/bundle/vim-eunuch b/vim/bundle/vim-eunuch
diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive
diff --git a/vim/bundle/vim-haml b/vim/bundle/vim-haml
diff --git a/vim/bundle/vim-markdown b/vim/bundle/vim-markdown
diff --git a/vim/bundle/vim-ragtag b/vim/bundle/vim-ragtag
diff --git a/vim/bundle/vim-rails b/vim/bundle/vim-rails
diff --git a/vim/bundle/vim-rake b/vim/bundle/vim-rake
diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat
diff --git a/vim/bundle/vim-ruby b/vim/bundle/vim-ruby
diff --git a/vim/bundle/vim-scriptease b/vim/bundle/vim-scriptease
diff --git a/vim/bundle/vim-signify b/vim/bundle/vim-signify
diff --git a/vim/bundle/vim-sneak b/vim/bundle/vim-sneak
diff --git a/vim/bundle/vim-speeddating b/vim/bundle/vim-speeddating
diff --git a/vim/bundle/vim-surround b/vim/bundle/vim-surround
diff --git a/vim/bundle/vim-textobj-user b/vim/bundle/vim-textobj-user
diff --git a/vim/bundle/vim-unimpaired b/vim/bundle/vim-unimpaired
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
@@ -107,3 +107,14 @@ Instagram
 refactoring
 refactored
 wireframes
+CRM
+isn
+lexing
+Parslet
+we’d
+isn’t
+simplicity’s
+’s
+ve
+RTF
+freeform
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
diff --git a/vimrc b/vimrc
@@ -210,11 +210,31 @@ autocmd FileType vcl
     \ setlocal expandtab |
     \ setlocal smarttab
 
+autocmd FileType liquid
+    \ setlocal shiftwidth=2 |
+    \ setlocal tabstop=2 |
+    \ setlocal expandtab |
+    \ setlocal smarttab
+
+autocmd FileType pml
+    \ setlocal shiftwidth=2 |
+    \ setlocal tabstop=2 |
+    \ setlocal expandtab |
+    \ setlocal smarttab
+
 " Plugin-specific stuff
 
+" Smart quotes
+augroup textobj_quote
+  autocmd!
+  autocmd FileType markdown call textobj#quote#init()
+  autocmd FileType pml      call textobj#quote#init()
+  autocmd FileType text     call textobj#quote#init({'educate': 0})
+augroup END
+
 " Ctrl-P config
 " comma-r to activate most recently used files mode
-nnoremap <leader>r :CtrlPMRUFiles<CR>
+nnoremap <leader>t :CtrlPMRUFiles<CR>
 " enable ctrlp-funky extension
 let g:ctrp_extensions = ['funky']
 " comma-f to activate the function list
@@ -313,6 +333,10 @@ nnoremap gp `[v`]
 nnoremap <Leader>p :set paste<CR>o<esc>"*]p:set nopaste<cr>
 " Word count current file
 nnoremap <Leader>c :!wc -w '%'<CR>
+" Strip inner whitespace in XML tags
+autocmd FileType xml,pml nnoremap <Leader>t vitgeOWxvitp
+" Convert hashrocket hash to new-style Ruby one
+autocmd FileType ruby nnoremap <Leader>h f:xf=gea:<ESC>f=3x
 
 " Leader commands for blogging
 function LiquidLeaders()

diff --git a/zsh-syntax-highlighting b/zsh-syntax-highlighting
diff --git a/zshrc b/zshrc
@@ -47,7 +47,7 @@ function strip_trailing_whitespace() {
 
 # Count the significant lines of code in the current directory.
 function sloc() {
-	grep -v '^$' **.(js|php) | grep -v '//' | wc -l
+	grep -v '^$' **/*.(js|php|rb) | grep -v '//' | wc -l
 }
 
 # Copy the last-run command to the clipboard
@@ -91,6 +91,9 @@ alias lsl="ls -ahl"
 alias lsd="ls -ld *(-/DN)"
 alias ls-today="ls *(m-1)"
 
+alias cruby="/opt/chefdk/embedded/bin/ruby"
+alias start-chef="eval '$(chef shell-init zsh)'"
+
 eval "$(hub alias -s)"
 
 [[ -f /usr/local/bin/ctags ]] && alias ctags="/usr/local/bin/ctags"
@@ -126,8 +129,12 @@ export EDITOR='vim'
 
 [[ -e $HOME/dotfiles/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh ]] && source $HOME/dotfiles/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
 
+export JAVA_HOME=`/usr/libexec/java_home -v 1.6`
+
+DEFAULT_PATH=$PATH
+
 # Standard binaries
-PATH=~/bin:/usr/local/bin:/usr/bin:/bin
+PATH=~/bin:~/dotfiles/bin:/usr/local/bin:/usr/bin:/bin
 # System binaries
 PATH+=:/usr/local/sbin:/usr/sbin:/sbin
 # RVM, the Ruby Version Manager
@@ -146,6 +153,8 @@ PATH+=:~/pear/bin
 PATH+=:/usr/local/share/python
 # npm-installed binaries
 PATH+=:/usr/local/share/npm/bin
+# Whatever the path was originally set to
+PATH+=:$DEFAULT_PATH
 
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
 [[ -s "/usr/local/rvm/scripts/rvm" ]] && . "/usr/local/rvm/scripts/rvm"