From 66aad91e9ce1ed2ab1946daad005f846002dae90 Mon Sep 17 00:00:00 2001
From: Haak Saxberg <haak@zenpayroll.com>
Date: Wed, 2 Dec 2015 18:00:56 -0800
Subject: [PATCH] plugin cleanup

---
 vim-files/vim/ftplugin/python.vim |  1 -
 vim-files/vim/ftplugin/ruby.vim   |  3 ++
 vim-files/vimrc                   | 81 ++++++++++++++++++-------------
 3 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/vim-files/vim/ftplugin/python.vim b/vim-files/vim/ftplugin/python.vim
index 06325a0..21afdd6 100644
--- a/vim-files/vim/ftplugin/python.vim
+++ b/vim-files/vim/ftplugin/python.vim
@@ -1,4 +1,3 @@
-
 " Syntastic
 let g:syntastic_python_checkers = ['pyflakes', 'pep8', 'pep257']
 let g:syntastic_python_pep8_args='--ignore=E501'
diff --git a/vim-files/vim/ftplugin/ruby.vim b/vim-files/vim/ftplugin/ruby.vim
index c08990c..09d7fce 100644
--- a/vim-files/vim/ftplugin/ruby.vim
+++ b/vim-files/vim/ftplugin/ruby.vim
@@ -1,3 +1,6 @@
+" Syntastic
+let g:syntastic_ruby_checkers = ['rubocop']
+
 " vim-rspec mappings
 nnoremap <Leader>t :call RunCurrentSpecFile()<CR>
 nnoremap <Leader>s :call RunNearestSpec()<CR>
diff --git a/vim-files/vimrc b/vim-files/vimrc
index 2497147..0319e5b 100644
--- a/vim-files/vimrc
+++ b/vim-files/vimrc
@@ -12,34 +12,46 @@ call vundle#rc()
 " let Vundle manage Vundle, required
 Plugin 'gmarik/vundle'
 
-Plugin 'bling/vim-airline'
-Plugin 'tpope/vim-endwise'
-Plugin 'danro/rename.vim'
-Plugin 'pbrisbin/vim-mkdir'
-Plugin 'Lokaltog/vim-easymotion'
 Plugin 'tpope/vim-sensible'
-Plugin 'tpope/vim-eunuch'
-Plugin 'tpope/vim-fugitive'
-Plugin 'scrooloose/nerdtree'
-Plugin 'tomtom/tcomment_vim'
-Plugin 'tpope/vim-characterize'
-Plugin 'jonathanfilip/vim-lucius'
+
 Plugin 'nanotech/jellybeans.vim'
-Plugin 'majutsushi/tagbar'
+
+Plugin 'bling/vim-airline'
 Plugin 'bling/vim-bufferline'
-Plugin 'sjl/gundo.vim'
-Plugin 'SirVer/ultisnips'
-Plugin 'kien/ctrlp.vim'
-Plugin 'terryma/vim-multiple-cursors'
 Plugin 'myusuf3/numbers.vim'
 Plugin 'mhinz/vim-signify'
 Plugin 'nathanaelkane/vim-indent-guides'
+
+Plugin 'danro/rename.vim'
+Plugin 'pbrisbin/vim-mkdir'
+Plugin 'Lokaltog/vim-easymotion'
+Plugin 'tpope/vim-characterize'
 Plugin 'tpope/vim-surround'
-Plugin 'scrooloose/syntastic'
-Plugin 'christoomey/vim-tmux-navigator'
-Plugin 'Valloric/YouCompleteMe'
+Plugin 'terryma/vim-multiple-cursors'
+
+Plugin 'tpope/vim-eunuch'
+
+Plugin 'majutsushi/tagbar'
+Plugin 'SirVer/ultisnips'
+
+Plugin 'tpope/vim-fugitive'
+Plugin 'scrooloose/nerdtree'
+Plugin 'kien/ctrlp.vim'
+Plugin 'simnalamburt/vim-mundo'
 Plugin 'tpope/vim-rails'
-Plugin 'tpope/vim-rake'
+
+Plugin 'tpope/vim-endwise'
+
+Plugin 'scrooloose/syntastic'
+Plugin 'Valloric/YouCompleteMe'
+
+Plugin 'kchmck/vim-coffee-script'
+Plugin 'mtscout6/vim-cjsx'
+
+filetype plugin indent on     " required
+""" end vundle
+
+"""" PLUGIN SETTINGS
 
 " YouCompleteMe
 nnoremap K :YcmCompleter GoTo<CR>
@@ -47,18 +59,14 @@ nnoremap ˚ :YcmCompleter GoToDeclaration<CR>
 let g:ycm_goto_buffer_command = 'horizontal-split'
 let g:ycm_autoclose_preview_window_after_insertion = 1
 
-filetype plugin indent on     " required
-""" end vundle
-
-"""" PLUGIN SETTINGS
-"
-""" Easymotion
+" Easymotion
 map / <Plug>(easymotion-sn)
 omap / <Plug>(easymotion-tn)
 map n <Plug>(easymotion-next)
 map N <Plug>(easymotion-prev)
-let g:EasyMotion_landing_highlight = 1
-""" CtrlP
+let g:EasyMotion_landing_highlight = 0
+
+" CtrlP
 " Use The Silver Searcher https://github.com/ggreer/the_silver_searcher
 if executable('ag')
   " Use Ag over Grep
@@ -71,22 +79,30 @@ if executable('ag')
   let g:ctrlp_use_caching = 0
 endif
 
-""" Gundo
+" Gundo
 map <leader>u :GundoToggle<CR>
 
+" Indent guides
+let g:indent_guides_start_level = 2
+
+" Syntastic
+let g:syntastic_quiet_messages = {'level': []} " do NOT silence warnings
+let g:syntastic_aggregate_errors = 1
+
 """" END PLUGIN SETTINGS
 
 let mapleader=","
 set nobackup
 set noswapfile
 set pastetoggle=<F2>
+set shell=/bin/sh
 
 filetype on
 filetype plugin indent on
 syntax on
 
 try
-  colorscheme lucius
+  colorscheme jellybeans
 catch
   " deal with it
 endtry
@@ -99,11 +115,10 @@ set nocompatible
 set laststatus=2
 
 if v:version >= 703
-        "undo settings
+    "undo settings
     set undodir=~/.vim/undofiles
     set undofile
-
-    set colorcolumn=+1 "mark the ideal max text width
+    let &colorcolumn="80,".join(range(120,999), ",")
 endif