From 5b679cc27f700f06307ff672ae34f8e3d2472018 Mon Sep 17 00:00:00 2001
From: Eric Siegel <siegel.eric@gmail.com>
Date: Fri, 3 Apr 2015 17:57:33 -0700
Subject: [PATCH] more changes

---
 bundle/vundle                          |   2 +-
 local_config/after/ftplugin/coffee.vim |   6 +--
 local_config/after/ftplugin/ruby.vim   |   4 ++
 spell/en.utf-8.add                     |   3 ++
 spell/en.utf-8.add.spl                 | Bin 181 -> 220 bytes
 vimrc                                  |  49 +++++++++++++++++++++----
 6 files changed, 52 insertions(+), 12 deletions(-)
 create mode 100644 local_config/after/ftplugin/ruby.vim

diff --git a/bundle/vundle b/bundle/vundle
index 0b28e33..a864467 160000
--- a/bundle/vundle
+++ b/bundle/vundle
@@ -1 +1 @@
-Subproject commit 0b28e334e65b6628b0a61c412fcb45204a2f2bab
+Subproject commit a864467285fc419c5f652c740137fbfb8ffeaa32
diff --git a/local_config/after/ftplugin/coffee.vim b/local_config/after/ftplugin/coffee.vim
index a176fd3..30b8c97 100644
--- a/local_config/after/ftplugin/coffee.vim
+++ b/local_config/after/ftplugin/coffee.vim
@@ -1,7 +1,7 @@
 setlocal expandtab
-setlocal tabstop=4
-setlocal softtabstop=4
-setlocal shiftwidth=4
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal shiftwidth=2
 
 if executable('coffeetags')
      let g:tagbar_type_coffee = {
diff --git a/local_config/after/ftplugin/ruby.vim b/local_config/after/ftplugin/ruby.vim
new file mode 100644
index 0000000..71c3c00
--- /dev/null
+++ b/local_config/after/ftplugin/ruby.vim
@@ -0,0 +1,4 @@
+setlocal expandtab
+setlocal tabstop=2
+setlocal softtabstop=2
+setlocal shiftwidth=2
diff --git a/spell/en.utf-8.add b/spell/en.utf-8.add
index d047b47..a63aada 100644
--- a/spell/en.utf-8.add
+++ b/spell/en.utf-8.add
@@ -7,3 +7,6 @@ buildable
 Inkdrop
 gradle
 OpenGL
+aliquoted
+barcode
+barcodes
diff --git a/spell/en.utf-8.add.spl b/spell/en.utf-8.add.spl
index f30a14680b650be004258a429f2f00238e5d7bd1..e47a2d16afd2b5688de9aeb8c66e32432868fd5a 100644
GIT binary patch
literal 220
zcmYL@I}XAy5JY!Y6f_(l*FfS72#JU;y@MUg!ihsZ(9&{h7+Xj*Ywh!!(Ke@g9$k$4
zkBGdtrtN%4%L5SscdSTQ;9wzYR!q1OSU44kR5P8()u82@iDP0QnaBe2|4_KsFrkBP
z$mty{`K@>fBUCvYk!Ov*@I=tqGfdT{QV`J-8y1s|j<;5NX@0RI&JfgpVV4DwFY9k8
Aj{pDw

delta 94
zcmcb^xRp^O%+t5HAT=k)=syDkLl%2dT6$)FNf~1)V<uw`V+vy;V-k=~Wn`G>FD59F
p&Xifin8wJ&0u*OtU=W#DrX}i{4`NE>Fy=Cr1BHt~yugWD)d8AX73u&0

diff --git a/vimrc b/vimrc
index 046dd18..c9d4f74 100644
--- a/vimrc
+++ b/vimrc
@@ -3,6 +3,7 @@
 let UNKNOWN_MACHINE = 0
 let HOME_LAPTOP     = 1
 let HOME_DESKTOP    = 2
+let WORK_LAPTOP     = 3
 
 function! CurrentMachine()
    let hostname = hostname()
@@ -11,6 +12,8 @@ function! CurrentMachine()
       return g:HOME_LAPTOP
    elseif hostname == "emachine"
       return g:HOME_DESKTOP
+   elseif hostname == "etrans"
+      return g:WORK_LAPTOP
    else
       return g:UNKNOWN_MACHINE
    endif
@@ -24,6 +27,9 @@ if MACHINE == HOME_LAPTOP
 elseif MACHINE == HOME_DESKTOP
     let vimHome="/home/eric/.vim"
     let tmpDir="/home/eric/code/.tmpvim"
+elseif MACHINE == WORK_LAPTOP
+    let vimHome="/Users/eric/.vim"
+    let tmpDir=vimHome."/.tmpvim"
 else
     let vimHome="~/.vim"
     let tmpDir="/tmp"
@@ -79,6 +85,7 @@ Bundle 'mileszs/ack.vim'
 Bundle 'msanders/cocoa.vim'
 Bundle 'nsf/gocode', {'rtp': 'vim/'}
 Bundle 'riobard/scala.vim'
+Bundle 'rking/ag.vim'
 Bundle 'rosenfeld/conque-term'
 Bundle 'scrooloose/nerdcommenter'
 Bundle 'scrooloose/nerdtree'
@@ -141,9 +148,9 @@ set smartindent
 
 "tab = 3 spaces "indent spaces = 3 and tab to spaces
 set expandtab
-set tabstop=3
-set softtabstop=3
-set shiftwidth=3
+set tabstop=2
+set softtabstop=2
+set shiftwidth=2
 
 "allowing backspace to work after indent -> see :help i_backspacing
 set backspace=indent,eol,start
@@ -195,7 +202,7 @@ set virtualedit=block
 set laststatus=2
 
 "Necessary to show unicode glyphs
-set encoding=utf-8 " Necessary to show unicode glyphs
+set encoding=utf-8 " necessary to show unicode glyphs
 
 "Setup backup location and enable
 let &backupdir=tmpDir . "/backup"
@@ -370,6 +377,27 @@ if executable('hasktags')
      \ 'ctagsargs' : '-sort -silent'
      \ }
 
+if executable('donotload_coffeetags')
+  let g:tagbar_type_coffee = {
+    \ 'ctagsbin' : 'coffeetags',
+    \ 'ctagsargs' : '',
+    \ 'kinds' : [
+      \ 'b:block',
+      \ 'c:class',
+      \ 'f:function',
+      \ 'o:object',
+      \ 'p:proto',
+      \ 'v:var',
+    \ ],
+    \ 'sro' : ".",
+    \ 'kind2scope' : {
+      \ 'c' : 'class',
+      \ 'f' : 'function',
+      \ 'o' : 'object',
+    \ }
+  \ }
+endif
+
 " }}}
 
 """""""""""""""""""""""""""Clojure""""""""""""""""""""""""""""" {{{
@@ -392,6 +420,9 @@ let g:syntastic_mode_map = { 'mode': 'active',
 let g:syntastic_python_flake8_args = "--max-line-length=99 " .
                                     \"--ignore=E203,E221,E241,E272,W404,W801"
 
+"ruby
+let g:syntastic_ruby_checkers = ['rubocop']
+
 " Show syntastic error map
 nnoremap <leader>e :Errors<cr>
 
@@ -666,11 +697,11 @@ nnoremap <leader>W mz:%s/\s\+$//g<cr>:w<cr>`z
 "
 """""""""""" viw<leader>g , <leader>g4w, <leader>gt;, <leader>gi[
 
-nnoremap <leader>g :set operatorfunc=<SID>AckOperator<cr>g@
-vnoremap <leader>g :<c-u>call <SID>AckOperator(visualmode())<cr>
+nnoremap <leader>g :set operatorfunc=<SID>AgOperator<cr>g@
+vnoremap <leader>g :<c-u>call <SID>AgOperator(visualmode())<cr>
 
 " argument is the type of selection (characterwise, linewise, or block)
-function! s:AckOperator(type)
+function! s:AgOperator(type)
    " Save the unamed register
    let saved_register = @@
 
@@ -684,7 +715,7 @@ function! s:AckOperator(type)
    endif
 
    " Copy shellescaped values from unnamed register
-   silent execute "Ack! " . shellescape(@@)
+   silent execute "Ag! " . shellescape(@@)
 
    let @@ = saved_register
 endfunction
@@ -750,6 +781,8 @@ let g:ctrlp_extensions = ['buffertag',
                          \'funky',
                          \'quickfix',
                          \'tag']
+let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
+let g:ctrlp_use_caching = 0
 
 " map to open MRU mode
 nnoremap <leader>b :CtrlPBuffer<CR>