From dfe5665d96fb40de814804a4f88a53ab6fe9af19 Mon Sep 17 00:00:00 2001
From: Xavier Logerais <xavier.logerais-ext@malakoffhumanis.com>
Date: Thu, 2 Nov 2023 12:30:56 +0100
Subject: [PATCH] feat(plugins): Utilisation de la collection de plugins
 communautaire

---
 lua/user/init.lua                 |  7 +---
 lua/user/plugins/colorschemes.lua | 13 -------
 lua/user/plugins/community.lua    | 33 ++++++++++++++++
 lua/user/plugins/copilot.lua      | 65 +++++++++++++++++--------------
 lua/user/plugins/groovy.lua       |  3 ++
 5 files changed, 72 insertions(+), 49 deletions(-)
 create mode 100644 lua/user/plugins/community.lua
 create mode 100644 lua/user/plugins/groovy.lua

diff --git a/lua/user/init.lua b/lua/user/init.lua
index d48e76b..77586c5 100644
--- a/lua/user/init.lua
+++ b/lua/user/init.lua
@@ -1,5 +1,5 @@
 return {
-  colorscheme = "vscode",
+  colorscheme = "astrodark",
   -- This function is run last and is a good place to configuring
   -- augroups/autocommands and custom filetypes also this just pure lua so
   -- anything that doesn't fit in the normal config locations above can go here
@@ -42,10 +42,5 @@ return {
         Jenkinsfile = "groovy",
       },
     }
-
-    -- Copilot
-    -- TODO: find a better way
-    vim.g.copilot_no_tab_map = true
-    vim.cmd("imap <silent><script><expr> <C-a> copilot#Accept(\"\\<CR>\")")
   end,
 }
diff --git a/lua/user/plugins/colorschemes.lua b/lua/user/plugins/colorschemes.lua
index 5d0a5e5..0aa08a6 100644
--- a/lua/user/plugins/colorschemes.lua
+++ b/lua/user/plugins/colorschemes.lua
@@ -1,20 +1,7 @@
 return {
-  { 'arcticicestudio/nord-vim',         lazy = false },
-  { 'shaunsingh/nord.nvim',             lazy = false },
-  { 'andersevenrud/nordic.nvim',        lazy = false },
-  { 'cocopon/iceberg.vim',              lazy = false },
-
   { 'jacoborus/tender.vim',             lazy = false },
   { 'altercation/vim-colors-solarized', lazy = false },
   { 'bluz71/vim-moonfly-colors',        lazy = false },
   { 'joshdick/onedark.vim',             lazy = false },
   { 'ray-x/aurora',                     lazy = false },
-  {
-    'projekt0n/github-nvim-theme',
-    version = 'v0.0.7',
-    lazy = false
-  },
-
-  -- Default theme
-  { 'Mofiqul/vscode.nvim', lazy = false },
 }
diff --git a/lua/user/plugins/community.lua b/lua/user/plugins/community.lua
new file mode 100644
index 0000000..a1ef36b
--- /dev/null
+++ b/lua/user/plugins/community.lua
@@ -0,0 +1,33 @@
+return {
+  -- Add the community repository of plugin specifications
+  "AstroNvim/astrocommunity",
+  -- example of importing a plugin, comment out to use it or add your own
+  -- available plugins can be found at https://github.com/AstroNvim/astrocommunity
+  -- { import = "astrocommunity.colorscheme.catppuccin" },
+  -- { import = "astrocommunity.pack.rust" },
+  -- { import = "astrocommunity.pack.python" },
+  --
+  -- Personal config
+  { import = "astrocommunity.pack.bash" },
+  { import = "astrocommunity.pack.json" },
+  { import = "astrocommunity.pack.yaml" },
+  { import = "astrocommunity.pack.toml" },
+  { import = "astrocommunity.pack.markdown" },
+  { import = "astrocommunity.pack.ansible" },
+  { import = "astrocommunity.pack.docker" },
+  { import = "astrocommunity.pack.helm" },
+  { import = "astrocommunity.pack.terraform" },
+
+  { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" },
+  { import = "astrocommunity.bars-and-lines.vim-illuminate" },
+  { import = "astrocommunity.editing-support.todo-comments-nvim" },
+  { import = "astrocommunity.programming-language-support.rest-nvim" },
+  { import = "astrocommunity.completion.copilot-lua-cmp" },
+  { import = "astrocommunity.diagnostics.trouble-nvim" },
+
+  { import = "astrocommunity.colorscheme.vscode-nvim" },
+  { import = "astrocommunity.colorscheme.github-nvim-theme" },
+  { import = "astrocommunity.colorscheme.nord-nvim" },
+  { import = "astrocommunity.colorscheme.nordic-nvim" },
+  { import = "astrocommunity.colorscheme.iceberg-vim" },
+}
diff --git a/lua/user/plugins/copilot.lua b/lua/user/plugins/copilot.lua
index 9aced8e..edb5cb9 100644
--- a/lua/user/plugins/copilot.lua
+++ b/lua/user/plugins/copilot.lua
@@ -1,36 +1,41 @@
 -- Github Copilot
 
+-- Désactivé en faveur de la version communautaire (définie dans plugins/community.lua)
+return {}
+
 -- Official plugin
+
 -- https://docs.github.com/fr/copilot/getting-started-with-github-copilot?tool=neovim
-return {
-  {
-    "github/copilot.vim",
-    event = "InsertEnter",
-    keys = {
-      { "<F12>", "<cmd>Copilot panel<CR>", mode = { "n", "i", "v" }, desc = "Display Copilot panel" },
-      -- { "<C-a>", "<cmd>copilot#Accept()<CR>", mode = "i", desc = "Accept Copilot solution", { silent = true, expr = true } },
-    },
-  }
+-- return {
+--   {
+--     "github/copilot.vim",
+--     event = "InsertEnter",
+--     keys = {
+--       { "<F12>", "<cmd>Copilot panel<CR>", mode = { "n", "i", "v" }, desc = "Display Copilot panel" },
+--       { "<C-a>", "<cmd>copilot#Accept()<CR>", mode = "i", desc = "Accept Copilot solution", { silent = true, expr = true } },
+--     },
+--   }
+-- }
+-- Exemple de configuration des touches
+-- imap <silent><script><expr> <C-J> copilot#Accept("\<CR>")
+-- let g:copilot_no_tab_map = v:true
 
-  -- imap <silent><script><expr> <C-J> copilot#Accept("\<CR>")
-  -- let g:copilot_no_tab_map = v:true
+-- Alternative plugin in pure lua
 
-  -- Alternative plugin in pure lua
-  -- https://github.com/zbirenbaum/copilot.lua
-  -- return {
-  --   {
-  --     "zbirenbaum/copilot.lua",
-  --     config = function()
-  --       require("copilot").setup()
-  --     end,
-  --     cmd = "Copilot",
-  --     event = "InsertEnter",
-  --   }
-  --   ,
-  --   -- {
-  --   --   "zbirenbaum/copilot-cmp",
-  --   --   config = function()
-  --   --     require("copilot_cmp").setup()
-  --   --   end
-  --   -- }
-}
+-- https://github.com/zbirenbaum/copilot.lua
+-- return {
+--   {
+--     "zbirenbaum/copilot.lua",
+--     config = function()
+--       require("copilot").setup()
+--     end,
+--     cmd = "Copilot",
+--     event = "InsertEnter",
+--   }
+--   ,
+--   -- {
+--   --   "zbirenbaum/copilot-cmp",
+--   --   config = function()
+--   --     require("copilot_cmp").setup()
+--   --   end
+--   -- }
diff --git a/lua/user/plugins/groovy.lua b/lua/user/plugins/groovy.lua
new file mode 100644
index 0000000..713d391
--- /dev/null
+++ b/lua/user/plugins/groovy.lua
@@ -0,0 +1,3 @@
+return {
+  { "modille/groovy.vim", lazy = false },
+}