Nvim: reorganize plugins - move some from testing to categories

.config/nvim/after/plugin/lspconfig.rc.lua

@@ -1,12 +1,6 @@
-if !exists('g:lspconfig')
-  finish
-endif
-"
-" Completion configuration for native neovim + nvim-lspconfig
-lua << EOF
 local nvim_lsp = require'lspconfig'
---local coq = require'coq'
-local cmp = require'cmp_nvim_lsp'
+local coq = require'coq'
+--local cmp = require'cmp_nvim_lsp'
 local clangd_extensions = require("clangd_extensions")
 
 -- Mappings.
@@ -70,12 +64,12 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
   }
 )
 
-nvim_lsp.groovyls.setup ({
+nvim_lsp.groovyls.setup (coq.lsp_ensure_capabilities({
   cmd = { "java", "-jar", "/home/kmcr/tools/groovy-language-server/build/libs/groovy-language-server-all.jar" },
   on_attach = on_attach,
   on_publish_diagnostics = diagnostic_handler,
-  capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()),
-  }
+  capabilities = vim.lsp.protocol.make_client_capabilities(),
+  })
 )
 
 -- nvim_lsp.ccls.setup(
@@ -99,7 +93,7 @@ nvim_lsp.groovyls.setup ({
 --   )
 -- )
 
-clangd_extensions.setup({
+clangd_extensions.setup(coq.lsp_ensure_capabilities({
   server = {
     on_attach = on_attach,
     root_pattern = {
@@ -116,7 +110,7 @@ clangd_extensions.setup({
     max_len_align_padding = 3,
     right_align = true,
   }
-})
+}))
 -- nvim_lsp.clangd.setup(
 --   coq.lsp_ensure_capabilities({
 --     root_dir = nvim_lsp.util.root_pattern("compile_commands.json"),
@@ -128,7 +122,7 @@ clangd_extensions.setup({
 --   )
 -- )
 
-nvim_lsp.pylsp.setup({
+nvim_lsp.pylsp.setup(coq.lsp_ensure_capabilities({
   settings = {
     pylint = {
       enabled = false
@@ -142,20 +136,19 @@ nvim_lsp.pylsp.setup({
   },
   on_attach = on_attach,
   on_publish_diagnostics = diagnostic_handler,
-  capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()),
-})
+  capabilities = vim.lsp.protocol.make_client_capabilities(),
+}))
 
 -- Use a loop to conveniently call 'setup' on multiple servers and
 -- map buffer local keybindings when the language server attaches
 local servers = { "cmake", "rust_analyzer", "bashls" }
 for _, lsp in ipairs(servers) do
-  nvim_lsp[lsp].setup({
+  nvim_lsp[lsp].setup(coq.lsp_ensure_capabilities({
     on_attach = on_attach,
     on_publish_diagnostics = diagnostic_handler,
-    capabilities = cmp.update_capabilities(vim.lsp.protocol.make_client_capabilities()),
+    capabilities = vim.lsp.protocol.make_client_capabilities(),
     flags = {
       debounce_text_changes = 150,
     }
-  })
+  }))
 end
-EOF

.config/nvim/after/plugin/nvim-cmp.rc.lua

@@ -1,73 +1,73 @@
 -- Setup nvim-cmp.
-local cmp = require'cmp'
-
-cmp.setup({
-    snippet = {
-        expand = function(args)
-        -- For `vsnip` user.
-        -- vim.fn["vsnip#anonymous"](args.body)
-
-        -- For `luasnip` user.
-        -- require('luasnip').lsp_expand(args.body)
-
-        -- For `ultisnips` user.
-        vim.fn["UltiSnips#Anon"](args.body)
-        end,
-    },
-    mapping = cmp.mapping.preset.insert({
-        ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
-        ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
-        ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
-        ['<tab>'] = cmp.mapping.confirm({ select = true }),
-        ['<C-e>'] = cmp.mapping({
-          i = cmp.mapping.abort(),
-          c = cmp.mapping.close(),
-        }),
-    }),
-    sources = cmp.config.sources({
-        { name = 'nvim_lsp' },
-
-        { name = 'path' },
-
-        { name = 'ultisnips' },
-
-        { name = 'calc' },
-
-        { name = 'cmp_matlab' },
-
-        { name = 'cmp_git' },
-    }, {
-        { name = 'buffer', keyword_length = 5, max_item_count = 10, priority = -5 },
-    }),
-    --experimental = {
-    --    native_menu = false
-    --}
-    
-    sorting = {
-        comparators = {
-            cmp.config.compare.offset,
-            cmp.config.compare.exact,
-            cmp.config.compare.recently_used,
-            require("clangd_extensions.cmp_scores"),
-            cmp.config.compare.kind,
-            cmp.config.compare.sort_text,
-            cmp.config.compare.length,
-            cmp.config.compare.order,
-        },
-    },
-})
-
-cmp.setup.cmdline('/', {
-    sources = {
-        { name = 'buffer' }
-    }
-})
-
-cmp.setup.cmdline(':', {
-    sources = {
-      { name = 'cmdline' }
-    },
-    mapping = cmp.mapping.preset.cmdline()
-})
-
-require("cmp_git").setup()
+--local cmp = require'cmp'
+--
+--cmp.setup({
+--    snippet = {
+--        expand = function(args)
+--        -- For `vsnip` user.
+--        -- vim.fn["vsnip#anonymous"](args.body)
+--
+--        -- For `luasnip` user.
+--        -- require('luasnip').lsp_expand(args.body)
+--
+--        -- For `ultisnips` user.
+--        vim.fn["UltiSnips#Anon"](args.body)
+--        end,
+--    },
+--    mapping = cmp.mapping.preset.insert({
+--        ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
+--        ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
+--        ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
+--        ['<tab>'] = cmp.mapping.confirm({ select = true }),
+--        ['<C-e>'] = cmp.mapping({
+--          i = cmp.mapping.abort(),
+--          c = cmp.mapping.close(),
+--        }),
+--    }),
+--    sources = cmp.config.sources({
+--        { name = 'nvim_lsp' },
+--
+--        { name = 'path' },
+--
+--        { name = 'ultisnips' },
+--
+--        { name = 'calc' },
+--
+--        { name = 'cmp_matlab' },
+--
+--        { name = 'cmp_git' },
+--    }, {
+--        { name = 'buffer', keyword_length = 5, max_item_count = 10, priority = -5 },
+--    }),
+--    --experimental = {
+--    --    native_menu = false
+--    --}
+--    
+--    sorting = {
+--        comparators = {
+--            cmp.config.compare.offset,
+--            cmp.config.compare.exact,
+--            cmp.config.compare.recently_used,
+--            require("clangd_extensions.cmp_scores"),
+--            cmp.config.compare.kind,
+--            cmp.config.compare.sort_text,
+--            cmp.config.compare.length,
+--            cmp.config.compare.order,
+--        },
+--    },
+--})
+--
+--cmp.setup.cmdline('/', {
+--    sources = {
+--        { name = 'buffer' }
+--    }
+--})
+--
+--cmp.setup.cmdline(':', {
+--    sources = {
+--      { name = 'cmdline' }
+--    },
+--    mapping = cmp.mapping.preset.cmdline()
+--})
+--
+--require("cmp_git").setup()

.config/nvim/after/plugin/window.rc.lua

@@ -1,8 +0,0 @@
-require('nvim-window').setup({
-  chars = {
-    'j', 'k', 'l', 'f', 'd', 's', 'g', 'h', 'i', 'e', 'a', 'b', 'm', 'n', 'o',
-    'p', 'q', 'r', 'c', 't', 'u', 'v', 'w', 'x', 'y', 'z'
-  },
-})
-
-vim.api.nvim_set_keymap('n', '<leader>j', '<cmd>lua require("nvim-window").pick()<cr>', {silent=true, noremap = true})

.config/nvim/init.vim

@@ -16,42 +16,34 @@ Plug 'neovim/nvim-lspconfig'
 Plug 'p00f/clangd_extensions.nvim'
 "Plug 'ray-x/lsp_signature.nvim'
 Plug 'matsui54/denops-signature_help'
+Plug 'jubnzv/virtual-types.nvim'
 Plug 'RRethy/vim-illuminate'
 Plug 'mizlan/iswap.nvim'
+Plug 'Saecki/crates.nvim' | Plug 'jose-elias-alvarez/null-ls.nvim'
 
 "Plug 'dbeniamine/cheat.sh-vim'
 "Plug 'puremourning/vimspector'
 "Plug 'vim-test/vim-test'
 Plug 'lukas-reineke/indent-blankline.nvim'
 Plug 'liuchengxu/vista.vim'
-Plug 'ggandor/leap.nvim'
 
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 Plug 'nvim-treesitter/playground'
 Plug 'p00f/nvim-ts-rainbow'
-Plug 'nvim-treesitter/nvim-treesitter-textobjects'
 Plug 'romgrk/nvim-treesitter-context'
 
 Plug 'cdelledonne/vim-cmake'
 
 Plug 'andymass/vim-matchup'
-Plug 'folke/which-key.nvim'
 Plug 'numToStr/Comment.nvim'
 Plug 'danymat/neogen'
+
+Plug 'krady21/compiler-explorer.nvim'
 " }}}
 
 " Completion {{{
-Plug 'hrsh7th/nvim-cmp'
-Plug 'hrsh7th/cmp-nvim-lsp'
-Plug 'hrsh7th/cmp-buffer'
-Plug 'hrsh7th/cmp-path'
-Plug 'hrsh7th/cmp-cmdline'
-Plug 'hrsh7th/cmp-calc'
-Plug 'joshzcold/cmp-jenkinsfile'
-Plug 'petertriho/cmp-git'
-Plug 'mstanciu552/cmp-matlab'
-Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
-Plug 'quangnguyen30192/cmp-nvim-ultisnips'
+Plug 'ms-jpq/coq_nvim'
+Plug 'ms-jpq/coq.artifacts', {'branch': 'artifacts'}
 " }}}
 
 " Files switch, jump and grep-like tools {{{
@@ -66,6 +58,7 @@ Plug 'MunifTanjim/nui.nvim'
 Plug 'inside/vim-search-pulse'
 Plug 'wellle/targets.vim'
 Plug 'numToStr/FTerm.nvim'
+Plug 'ggandor/leap.nvim'
 " }}}
 
 " Git integration {{{
@@ -87,14 +80,15 @@ Plug 'chrisbra/csv.vim'
 "Plug 'MortenStabenau/matlab-vim'
 "Plug 'junegunn/goyo.vim'
 Plug 'lukas-reineke/virt-column.nvim'
+Plug 'folke/which-key.nvim'
 "Plug 'glacambre/firenvim'
 "Plug 'JMcKiern/vim-shoot'
 "Plug 'protex/better-digraphs.nvim'
 " }}}
 
 " Note taking {{{
-Plug 'vimwiki/vimwiki'
-Plug 'michal-h21/vimwiki-sync'
+"Plug 'vimwiki/vimwiki'
+"Plug 'michal-h21/vimwiki-sync'
 "Plug 'michal-h21/vim-zettel'
 " }}}
 
@@ -109,21 +103,41 @@ Plug 'vim-airline/vim-airline' | Plug 'vim-airline/vim-airline-themes'
 
 " Testing phase {{{
 Plug 'nvim-neorg/neorg'
-Plug 'jubnzv/virtual-types.nvim'
-Plug 'https://gitlab.com/yorickpeterse/nvim-window.git'
 Plug 'themercorp/themer.lua'
-Plug 'mfussenegger/nvim-dap'
-Plug 'mizlan/iswap.nvim'
-Plug 'wuelnerdotexe/vim-enfocado'
+"Plug 'mfussenegger/nvim-dap'
 Plug 'frabjous/knap'
 Plug 'kevinhwang91/nvim-ufo' | Plug 'kevinhwang91/promise-async'
-Plug 'kaiuri/nvim-mariana'
 Plug 'ziontee113/icon-picker.nvim'
-Plug 'Saecki/crates.nvim'
+Plug 'RRethy/vim-hexokinase', { 'do': 'make hexokinase' }
+Plug 'anuvyklack/pretty-fold.nvim'
+Plug 'anuvyklack/fold-preview.nvim' | Plug 'anuvyklack/keymap-amend.nvim'
+Plug 'anuvyklack/windows.nvim' | Plug 'anuvyklack/middleclass' | Plug 'anuvyklack/animation.nvim'
+"Plug 'https://git.sr.ht/%7Ewhynothugo/lsp_lines.nvim'
 " }}}
 
 call plug#end()
 
+lua << EOF
+
+require('fold-preview').setup()
+
+require('pretty-fold').ft_setup('cpp', {
+   process_comment_signs = false,
+   comment_signs = {
+      '/**', -- C++ Doxygen comments
+   },
+   stop_words = {
+      -- ╟─ "*" ──╭───────╮── "@brief" ──╭───────╮──╢
+      --          ╰─ WSP ─╯              ╰─ WSP ─╯
+      '%*%s*@brief%s*',
+   },
+})
+
+--require('lsp_lines').setup()
+
+require('compiler-explorer').setup()
+EOF
+
 set termguicolors
 set shell=bash
 
@@ -140,6 +154,9 @@ set laststatus=2
 
 lua << EOF
 require("virt-column").setup { }
+vim.o.winwidth = 10
+vim.o.winminwidth = 10
+require("windows").setup()
 EOF
 set colorcolumn=80
 
@@ -150,8 +167,6 @@ set background=dark
 "let g:material_style = "deep ocean"
 "colorscheme material
 
-colorscheme enfocado
-
 "highlight MatchParen cterm=underline ctermbg=black ctermfg=NONE
 "highlight VirtColumn ctermfg=DarkGrey ctermbg=NONE
 set listchars=tab:▸\ ,trail:¬