X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/162b65d8624bac4e04a3ac6ccd46ce7e8975fb81..f7a3f46f8c0f2a6ae4ec8a2c284a8ac3e2b7cde3:/vimrc?ds=inline

diff --git a/vimrc b/vimrc
index 8b575bc..62a82d7 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 <Leader>n :NERDTreeToggle<CR>
@@ -75,11 +70,15 @@ au BufRead,BufNewFile *.txt call s:setupWrapping()
 " make Python follow PEP8 ( http://www.python.org/dev/peps/pep-0008/ )
 au FileType python set softtabstop=4 tabstop=4 shiftwidth=4 textwidth=79
 
+" snes syntax highlighting
+au BufNewFile,BufRead *.asm,*.s set filetype=snes"
+
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start
 
 " load the plugin and indent settings for the detected filetype
 filetype plugin indent on
+filetype plugin on
 
 " Opens an edit command with the path of the currently edited file filled in
 " Normal mode: <Leader>e
@@ -101,10 +100,6 @@ nmap <C-Down> ]e
 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'
@@ -120,7 +115,7 @@ set modelines=10
 
 " Default color scheme
 set t_Co=256
-color railscasts
+color molokai
 
 " Directories for swp files
 set backupdir=~/.vim/.backup
@@ -145,9 +140,10 @@ endif
 
 " Mapping for TagBar
 nmap <F8> :TagbarToggle<CR>
+let g:tagbar_ctags_bin="/usr/local/bin/ctags"
 
 " Color Column
-set colorcolumn=81
+let &colorcolumn="80,150"
 
 " Add Pathogen
 call pathogen#infect()
@@ -159,7 +155,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 <C-n> :call NumberToggle()<cr>
 
-" node cleaning
-let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git'
+" 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 = "⚠︎"