From a5b47c9cb78cc58f876069f68bb746ab564c1592 Mon Sep 17 00:00:00 2001
From: Bruno Carlin <dev@mail.bcarlin.net>
Date: Tue, 10 Oct 2023 16:46:31 +0200
Subject: [PATCH] fix(nvim): update plugin config to newer versions

---
 nvim/.config/nvim/lua/lsp/gopls.lua        |  5 ++++
 nvim/.config/nvim/lua/plugins/diffview.lua | 32 ++++++++++++----------
 nvim/.config/nvim/lua/plugins/indent.lua   |  9 +++---
 nvim/.config/nvim/lua/plugins/main.lua     |  2 +-
 nvim/.config/nvim/lua/plugins/neogit.lua   |  2 ++
 nvim/.config/nvim/lua/plugins/nvimtree.lua |  1 -
 6 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/nvim/.config/nvim/lua/lsp/gopls.lua b/nvim/.config/nvim/lua/lsp/gopls.lua
index 3c6d331..0c8dffa 100644
--- a/nvim/.config/nvim/lua/lsp/gopls.lua
+++ b/nvim/.config/nvim/lua/lsp/gopls.lua
@@ -6,12 +6,17 @@ vim.api.nvim_create_autocmd('BufWritePre', {
   end
 })
 
+local capabilities = require('cmp_nvim_lsp').default_capabilities()
+
 require('lspconfig').gopls.setup {
+    capabilities = capabilities,
     flags = {
         debounce_text_changes = 150,
     },
+    cmd = {'gopls', '--remote=auto'},
     settings = {
         gopls = {
+            vulncheck = "Imports",
             gofumpt = true,
             usePlaceholders = true,
             completeUnimported = true,
diff --git a/nvim/.config/nvim/lua/plugins/diffview.lua b/nvim/.config/nvim/lua/plugins/diffview.lua
index 82363d3..56ef95c 100644
--- a/nvim/.config/nvim/lua/plugins/diffview.lua
+++ b/nvim/.config/nvim/lua/plugins/diffview.lua
@@ -26,21 +26,23 @@ require("diffview").setup({
   },
   file_history_panel = {
     log_options = {
-      single_file = {
-        max_count = 256,      -- Limit the number of commits
-        follow = false,       -- Follow renames (only for single file)
-        all = false,          -- Include all refs under 'refs/' including HEAD
-        merges = false,       -- List only merge commits
-        no_merges = false,    -- List no merge commits
-        reverse = false,      -- List commits in reverse order
-      },
-      multi_file = {
-        max_count = 256,      -- Limit the number of commits
-        follow = false,       -- Follow renames (only for single file)
-        all = false,          -- Include all refs under 'refs/' including HEAD
-        merges = false,       -- List only merge commits
-        no_merges = false,    -- List no merge commits
-        reverse = false,      -- List commits in reverse order
+      git = {
+        single_file = {
+          max_count = 256,      -- Limit the number of commits
+          follow = false,       -- Follow renames (only for single file)
+          all = false,          -- Include all refs under 'refs/' including HEAD
+          merges = false,       -- List only merge commits
+          no_merges = false,    -- List no merge commits
+          reverse = false,      -- List commits in reverse order
+        },
+        multi_file = {
+          max_count = 256,      -- Limit the number of commits
+          follow = false,       -- Follow renames (only for single file)
+          all = false,          -- Include all refs under 'refs/' including HEAD
+          merges = false,       -- List only merge commits
+          no_merges = false,    -- List no merge commits
+          reverse = false,      -- List commits in reverse order
+        },
       },
     },
     win_config = {          -- See ':h diffview-config-win_config'
diff --git a/nvim/.config/nvim/lua/plugins/indent.lua b/nvim/.config/nvim/lua/plugins/indent.lua
index 8fd58bf..a962c6d 100644
--- a/nvim/.config/nvim/lua/plugins/indent.lua
+++ b/nvim/.config/nvim/lua/plugins/indent.lua
@@ -1,6 +1,7 @@
-vim.g.indent_blankline_char='│'
+--vim.g.indent_blankline_char='│'
 
-require("indent_blankline").setup {
-    show_current_context = true,
-    show_current_context_start = true,
+vim.api.nvim_set_hl(0, "IblScope", { ctermfg=2, bold=true})
+
+require("ibl").setup {
+  indent = { char = "▏" },
 }
diff --git a/nvim/.config/nvim/lua/plugins/main.lua b/nvim/.config/nvim/lua/plugins/main.lua
index f49caff..a7f82e6 100644
--- a/nvim/.config/nvim/lua/plugins/main.lua
+++ b/nvim/.config/nvim/lua/plugins/main.lua
@@ -64,7 +64,7 @@ return require('packer').startup(function(use)
         -- tag = 'release' -- To use the latest release
     }
     use {
-        'TimUntersberger/neogit',
+        'NeogitOrg/neogit',
         requires = {
             'nvim-lua/plenary.nvim'
         },
diff --git a/nvim/.config/nvim/lua/plugins/neogit.lua b/nvim/.config/nvim/lua/plugins/neogit.lua
index 41481e5..e5c4fdc 100644
--- a/nvim/.config/nvim/lua/plugins/neogit.lua
+++ b/nvim/.config/nvim/lua/plugins/neogit.lua
@@ -48,9 +48,11 @@ require("neogit").setup {
       folded = true
     },
     unpulled = {
+      hidden = false,
       folded = true
     },
     unmerged = {
+      hidden = false,
       folded = false
     },
     recent = {
diff --git a/nvim/.config/nvim/lua/plugins/nvimtree.lua b/nvim/.config/nvim/lua/plugins/nvimtree.lua
index f81ad53..63374a8 100644
--- a/nvim/.config/nvim/lua/plugins/nvimtree.lua
+++ b/nvim/.config/nvim/lua/plugins/nvimtree.lua
@@ -41,7 +41,6 @@ require('nvim-tree').setup {
     },
     view = {
         width = 30,
-        hide_root_folder = false,
         side = 'left',
     },
     renderer = {