Update prezto

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index 62a82d7319b8ad5e8e2fad3edda9b159c8cfb6bc..b059ccf9a797a9e148e7eda4f09933a5e2353691 100755 (executable)
--- a/vimrc
+++ b/vimrc
@@ -79,6 +79,7 @@ set backspace=indent,eol,start
 " load the plugin and indent settings for the detected filetype
 filetype plugin indent on
 filetype plugin on
 " load the plugin and indent settings for the detected filetype
 filetype plugin indent on
 filetype plugin on

+set omnifunc=syntaxcomplete#Complete

 
 " Opens an edit command with the path of the currently edited file filled in
 " Normal mode: <Leader>e
 
 " Opens an edit command with the path of the currently edited file filled in
 " Normal mode: <Leader>e


@@ -88,10 +89,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>
 
 " 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
 " Unimpaired configuration
 " Bubble single lines
 nmap <C-Up> [e


@@ -114,8 +111,8 @@ set modeline
 set modelines=10
 
 " Default color scheme
 set modelines=10
 
 " Default color scheme

-set t_Co=256
-color molokai
+set termguicolors
+color rbdr

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


@@ -154,11 +151,6 @@ set foldnestmax=10
 set nofoldenable
 set foldlevel=1
 
 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)$'
 " 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)$'


@@ -180,10 +172,30 @@ endfunction
 
 nnoremap <C-n> :call NumberToggle()<cr>
 
 
 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 = "⚠︎"
+" 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'] }
+
+" ALE config
+let g:ale_linters = {'javascript': ['eslint']}