X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/ac89930a9876f526b08748a0a21a1c29ce26533e..ac88944771c9006d4299ab8f8d54a4ff0555d099:/vimrc

diff --git a/vimrc b/vimrc
index bc9d40b..1eefa87 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,6 +70,9 @@ 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
 
@@ -90,10 +88,6 @@ map <Leader>e :e <C-R>=expand("%:p:h") . "/" <CR>
 " Normal mode: <Leader>t
 map <Leader>te :tabe <C-R>=expand("%:p:h") . "/" <CR>
 
-" Inserts the path of the currently edited file into a command
-" Command mode: Ctrl+P
-cmap <C-P> <C-R>=expand("%:p:h") . "/" <CR>
-
 " Unimpaired configuration
 " Bubble single lines
 nmap <C-Up> [e
@@ -102,10 +96,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'
@@ -149,7 +139,7 @@ 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()
@@ -160,23 +150,20 @@ set foldnestmax=10
 set nofoldenable
 set foldlevel=1
 
-" powerline stuff
-set rtp+=~/Library/Python/2.7/lib/python/site-packages/powerline/bindings/vim
-
 " 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 number
-autocmd InsertEnter * :set number
+autocmd FocusLost * :set norelativenumber
+autocmd InsertEnter * :set norelativenumber
 autocmd InsertLeave * :set relativenumber
 autocmd CursorMoved * :set relativenumber
 
 function! NumberToggle()
   if(&relativenumber == 1)
-    set number
+    set norelativenumber
   else
     set relativenumber
   endif
@@ -184,16 +171,35 @@ endfunction
 
 nnoremap <C-n> :call NumberToggle()<cr>
 
-" Find file and Find stuff to quickfix.
-command -nargs=1 Qff :cexpr system('find . \| ag <f-args>') | copen
+" 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 = "X"
+let g:syntastic_warning_symbol = "!"
 
-function! ToggleCWindow()
-  if exists("g:qwindow")
-    cclose
-    unlet g:qwindow
-  else
-    copen
-    let g:qwindow = 1
-  endif
-endfunction
-nnoremap <C-h> :call ToggleCWindow()<cr>
+" Dank Mono Italics
+highlight Keyword cterm=italic
+
+" FZF config
+set rtp+=/usr/local/opt/fzf
+
+" Inserts the path of the currently edited file into a command
+noremap <C-P> :FZF <CR>
+
+" Map colors to vim colors
+let g:fzf_colors =
+\ { 'fg':      ['fg', 'Normal'],
+  \ 'bg':      ['bg', 'Normal'],
+  \ 'hl':      ['fg', 'Comment'],
+  \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
+  \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
+  \ 'hl+':     ['fg', 'Statement'],
+  \ 'info':    ['fg', 'PreProc'],
+  \ 'border':  ['fg', 'Ignore'],
+  \ 'prompt':  ['fg', 'Conditional'],
+  \ 'pointer': ['fg', 'Exception'],
+  \ 'marker':  ['fg', 'Keyword'],
+  \ 'spinner': ['fg', 'Label'],
+  \ 'header':  ['fg', 'Comment'] }