Cleans and fixes for mappings

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index 5ce3d57965845933decc73e23c4f237acb08a446..d7ca4078d281b5827cd4369ce23d3ccfa6fdeaf6 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -28,11 +28,6 @@ set wildignore+=*.o,*.obj,.git,*.rbc,*.class,.svn,vendor/gems/*
 " Status bar
 set laststatus=2
 
 " Status bar
 set laststatus=2
 

-" Without setting this, ZoomWin restores windows in a way that causes
-" equalalways behavior to be triggered the next time CommandT is used.
-" This is likely a bludgeon to solve some other issue, but it works
-set noequalalways
-

 " NERDTree configuration
 let NERDTreeIgnore=['\.pyc$', '\.rbc$', '\~$']
 map <Leader>n :NERDTreeToggle<CR>
 " NERDTree configuration
 let NERDTreeIgnore=['\.pyc$', '\.rbc$', '\~$']
 map <Leader>n :NERDTreeToggle<CR>


@@ -102,10 +97,6 @@ nmap <C-Down> ]e
 vmap <C-Up> [egv
 vmap <C-Down> ]egv
 
 vmap <C-Up> [egv
 vmap <C-Down> ]egv
 

-" Enable syntastic syntax checking
-let g:syntastic_enable_signs=1
-let g:syntastic_quiet_warnings=1
-

 " gist-vim defaults
 if has("mac")
   let g:gist_clip_command = 'pbcopy'
 " gist-vim defaults
 if has("mac")
   let g:gist_clip_command = 'pbcopy'


@@ -121,7 +112,7 @@ set modelines=10
 
 " Default color scheme
 set t_Co=256
 
 " Default color scheme
 set t_Co=256

-color railscasts
+color molokai

 
 " Directories for swp files
 set backupdir=~/.vim/.backup
 
 " Directories for swp files
 set backupdir=~/.vim/.backup


@@ -146,6 +137,7 @@ endif
 
 " Mapping for TagBar
 nmap <F8> :TagbarToggle<CR>
 
 " Mapping for TagBar
 nmap <F8> :TagbarToggle<CR>

+let g:tagbar_ctags_bin="/usr/local/bin/ctags"

 
 " Color Column
 set colorcolumn=81
 
 " Color Column
 set colorcolumn=81


@@ -160,4 +152,36 @@ set nofoldenable
 set foldlevel=1
 
 " powerline stuff
 set foldlevel=1
 
 " powerline stuff

-let g:Powerline_symbols = 'fancy'
+python from powerline.vim import setup as powerline_setup
+python powerline_setup()
+python del powerline_setup
+
+" Fix CtrlP root folder and add some ignores
+let g:ctrlp_working_path_mode = 0
+let g:ctrlp_custom_ignore = '\v[\/](\.(git|hg|svn)|node_modules|DS_Store)$'
+let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files']
+
+" Relative numbers
+autocmd FocusLost * :set norelativenumber
+autocmd InsertEnter * :set norelativenumber
+autocmd InsertLeave * :set relativenumber
+autocmd CursorMoved * :set relativenumber
+
+function! NumberToggle()
+  if(&relativenumber == 1)
+    set norelativenumber
+  else
+    set relativenumber
+  endif
+endfunction
+
+nnoremap <C-n> :call NumberToggle()<cr>
+
+" Syntastic stuff
+let g:syntastic_javascript_checkers = ['eslint']
+let g:syntastic_always_populate_loc_list = 1
+let g:syntastic_check_on_open = 1
+let g:syntastic_check_on_wq = 1
+let g:syntastic_error_symbol = "✕"
+let g:syntastic_warning_symbol = "⚠︎"
+let g:syntastic_quiet_messages = {'level': 'warnings'}