X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/b4df743852d4a4f08cee9d75976fd7228eb99f02..9cf5f94bb3bac385ed90ac775e274a94b6afacab:/vimrc?ds=sidebyside

diff --git a/vimrc b/vimrc
index d7ca407..1eefa87 100755
--- a/vimrc
+++ b/vimrc
@@ -70,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
 
@@ -85,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
@@ -140,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()
@@ -151,11 +150,6 @@ set foldnestmax=10
 set nofoldenable
 set foldlevel=1
 
-" powerline stuff
-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)$'
@@ -182,6 +176,30 @@ 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'}
+let g:syntastic_error_symbol = "X"
+let g:syntastic_warning_symbol = "!"
+
+" 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'] }