From c43f8821bea6834d85df2157603fe0b8c787464a Mon Sep 17 00:00:00 2001
From: Robert Kmiec <robert.r.kmiec@gmail.com>
Date: Mon, 28 Mar 2022 23:05:00 +0200
Subject: [PATCH] Nvim: add new plugins to test, tab to complete

---
 .config/nvim/after/plugin/lspconfig.rc.vim | 4 ++--
 .config/nvim/after/plugin/nvim-cmp.rc.vim  | 2 +-
 .config/nvim/after/plugin/ultisnips.rc.vim | 6 +++---
 .config/nvim/init.vim                      | 7 +++++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.config/nvim/after/plugin/lspconfig.rc.vim b/.config/nvim/after/plugin/lspconfig.rc.vim
index 20c7164..fe8dd90 100644
--- a/.config/nvim/after/plugin/lspconfig.rc.vim
+++ b/.config/nvim/after/plugin/lspconfig.rc.vim
@@ -8,7 +8,6 @@ local nvim_lsp = require'lspconfig'
 local coq = require'coq'
 local cmp = require'cmp_nvim_lsp'
 --local signature = require'lsp_signature'
-local illuminate = require'illuminate'
 
 -- Mappings.
 local opts = { noremap=true, silent=true }
@@ -44,7 +43,8 @@ local on_attach = function(client, bufnr)
   --           border = "single",
   --       }
   --   }, bufnr)
-  illuminate.on_attach(client)
+  require'illuminate'.on_attach(client)
+  require'virtualtypes'.on_attach()
 end
 
 local signs = {
diff --git a/.config/nvim/after/plugin/nvim-cmp.rc.vim b/.config/nvim/after/plugin/nvim-cmp.rc.vim
index c9b9a3d..7d60826 100644
--- a/.config/nvim/after/plugin/nvim-cmp.rc.vim
+++ b/.config/nvim/after/plugin/nvim-cmp.rc.vim
@@ -20,7 +20,7 @@ cmp.setup({
         ['<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' }),
-        ['<CR>'] = cmp.mapping.confirm({ select = true }),
+        ['<tab>'] = cmp.mapping.confirm({ select = true }),
         ['<C-e>'] = cmp.mapping({
           i = cmp.mapping.abort(),
           c = cmp.mapping.close(),
diff --git a/.config/nvim/after/plugin/ultisnips.rc.vim b/.config/nvim/after/plugin/ultisnips.rc.vim
index 80a9672..4c43e2d 100644
--- a/.config/nvim/after/plugin/ultisnips.rc.vim
+++ b/.config/nvim/after/plugin/ultisnips.rc.vim
@@ -1,8 +1,8 @@
 " Set completeopt to have a better completion experience
 "set completeopt=menuone,noinsert,noselect
 let g:completion_enable_snippet = 'UltiSnips'
-iunmap <Tab>
+"iunmap <Tab>
 "map <c-s> <C-R>=UltiSnips#ExpandSnippet()<CR>
 "let g:UltiSnipsExpandTrigger="<c-s>"
-let g:UltiSnipsJumpForwardTrigger="<leader>n"
-let g:UltiSnipsJumpBackwardTrigger="<leader>p"
+let g:UltiSnipsJumpForwardTrigger="<tab>"
+let g:UltiSnipsJumpBackwardTrigger="<S-tab>"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 4e4d14c..d774809 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -112,6 +112,13 @@ Plug 'dylanaraps/wal'
 Plug 'marko-cerovac/material.nvim'
 Plug 'Shatur/neovim-ayu'
 " }}}
+
+" Testing phase {{{
+Plug 'nvim-neorg/neorg'
+Plug 'jubnzv/virtual-types.nvim'
+Plug 'folke/which-key.nvim'
+" }}}
+
 "
 call plug#end()