From 198307c2dc79f1f73166b846602477577d95c88b Mon Sep 17 00:00:00 2001 From: Random936 Date: Tue, 5 Jul 2022 21:23:43 -0700 Subject: [PATCH] Fixed vim config --- vim/coc-settings.json | 3 +++ vim/init.vim | 54 ++++++++++++++----------------------------- 2 files changed, 20 insertions(+), 37 deletions(-) create mode 100644 vim/coc-settings.json diff --git a/vim/coc-settings.json b/vim/coc-settings.json new file mode 100644 index 0000000..ef1d99a --- /dev/null +++ b/vim/coc-settings.json @@ -0,0 +1,3 @@ +{ + "diagnostic.checkCurrentLine": true +} diff --git a/vim/init.vim b/vim/init.vim index 24d82ed..9adb2c6 100644 --- a/vim/init.vim +++ b/vim/init.vim @@ -24,58 +24,38 @@ noremap nnoremap let mapleader=" " -" FZF key bindings -noremap Files -noremap Buffers - call plug#begin('~/.vim/plugged') -" Syntax correcting and autocomplete for nvim -Plug 'neovim/nvim-lspconfig' -Plug 'nvim-lua/completion-nvim' +" Syntax highlighting and autocomplete for nvim +Plug 'neoclide/coc.nvim', {'branch': 'release'} -" FZF +" FZF for better file jumping. Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } Plug 'junegunn/fzf.vim' -Plug 'stsewd/fzf-checkout.vim' " Theme and Syntax Highlighting Plug 'morhetz/gruvbox' -Plug 'bfrg/vim-cpp-modern' - -" For vim practice -Plug 'ThePrimeagen/vim-be-good' call plug#end() " Set colorscheme let g:gruvbox_contrast_dark = 'hard' -if exists('+termgicolors') - let &t_8f = "\[38;2;%lu;%lu;%lum" - let &t_8b = "\[48;2;%lu;%lu;%lum" -endif - +" Transparent background with gruvbox theme colorscheme gruvbox set background=dark hi Normal guibg=NONE ctermbg=NONE -" Load the clangd server as the interpreter -set completeopt=menuone,noinsert,noselect -let g:completion_matching_strategy_list = ['exact', 'substring', 'fuzzy'] +" FZF key bindings +nnoremap ff Files +nnoremap fg Rg +nnoremap fb Buffers -" Language server for nvim-lsp +" use for trigger completion and navigate to the next complete item +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~ '\s' +endfunction -lua << EOF -require'lspconfig'.clangd.setup{ - on_attach=require'completion'.on_attach, - filetypes = {"c", "cpp", "objc", "objcpp"} -} -require'lspconfig'.pylsp.setup{ - on_attach=require'completion'.on_attach, - cmd = {"pylsp"}, - filetypes = {"python", "py"} -} -require'lspconfig'.tsserver.setup{ - on_attach=require'completion'.on_attach, - root_dir = function() return vim.loop.cwd() end -} -EOF +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ coc#refresh()