Updated

1 files changed, 22 insertions, 34 deletions

diff --git a/vimrc b/vimrc
index a498b84..681244e 100644
--- a/vimrc
+++ b/vimrc
@@ -1,44 +1,32 @@
-set nocompatible
-set number relativenumber autoindent
-set ignorecase smartcase incsearch
-set hidden nowrap nobackup noswapfile autoread
-set wildmenu wildmode=list:longest,full laststatus=2
+colorscheme sorbet
+set number relativenumber autoindent signcolumn=yes
+set hidden nowrap nobackup noswapfile autoread updatetime=300
 set encoding=utf8 spelllang=en_us
 set backspace=2 scrolloff=4
 set shiftwidth=4 tabstop=4
-set path+=** gp=grep\ -irn
 
-filetype plugin indent on
-syntax enable
+" https://github.com/junegunn/vim-plug
+call plug#begin()
+Plug 'tpope/vim-sensible'
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-fugitive'
+Plug 'jiangmiao/auto-pairs'
+Plug 'junegunn/fzf'
+Plug 'junegunn/fzf.vim'
+Plug 'neoclide/coc.nvim', {'branch': 'release', 'do': 'npm install'}
+call plug#end()
 
 nnoremap <C-Right> :bnext<cr>
 nnoremap <C-Left> :bprevious<cr>
-nnoremap <C-b> :buffers<cr>:buffer
 nnoremap <C-q> :copen<cr>
+nnoremap <C-p> :GFiles<cr>
+nnoremap <C-b> :Buffers<cr>
+nnoremap <C-s> :Rg<cr>
 
-" Personal tabs/spaces settings.
-autocmd Filetype make,go,sh setlocal noexpandtab tabstop=4 shiftwidth=4
-autocmd Filetype c,cpp,zig setlocal expandtab tabstop=4 shiftwidth=4
-autocmd Filetype lua,nix,html,xml,javascript,css setlocal expandtab tabstop=2 shiftwidth=2
-
-" Code commenting - https://stackoverflow.com/a/1676672.
-augroup CodeCommenting
-        autocmd!
-        autocmd FileType c,cpp,go,zig,javascript let b:comment_leader = '// '
-        autocmd FileType sh,ruby,python          let b:comment_leader = '# '
-        autocmd FileType conf,fstab              let b:comment_leader = '# '
-        autocmd FileType lua,sql                 let b:comment_leader = '-- '
-        autocmd FileType vim                     let b:comment_leader = '" '
-augroup END
-noremap <silent> cc :<C-B>silent <C-E>s/^/<C-R>=escape(b:comment_leader,'\/')<CR>/<CR>:nohlsearch<CR>
-noremap <silent> cu :<C-B>silent <C-E>s/^\(\s*\)\V<C-R>=escape(b:comment_leader,'\/')<CR>//e<CR>:nohlsearch<CR>
-
-" FZF - fuzzy finder integration.
-function! FZF()
-        let t=tempname()
-        silent execute '!fzf --preview=''cat {}'' --multi|awk ''{print $1":1:0"}'' > '.fnameescape(t)
-        execute 'cfile '.t|redraw!
-        call delete(t)
-endfunction
-nnoremap <C-p> :call FZF()<cr>
+nmap <silent> [g <Plug>(coc-diagnostic-prev)
+nmap <silent> ]g <Plug>(coc-diagnostic-next)
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)