X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/e7d660189850fe76f512a5772e729005b40e6296..f2dfb1a5a17c8c94598d6ea26587923cd217f00e:/vimrc?ds=inline diff --git a/vimrc b/vimrc index 5ce3d57..2488bfc 100755 --- a/vimrc +++ b/vimrc @@ -28,11 +28,6 @@ set wildignore+=*.o,*.obj,.git,*.rbc,*.class,.svn,vendor/gems/* " 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 n :NERDTreeToggle @@ -102,10 +97,6 @@ nmap ]e vmap [egv vmap ]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' @@ -121,7 +112,7 @@ set modelines=10 " Default color scheme set t_Co=256 -color railscasts +color molokai " Directories for swp files set backupdir=~/.vim/.backup @@ -146,9 +137,10 @@ endif " Mapping for TagBar nmap :TagbarToggle +let g:tagbar_ctags_bin="/usr/local/bin/ctags" " Color Column -set colorcolumn=81 +let &colorcolumn="80,150" " Add Pathogen call pathogen#infect() @@ -160,4 +152,35 @@ set nofoldenable 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 :call NumberToggle() + +" 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 = "⚠︎"