From e95bbfd0ada3159eeab6cd83d44b7b5592192b72 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sun, 19 Sep 2021 14:32:12 +0200
Subject: [PATCH] Feat: completion and full lua config

---
 nvim/.config/nvim/lua/completion.lua |  6 +++---
 nvim/.config/nvim/lua/lsp.lua        |  2 +-
 nvim/.config/nvim/lua/lualine_.lua   | 31 ++++++++++++++++++++++++++++
 nvim/.config/nvim/lua/mappings.lua   |  1 +
 nvim/.config/nvim/lua/plugins.lua    | 22 +++++++++++++-------
 nvim/.config/nvim/lua/settings.lua   |  2 +-
 6 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 nvim/.config/nvim/lua/lualine_.lua

diff --git a/nvim/.config/nvim/lua/completion.lua b/nvim/.config/nvim/lua/completion.lua
index 26ff989..45cdf01 100644
--- a/nvim/.config/nvim/lua/completion.lua
+++ b/nvim/.config/nvim/lua/completion.lua
@@ -41,7 +41,7 @@ local lsp_symbols = {
 local cmp = require'cmp'
 cmp.setup{
     completion = {
-        completeopt =  "menuone,noinsert,noselect",
+        completeopt =  'menuone,noselect',
     },
     formatting = {
         format = function(entry, vim_item)
@@ -86,9 +86,9 @@ cmp.setup{
             end
         end, { "i", "s" }),
     },
-    source = {
-        { name = 'buffer' },
+    sources = {
         { name = 'vsnip' },
+        { name = 'buffer' },
         { name = 'path' },
         { name = 'spell' },
     }
diff --git a/nvim/.config/nvim/lua/lsp.lua b/nvim/.config/nvim/lua/lsp.lua
index 350d542..f831bbc 100644
--- a/nvim/.config/nvim/lua/lsp.lua
+++ b/nvim/.config/nvim/lua/lsp.lua
@@ -51,7 +51,7 @@ for _, lsp in ipairs(servers) do
     on_attach = on_attach,
     flags = {
       debounce_text_changes = 150,
-    }
+    },
   }
 end
 
diff --git a/nvim/.config/nvim/lua/lualine_.lua b/nvim/.config/nvim/lua/lualine_.lua
new file mode 100644
index 0000000..d8f6de9
--- /dev/null
+++ b/nvim/.config/nvim/lua/lualine_.lua
@@ -0,0 +1,31 @@
+require('lualine').setup{
+	options = {
+		icons_enabled = true,
+		theme = 'gruvbox',
+		component_separators = {'', ''},
+		section_separators = {'', ''},
+		disabled_filetypes = {}
+	},
+	sections = {
+		lualine_a = {'mode'},
+		lualine_b = {'branch'},
+		lualine_c = {'filename'},
+		lualine_x = {
+			{ 'diagnostics', sources = {"nvim_lsp"}, symbols = {error = ' ', warn = ' ', info = ' ', hint = ' '} },
+			'encoding',
+			'filetype'
+		},
+		lualine_y = {'progress'},
+		lualine_z = {'location'}
+	},
+	inactive_sections = {
+		lualine_a = {},
+		lualine_b = {},
+		lualine_c = {'filename'},
+		lualine_x = {'location'},
+		lualine_y = {},
+		lualine_z = {}
+	},
+	tabline = {},
+	extensions = {}
+}
diff --git a/nvim/.config/nvim/lua/mappings.lua b/nvim/.config/nvim/lua/mappings.lua
index 24c6e74..a482944 100644
--- a/nvim/.config/nvim/lua/mappings.lua
+++ b/nvim/.config/nvim/lua/mappings.lua
@@ -20,3 +20,4 @@ map('n', '<leader>e', '<cmd>Telescope find_files<cr>', {})
 map('n', '<leader>g', '<cmd>Telescope live_grep<cr>', {})
 map('n', '<leader>b', '<cmd>Telescope buffers<cr>', {})
 map('n', '<leader>h', '<cmd>Telescope help_tags<cr>', {})
+
diff --git a/nvim/.config/nvim/lua/plugins.lua b/nvim/.config/nvim/lua/plugins.lua
index 2fd4bd5..a488c82 100644
--- a/nvim/.config/nvim/lua/plugins.lua
+++ b/nvim/.config/nvim/lua/plugins.lua
@@ -48,22 +48,28 @@ return require('packer').startup(function()
     use 'tpope/vim-surround'
     use 'tpope/vim-repeat'
 
-    use 'neovim/nvim-lspconfig'
     use {
-        "hrsh7th/nvim-cmp",
+        'neovim/nvim-lspconfig',
+        requires = {
+            "hrsh7th/cmp-nvim-lsp"
+        }
+    }
+    use {
+        'hrsh7th/nvim-cmp',
         event = 'InsertEnter',
         config = [[require('completion')]],
         requires = {
             -- 'hrsh7th/vim-vsnip-integ',
+            'hrsh7th/vim-vsnip',
             'rafamadriz/friendly-snippets',
         },
     }
-    use {"hrsh7th/vim-vsnip", after = "nvim-cmp"}
-    use {"hrsh7th/cmp-vsnip", after = "nvim-cmp"}
-    use {"hrsh7th/cmp-buffer", after = "nvim-cmp"}
-    use {'hrsh7th/cmp-path', after = "nvim-cmp"}
-    use {"hrsh7th/cmp-nvim-lsp", after = "nvim-cmp"}
-    use {'f3fora/cmp-spell', after = "nvim-cmp"}
+    use {'hrsh7th/cmp-vsnip', after = 'nvim-cmp'}
+    use {'hrsh7th/cmp-buffer', after = 'nvim-cmp'}
+    use {'hrsh7th/cmp-path', after = 'nvim-cmp'}
+    use {'hrsh7th/cmp-nvim-lsp', after = 'nvim-cmp'}
+    use {'f3fora/cmp-spell', after = 'nvim-cmp'}
+
 
     use 'nvim-lua/popup.nvim'
     use {
diff --git a/nvim/.config/nvim/lua/settings.lua b/nvim/.config/nvim/lua/settings.lua
index 4a5fc33..9a45a4f 100644
--- a/nvim/.config/nvim/lua/settings.lua
+++ b/nvim/.config/nvim/lua/settings.lua
@@ -26,7 +26,7 @@ opt.cursorline = true             -- highlight current line
 opt.ignorecase = true             -- Ignore case on search
 opt.smartcase = true             -- ignore lowercse for the whoel pattern
 
--- opt.completeopt = 'menu,noselect,noinsert' -- completion options
+opt.completeopt = 'menuone,noselect,noinsert' -- completion options
 
 opt.spell = true
 opt.spelllang = {'fr', 'en'}