From 9a921ec592784b421ad334f5442da283387df544 Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Mon, 26 Sep 2022 13:02:24 +0200 Subject: [PATCH] (vim) Trim lang plugins in favor of coc integration --- .config/coc/extensions/package.json | 13 +++++++-- .config/nvim/coc-settings.json | 5 +++- .config/nvim/init.vim | 43 ++++++++--------------------- 3 files changed, 26 insertions(+), 35 deletions(-) diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index 25ce67c..b202e56 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -2,6 +2,15 @@ "dependencies": { "coc-json": ">=1.3.6", "coc-tsserver": ">=1.8.6", - "coc-vetur": ">=1.2.5" - } + "coc-vetur": ">=1.2.5", + "coc-pyright": ">=1.1.272", + "coc-clangd": ">=0.25.0", + "coc-go": ">=1.3.0", + "coc-markdownlint": ">=1.26.0", + "coc-rust-analyzer": ">=0.68.2", + "coc-pairs": ">=1.3.2", + "coc-docker": ">=0.5.0" + }, + "disabled": [], + "locked": [] } \ No newline at end of file diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index 0fbb14b..7e8a68d 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -1,5 +1,8 @@ { "suggest.noselect": false, "vetur.format.options.tabSize": 4, - "vetur.format.options.useTabs": true + "vetur.format.options.useTabs": true, + "rust-analyzer.procMacro.enable": true, + "rust-analyzer.procMacro.attributes.enable": true, + "rust-analyzer.diagnostics.disabled": ["unresolved-proc-macro"] } diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 62a84dc..3f7de30 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -1,61 +1,36 @@ call plug#begin('~/.config/nvim/plugged') -Plug 'preservim/NERDTree' -Plug 'majutsushi/tagbar' +" Ayu color scheme +Plug 'TanguyHerbron/ayu-vim' + Plug 'junegunn/fzf.vim' -Plug 'junegunn/fzf' -Plug 'Shougo/neocomplete.vim' " Display indents Plug 'yggdroot/indentline' -Plug 'Townk/vim-autoclose' -Plug 'vim-syntastic/syntastic' Plug 'yuezk/vim-js' " Autocompletion Plug 'neoclide/coc.nvim', {'branch': 'release'} -" Replacement for coc.vim (auto complete) -" Plug 'ycm-core/YouCompleteMe' - Plug 'vim-airline/vim-airline' -Plug 'Xuyuanp/nerdtree-git-plugin' Plug 'ctrlpvim/ctrlp.vim' Plug 'ryanoasis/vim-devicons' -" Vue syntax highlighter -Plug 'posva/vim-vue' - " Grep utility for whole project Plug 'jremmen/vim-ripgrep' " Git integration Plug 'tpope/vim-fugitive' -Plug 'chrisbra/Colorizer' +Plug 'rrethy/vim-hexokinase', {'do': 'make hexokinase'} " Ctrl-z tree still history manager Plug 'mbbill/undotree' -" Python auto completion engine -Plug 'davidhalter/jedi-vim' - -" LaTeX plugin -Plug 'lervag/vimtex' - -" Dockerfile syntax highlighter -Plug 'ekalinin/Dockerfile.vim' - " docker-compose wrapper Plug 'skanehira/docker-compose.vim' " Nginx syntax highlighter Plug 'chr4/nginx.vim' -" Ayu color scheme -Plug 'TanguyHerbron/ayu-vim' - -" Nvim in the browser -Plug 'glacambre/firenvim', {'do': { _ -> firenvim#install(0) }} - " Highlight indicator Plug 'machakann/vim-highlightedyank' @@ -63,10 +38,14 @@ Plug 'machakann/vim-highlightedyank' Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }, 'for': ['markdown', 'vim-plug']} " React syntax highlighter -Plug 'maxmellon/vim-jsx-pretty' -" Rust configuration plugin -" Plug 'rust-lang/rust.vim' +" i3 config checker +Plug 'mboughaba/i3config.vim' + +" Testing disable section +"" Deprecated, replace by coc feature ? +" Plug 'lervag/vimtex' +" Plug 'ekalinin/Dockerfile.vim' call plug#end()