X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/blobdiff_plain/f9b5f766d88864e8e461da8e09a5337fdae1becd..3293278c416a2412cf87bffb3a78ef1a145e1a9d:/vimrc

diff --git a/vimrc b/vimrc
index 096549c..26baa1b 100755
--- 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
+set omnifunc=syntaxcomplete#Complete
 
 " 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>
 
-" 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
@@ -114,8 +111,8 @@ set modeline
 set modelines=10
 
 " Default color scheme
-set t_Co=256
-color molokai
+set termguicolors
+color rbdr
 
 " Directories for swp files
 set backupdir=~/.vim/.backup
@@ -145,9 +142,6 @@ let g:tagbar_ctags_bin="/usr/local/bin/ctags"
 " Color Column
 let &colorcolumn="80,150"
 
-" Add Pathogen
-call pathogen#infect()
-
 " Folding Settings
 set foldmethod=syntax
 set foldnestmax=10
@@ -175,13 +169,73 @@ endfunction
 
 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']}
+
+" Move things up and down using Ctrl + Shift
+nnoremap <C-S-j> :m .+1<CR>==
+nnoremap <C-S-k> :m .-2<CR>==
+inoremap <C-S-j> <Esc>:m .+1<CR>==gi
+inoremap <C-S-k> <Esc>:m .-2<CR>==gi
+vnoremap <C-S-j> :m '>+1<CR>gv=gv
+vnoremap <C-S-k> :m '<-2<CR>gv=gv
+
+" Plug configuration
+call plug#begin('~/.vim/plugged')
+
+"
+" Plugin List
+"
+
+" Syntaxes
+Plug 'rbdr/api-notation.vim'
+Plug 'elzr/vim-json'
+Plug 'mustache/vim-mode'
+Plug 'othree/yajs.vim'
+Plug 'ARM9/snes-syntax-vim'
+Plug 'posva/vim-vue'
+Plug 'leafOfTree/vim-svelte-plugin'
+Plug 'bumaociyuan/vim-swift'
+Plug 'udalov/kotlin-vim'
+
+" Editing
+Plug 'jiangmiao/auto-pairs'
+" Plug 'tpope/vim-endwise.git'
+Plug 'michaeljsmith/vim-indent-object'
+
+" Tools
+Plug 'editorconfig/editorconfig-vim'
+Plug 'w0rp/ale'
+Plug 'vim-scripts/LargeFile'
+Plug 'tpope/vim-fugitive'
+Plug 'milkypostman/vim-togglelist'
+Plug 'jremmen/vim-ripgrep'
+Plug 'lifepillar/vim-mucomplete'
+
+" List ends here. Plugins become visible to Vim after this call.
+call plug#end()