From 8ce283c5305fbee0924c67684605e9d7c436923f Mon Sep 17 00:00:00 2001
From: Fabian Becker <fbecker18@bloomberg.net>
Date: Mon, 13 Dec 2021 13:00:59 +0100
Subject: [PATCH] Update several plugins Replace compe with cmp

---
 .config/nvim/init.lua            |  3 +-
 .config/nvim/lua/keymappings.lua |  9 ++++++
 .config/nvim/lua/plugins.lua     | 22 +++++++------
 .config/nvim/lua/plugins/cmp.lua | 53 ++++++++++++++++++++++++++++++++
 .config/nvim/lua/settings.lua    |  1 -
 5 files changed, 77 insertions(+), 11 deletions(-)
 create mode 100644 .config/nvim/lua/plugins/cmp.lua

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 9ac0405..b8abb83 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -17,7 +17,8 @@ require('lsp.terraform-ls')
 require('plugins.telescope')
 require('plugins.telescope-project')
 require('plugins.treesitter')
-require('plugins.compe')
+-- require('plugins.compe')
+require('plugins.cmp')
 require('plugins.which-key')
 require('plugins.lualine')
 --require('plugins.barbar')
diff --git a/.config/nvim/lua/keymappings.lua b/.config/nvim/lua/keymappings.lua
index 2434d4b..75e24ab 100644
--- a/.config/nvim/lua/keymappings.lua
+++ b/.config/nvim/lua/keymappings.lua
@@ -72,6 +72,15 @@ vim.cmd([[
     vnoremap   <C-c><C-c> :FloatermSend<CR>
 ]])
 
+-- -- Compe
+-- vim.cmd([[
+--     inoremap <silent><expr> <C-Space> compe#complete()
+--     inoremap <silent><expr> <CR>      compe#confirm('<CR>')
+--     inoremap <silent><expr> <C-e>     compe#close('<C-e>')
+--     inoremap <silent><expr> <C-f>     compe#scroll({ 'delta': +4 })
+--     inoremap <silent><expr> <C-d>     compe#scroll({ 'delta': -4 })
+-- ]])
+
 
 -- better indenting
 vim.api.nvim_set_keymap('v', '<', '<gv', {noremap = true, silent = true})
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 9f30c89..0765f38 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -43,23 +43,19 @@ return require("packer").startup(
 
         use {'junegunn/vim-easy-align'}
 
-        -- Multiple cursors for editing
-        --use {'mg979/vim-visual-multi', branch='master'}
-
         -- Goodies
-        use {'tpope/vim-abolish'}
         use {'tpope/vim-fugitive'}
         use {'tpope/vim-surround'} -- ✅
 
         -- Treesitter
         use {"nvim-treesitter/nvim-treesitter", run = ":TSUpdate"}
 
-        use {'majutsushi/tagbar'}
+        use {'preservim/tagbar'}
         vim.g.tagbar_ctags_bin = '/usr/local/bin/ctags'
 
         -- Status Line and Bufferline
         use {
-            'hoob3rt/lualine.nvim',
+            'nvim-lualine/lualine.nvim',
             requires = {'kyazdani42/nvim-web-devicons'}
         }
 
@@ -77,7 +73,7 @@ return require("packer").startup(
         -- http://usevim.com/2012/07/18/nerdtree/
         -- (loaded on first invocation of the command)
         use {
-            'scrooloose/nerdtree', 
+            'preservim/nerdtree', 
             requires = {'ryanoasis/vim-devicons'}
         }
 
@@ -88,8 +84,16 @@ return require("packer").startup(
 
         -- LSP / Language Server Protocol
         use {'neovim/nvim-lspconfig'}
-        use {'hrsh7th/nvim-compe'}
-        use {'glepnir/lspsaga.nvim'}
+        --use {'hrsh7th/nvim-compe'}
+        
+        use {'hrsh7th/cmp-nvim-lsp'}
+        use {'hrsh7th/cmp-buffer'}
+        use {'hrsh7th/cmp-path'}
+        use {'hrsh7th/cmp-cmdline'}
+        use {'hrsh7th/nvim-cmp'}
+        
+        -- use {'glepnir/lspsaga.nvim'}
+        use {'tami5/lspsaga.nvim'}
         use {'kabouzeid/nvim-lspinstall'}
         use {'nvim-lua/lsp-status.nvim'}
         use {'simrat39/symbols-outline.nvim'}
diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua
new file mode 100644
index 0000000..7ec9fb7
--- /dev/null
+++ b/.config/nvim/lua/plugins/cmp.lua
@@ -0,0 +1,53 @@
+local cmp = require'cmp'
+
+cmp.setup({
+    -- snippet = {
+    --     -- REQUIRED - you must specify a snippet engine
+    --     expand = function(args)
+    --     vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
+    --     -- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+    --     -- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
+    --     -- require'snippy'.expand_snippet(args.body) -- For `snippy` users.
+    --     end,
+    -- },
+    mapping = {
+        ['<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' }),
+        ['<C-y>'] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
+        ['<C-e>'] = cmp.mapping({
+            i = cmp.mapping.abort(),
+            c = cmp.mapping.close(),
+        }),
+        ['<CR>'] = cmp.mapping.confirm({ select = true }),
+    },
+    sources = cmp.config.sources({
+        { name = 'nvim_lsp' },
+        -- { name = 'vsnip' }, -- For vsnip users.
+        -- { name = 'luasnip' }, -- For luasnip users.
+        -- { name = 'ultisnips' }, -- For ultisnips users.
+        -- { name = 'snippy' }, -- For snippy users.
+    }, {
+        { name = 'buffer' },
+    })
+})
+
+-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline('/', {
+    sources = {
+        { name = 'buffer' }
+    }
+})
+
+-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
+cmp.setup.cmdline(':', {
+    sources = cmp.config.sources({
+        { name = 'path' }
+    }, {
+        { name = 'cmdline' }
+    })
+})
+
+-- Setup lspconfig.
+local capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities())
+capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 2db2367..1db88ee 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -17,7 +17,6 @@ vim.o.mouse = "a" -- Enable your mouse
 vim.o.splitbelow = true -- Horizontal splits will automatically be below
 vim.o.termguicolors = true -- set term gui colors most terminals support this
 vim.o.splitright = true -- Vertical splits will automatically be to the right
-vim.o.t_Co = "256" -- Support 256 colors
 vim.o.conceallevel = 0 -- So that I can see `` in markdown files
 vim.cmd('set ts=4') -- Insert 4 spaces for a tab
 vim.cmd('set sw=4') -- Change the number of space characters inserted for indentation