From 5767c3fea29f74b180342d8898c06a9719797459 Mon Sep 17 00:00:00 2001
From: Adam Lamers <adamlamers@gmail.com>
Date: Sun, 12 Nov 2023 17:40:18 -0500
Subject: [PATCH] new plugins

---
 vimrc | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/vimrc b/vimrc
index aec79ad..3ff329c 100644
--- a/vimrc
+++ b/vimrc
@@ -1,23 +1,25 @@
 " General settings
+set belloff=all
 set nocompatible
-filetype off
 set hidden
 set backspace=eol,start,indent
 set nu
 set ignorecase
+set laststatus=2
+
+filetype off
 filetype plugin indent on
 
 "Space as leader
-nmap <Tab> <Nop>
 nnoremap <Space> <Nop>
 let mapleader="\<Space>"
 let g:mapleader="\<Space>"
 
 "Buffer navigation
-nnoremap [b :bp<CR>
-nnoremap ]b :bn<CR>
-nnoremap <leader>c :bd<CR>
-nnoremap <leader>C :bd!<CR>
+nnoremap <silent>[b :bprev<CR>
+nnoremap <silent>]b :bnext<CR>
+nnoremap <leader>c :bprev\|bdelete #<CR>
+nnoremap <leader>C :bdelete!<CR>
 nnoremap <leader>f :echo expand('%:p')<CR>
 
 " Window navigation
@@ -78,12 +80,22 @@ Plug 'neoclide/vim-jsx-improve'
 Plug 'leafgarland/typescript-vim'
 Plug 'peitalin/vim-jsx-typescript'
 Plug 'ojroques/vim-oscyank', {'branch': 'main'}
+Plug 'ap/vim-buftabline'
+Plug 'adamlamers/terminal-drawer.vim'
 call plug#end()
 
 "Colorscheme
 colorscheme gruvbox-material
 
 "Coc Config
+
+" Use <c-space> to trigger completion
+if has('nvim')
+  inoremap <silent><expr> <c-space> coc#refresh()
+else
+  inoremap <silent><expr> <c-@> coc#refresh()
+endif
+
 function! ShowDocumentation()
   if CocAction('hasProvider', 'hover')
     call CocActionAsync('doHover')
@@ -92,6 +104,11 @@ function! ShowDocumentation()
   endif
 endfunction
 
+function! CheckBackspace() abort
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
+
 nmap <leader>d <Plug>(coc-definition)
 nmap <leader>rn <Plug>(coc-rename)
 nmap <silent> gd <Plug>(coc-definition)
@@ -99,10 +116,28 @@ nmap <silent> gy <Plug>(coc-type-definition)
 nmap <silent> gi <Plug>(coc-implementation)
 nmap <silent> gr <Plug>(coc-references)
 imap <silent> <C-x> <Plug>(coc-snippets-expand)
+
+" Suggestion navigation
 inoremap <silent><expr> <C-f> coc#refresh()
-inoremap <silent><expr> <C-e> coc#pum#visible() ? coc#pum#confirm() : <Nop>
+inoremap <silent><expr> <C-e> coc#pum#visible() ? coc#_select_confirm() : "\<CR>"
+inoremap <silent><expr> <CR> coc#pum#visible() ? coc#_select_confirm() : "\<CR>"
 nnoremap <silent> K :call ShowDocumentation()<CR>
 
+" Popup scrolling
+nnoremap <silent><nowait><expr> <C-m> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
+nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
+inoremap <silent><nowait><expr> <C-m> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
+inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
+vnoremap <silent><nowait><expr> <C-m> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
+vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
+
+" Symbol renaming
+nmap <leader>rn <Plug>(coc-rename)
+
+" Formatting selected code
+xmap <leader>=  <Plug>(coc-format-selected)
+nmap <leader>=  <Plug>(coc-format-selected)
+
 let g:coc_disable_transparent_cursor=1
 
 "SimpylFold Config
@@ -110,11 +145,12 @@ let g:SimpylFold_docstring_preview=1
 
 "NERDTree keybinds
 nmap <leader>g :NERDTreeFind<CR>
-nmap <leader>e :NERDTreeFocus<CR>
+nmap <leader>e :NERDTreeToggle<CR>
 let NERDTreeIgnore = ['__pycache__', '\.pyc$', '\.egg-info$', 'node_modules']
 
 "CtrlP config
 nmap <C-E> :CtrlPBuffer<CR>
+nmap <C-p> :CtrlP<CR>
 let g:ctrlp_working_path_mode= 0
 let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|git\|\.egg-info|\.pyc'
 
@@ -128,3 +164,19 @@ set wildignore+=*/node_modules/*,*/__pycache__/*,*.pyc,*.egg-info
 
 "OSCYank settings
 autocmd TextYankPost * if v:event.operator is 'y' && v:event.regname is 'a' | execute 'OSCYankReg a' | endif
+nnoremap <leader>yf :call OSCYank(expand('%:p'))<CR>
+
+"Lightline settings
+let g:lightline = {
+      \ 'colorscheme': 'wombat',
+      \ 'active': {
+      \   'left': [ [ 'mode', 'paste' ],
+      \             [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
+      \ },
+      \ 'component_function': {
+      \   'gitbranch': 'FugitiveHead'
+      \ },
+      \ }
+
+" Terminal drawer options
+let g:terminal_drawer_start_nobuflisted = 1