feat: Update community plugins selection

.gitignore

@@ -1 +0,0 @@
-lazy-lock.json

README.md

@@ -1,6 +1,6 @@
 # AstroNvim Template
 
-**NOTE:** This is for AstroNvim v6+
+**NOTE:** This is for AstroNvim v5+
 
 A template for getting started with [AstroNvim](https://github.com/AstroNvim/AstroNvim)
 

init.lua

@@ -1,18 +1,10 @@
 -- This file simply bootstraps the installation of Lazy.nvim and then calls other files for execution
 -- This file doesn't necessarily need to be touched, BE CAUTIOUS editing this file and proceed at your own risk.
 local lazypath = vim.env.LAZY or vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
-
 if not (vim.env.LAZY or (vim.uv or vim.loop).fs_stat(lazypath)) then
   -- stylua: ignore
-  local result = vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
+  vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
-  if vim.v.shell_error ~= 0 then
-    -- stylua: ignore
-    vim.api.nvim_echo({ { ("Error cloning lazy.nvim:\n%s\n"):format(result), "ErrorMsg" }, { "Press any key to exit...", "MoreMsg" } }, true, {})
-    vim.fn.getchar()
-    vim.cmd.quit()
 end
-end
-
 vim.opt.rtp:prepend(lazypath)
 
 -- validate that lazy is available

lua/community.lua

@@ -28,12 +28,13 @@ return {
   -- { import = "astrocommunity.pack.html-css" },
   -- { import = "astrocommunity.pack.angular" },
 
-  { import = "astrocommunity.pack.ansible" },
+  -- { import = "astrocommunity.pack.ansible" },
-  { import = "astrocommunity.pack.terraform" },
+  -- { import = "astrocommunity.pack.terraform" },
-  { import = "astrocommunity.pack.docker" },
+  -- { import = "astrocommunity.pack.docker" },
-  { import = "astrocommunity.pack.helm" },
+  -- { import = "astrocommunity.pack.helm" },
 
   -- { import = "astrocommunity.pack.rainbow-delimiter-indent-blankline" },
+  { import = "astrocommunity.indent.indent-rainbowline" },
 
 	-- Recipes
 
@@ -43,24 +44,33 @@ return {
 	{ import = "astrocommunity.recipes.cache-colorscheme" },
 	{ import = "astrocommunity.recipes.neo-tree-dark" },
 	{ import = "astrocommunity.recipes.neovide" },
-  { import = "astrocommunity.recipes.ai" },
 
 	-- Completion
 	{ import = "astrocommunity.completion.blink-cmp-git" },
 	{ import = "astrocommunity.completion.blink-cmp-emoji" },
-  { import = "astrocommunity.completion.cmp-nerdfont" },
-  { import = "astrocommunity.completion.copilot-lua-cmp" },
 	-- { import = "astrocommunity.completion.cmp-spell" },
-
+	-- { import = "astrocommunity.completion.copilot-lua-cmp" },
-  -- AI
-  { import = "astrocommunity.ai.copilotchat-nvim" },
-  -- { import = "astrocommunity.completion.minuet-ai-nvim" },
 
 	-- Telescope
 	{ import = "astrocommunity.terminal-integration.toggleterm-manager-nvim" }, -- A Telescope extension to manage Toggleterm's terminals in NeoVim
 	-- { import = "astrocommunity.file-explorer.telescope-file-browser-nvim" },
 
-  -- Colorschemes
+	-- Individual plugins (misc)
+
+	-- { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" }, -- display a column when text width exceed defined limit
+	{ import = "astrocommunity.diagnostics.trouble-nvim" },
+	{ import = "astrocommunity.editing-support.nvim-devdocs" },
+	{ import = "astrocommunity.git.diffview-nvim" },
+	{ import = "astrocommunity.markdown-and-latex.render-markdown-nvim" },
+	{ import = "astrocommunity.motion.marks-nvim" }, -- Display marks in the sign column
+	{ import = "astrocommunity.workflow.hardtime-nvim" }, -- Display hints to get rid of bad habits
+	{ import = "astrocommunity.programming-language-support.kulala-nvim" }, -- A minimal HTTP-client interface for Neovim
+
+	-- { import = "astrocommunity.editing-support.chatgpt-nvim" },
+	-- { import = "astrocommunity.programming-language-support.rest-nvim" },
+	-- { import = "astrocommunity.project.project-nvim" },
+
+	-- Individual plugins (colorschemes)
 	{ import = "astrocommunity.colorscheme.vscode-nvim" },
 	{ import = "astrocommunity.colorscheme.github-nvim-theme" },
 	{ import = "astrocommunity.colorscheme.neosolarized-nvim" },
@@ -71,25 +81,6 @@ return {
 	{ import = "astrocommunity.colorscheme.tokyonight-nvim" },
 	{ import = "astrocommunity.colorscheme.onedarkpro-nvim" },
 
-  -- Individual plugins (misc)
-
-  { import = "astrocommunity.diagnostics.trouble-nvim" },
-  { import = "astrocommunity.motion.marks-nvim" }, -- Display marks in the sign column
-  { import = "astrocommunity.git.diffview-nvim" },
-  { import = "astrocommunity.markdown-and-latex.render-markdown-nvim" },
-  -- { import = "astrocommunity.markdown-and-latex.markview-nvim" },
-  { import = "astrocommunity.programming-language-support.kulala-nvim" }, -- A minimal HTTP-client interface for Neovim
-  { import = "astrocommunity.indent.indent-rainbowline" },
-  { import = "astrocommunity.editing-support.nvim-devdocs" },
-  -- { import = "astrocommunity.workflow.hardtime-nvim" }, -- Display hints to get rid of bad habits
-
-  -- Disabled
-
-  -- { import = "astrocommunity.bars-and-lines.smartcolumn-nvim" }, -- display a column when text width exceed defined limit
-  -- { import = "astrocommunity.editing-support.chatgpt-nvim" },
-  -- { import = "astrocommunity.programming-language-support.rest-nvim" },
-  -- { import = "astrocommunity.project.project-nvim" },
-
 	-- Individual plugins customization
 	-- {
 	--   "nvim-treesitter/nvim-treesitter",

lua/lazy_setup.lua

@@ -1,7 +1,7 @@
 require("lazy").setup({
   {
     "AstroNvim/AstroNvim",
-    version = "^6", -- Remove version tracking to elect for nightly AstroNvim
+    version = "^5", -- Remove version tracking to elect for nightly AstroNvim
     import = "astronvim.plugins",
     opts = { -- AstroNvim options must be set here with the `import` key
       mapleader = " ", -- This ensures the leader key must be configured before Lazy is set up
@@ -20,13 +20,13 @@ require("lazy").setup({
   performance = {
     rtp = {
       -- disable some rtp plugins, add more to your liking
-      disabled_plugins = {
+      -- disabled_plugins = {
       --   "gzip",
       --   "netrwPlugin",
       --   "tarPlugin",
-        "tohtml",
+      --   "tohtml",
-        "zipPlugin",
+      --   "zipPlugin",
-      },
+      -- },
     },
   },
 } --[[@as LazyConfig]])

lua/plugins/astrocore.lua

@@ -35,50 +35,11 @@ return {
         [".*/etc/foo/.*"] = "fooscript",
       },
     },
-    -- Commands
-    commands = {
-      CleanYamlSpaces = {
-        function()
-          if vim.bo.filetype == 'yaml' or vim.bo.filetype == 'yml' then
-            local cursor_pos = vim.api.nvim_win_get_cursor(0)
-            vim.cmd([[%s/\s\+$//e]])
-            vim.api.nvim_win_set_cursor(0, cursor_pos)
-            print("Espaces en fin de ligne supprimés")
-          else
-            print("Cette commande ne fonctionne que sur les fichiers YAML")
-          end
-        end,
-        desc = "Nettoie les espaces en fin de ligne dans les fichiers YAML",
-      },
-    },
-    -- Autocmd
-    autocmds = {
-      yaml_trailing_spaces = {
-        {
-          event = { "BufRead", "BufNewFile" },
-          pattern = { "*.yaml", "*.yml" },
-          callback = function()
-            vim.fn.matchadd("TrailingWhiteSpace", "\\s\\+$")
-          end,
-          desc = "Surligne les espaces en fin de ligne dans les fichiers YAML",
-        },
-        {
-          event = "BufWritePre",
-          pattern = { "*.yaml", "*.yml" },
-          callback = function()
-            local cursor_pos = vim.api.nvim_win_get_cursor(0)
-            vim.cmd([[%s/\s\+$//e]])
-            vim.api.nvim_win_set_cursor(0, cursor_pos)
-          end,
-          desc = "Nettoie les espaces en fin de ligne avant sauvegarde",
-        },
-      },
-    },
     -- vim options can be configured here
     options = {
       opt = { -- vim.opt.<key>
         number = true, -- sets vim.opt.number
-        relativenumber = true, -- sets vim.opt.relativenumber
+        relativenumber = false, -- sets vim.opt.relativenumber
         spell = false, -- sets vim.opt.spell
         spelllang = "fr", -- Set spell language to french
         signcolumn = "yes", -- sets vim.opt.signcolumn to yes
@@ -88,6 +49,7 @@ return {
         -- configure global vim variables (vim.g)
         -- NOTE: `mapleader` and `maplocalleader` must be set in the AstroNvim opts or before `lazy.setup`
         -- This can be found in the `lua/lazy_setup.lua` file
+
       },
     },
     -- Mappings can be configured through AstroCore as well.
@@ -110,8 +72,6 @@ return {
           end,
           desc = "Close buffer from tabline",
         },
-        ["<Leader>bp"] = { function() require("astrocore.buffer").nav(-vim.v.count1) end, desc = "Previous buffer" },
-        ["<Leader>bn"] = { function() require("astrocore.buffer").nav(vim.v.count1) end, desc = "Next buffer" },
 
         -- tables with just a `desc` key will be registered with which-key if it's installed
         -- this is useful for naming menus
@@ -122,32 +82,15 @@ return {
 
         -- Normal mode : Custom mappings
         ["<F2>"] = { "<cmd>Neotree toggle<cr>", desc = "File Explorer" }, -- F26 corresponds to <Ctrl+F2> on my keyboard
-        ["<F3>"] = {
+        ["<F3>"] = { function() require("astrocore").toggle_term_cmd({cmd="lazygit", direction="float"}) end, desc = "Lazygit terminal" }, -- F27 corresponds to <Ctrl+F3> on my keyboard
-          function() require("astrocore").toggle_term_cmd { cmd = "lazygit", direction = "float" } end,
+        ["<F4>"] = { function() require("astrocore").toggle_term_cmd({cmd="tig", direction="float"}) end, desc = "Tig terminal" }, -- F28 corresponds to <Ctrl+F4> on my keyboard
-          desc = "Lazygit terminal",
-        },
-        ["<F4>"] = {
-          function() require("astrocore").toggle_term_cmd { cmd = "tig", direction = "float" } end,
-          desc = "Tig terminal",
-        },
       },
       -- Insert mode : Custom mappings
       i = {
         ["<F2>"] = { "<cmd>Neotree toggle<cr>", desc = "File Explorer" }, -- F26 corresponds to <Ctrl+F2> on my keyboard
-        ["<F3>"] = {
+        ["<F3>"] = { function() require("astrocore").toggle_term_cmd({cmd="lazygit", direction="float"}) end, desc = "Lazygit terminal" }, -- F27 corresponds to <Ctrl+F3> on my keyboard
-          function() require("astrocore").toggle_term_cmd { cmd = "lazygit", direction = "float" } end,
+        ["<F4>"] = { function() require("astrocore").toggle_term_cmd({cmd="tig", direction="float"}) end, desc = "Tig terminal" }, -- F28 corresponds to <Ctrl+F4> on my keyboard
-          desc = "Lazygit terminal",
       },
-        ["<F4>"] = {
-          function() require("astrocore").toggle_term_cmd { cmd = "tig", direction = "float" } end,
-          desc = "Tig terminal",
-        },
-      },
-      -- INFO:
-      -- F26 corresponds to <Ctrl+F2> on my keyboard
-      -- F27 corresponds to <Ctrl+F3> on my keyboard
-      -- F28 corresponds to <Ctrl+F4> on my keyboard
-
       -- Terminal mode : Custom mappings
       t = {
         -- Switch to normal mode in terminal mode
@@ -159,15 +102,10 @@ return {
         ["<C-j>"] = false,
         ["<C-k>"] = false,
         -- My terms
-        ["<F3>"] = {
+        ["<F3>"] = { function() require("astrocore").toggle_term_cmd({cmd="lazygit", direction="float"}) end, desc = "Lazygit terminal" }, -- F27 corresponds to <Ctrl+F3> on my keyboard
-          function() require("astrocore").toggle_term_cmd { name = "LazyGit", cmd = "lazygit", direction = "float" } end,
+        ["<F4>"] = { function() require("astrocore").toggle_term_cmd({cmd="tig", direction="float"}) end, desc = "Tig terminal" }, -- F28 corresponds to <Ctrl+F4> on my keyboard
-          desc = "Lazygit terminal",
-        }, -- F27 corresponds to <Ctrl+F3> on my keyboard
-        ["<F4>"] = {
-          function() require("astrocore").toggle_term_cmd { name = "Tig", cmd = "tig", direction = "float" } end,
-          desc = "Tig terminal",
-        }, -- F28 corresponds to <Ctrl+F4> on my keyboard
       },
+
     },
   },
 }

lua/plugins/astrolsp.lua

@@ -41,18 +41,19 @@ return {
     servers = {
       -- "pyright"
     },
-    -- customize language server configuration passed to `vim.lsp.config`
+    -- customize language server configuration options passed to `lspconfig`
-    -- client specific configuration can also go in `lsp/` in your configuration root (see `:h lsp-config`)
+    ---@diagnostic disable: missing-fields
     config = {
-      -- ["*"] = { capabilities = {} }, -- modify default LSP client settings such as capabilities
+      -- clangd = { capabilities = { offsetEncoding = "utf-8" } },
     },
     -- customize how language servers are attached
     handlers = {
-      -- a function with the key `*` modifies the default handler, functions takes the server name as the parameter
+      -- a function without a key is simply the default handler, functions take two parameters, the server name and the configured options table for that server
-      -- ["*"] = function(server) vim.lsp.enable(server) end
+      -- function(server, opts) require("lspconfig")[server].setup(opts) end
 
-      -- the key is the server that is being setup with `vim.lsp.config`
+      -- the key is the server that is being setup with `lspconfig`
       -- rust_analyzer = false, -- setting a handler to false will disable the set up of that language server
+      -- pyright = function(_, opts) require("lspconfig").pyright.setup(opts) end -- or a custom handler function can be passed
     },
     -- Configure buffer local auto commands to add when attaching a language server
     autocmds = {
@@ -71,7 +72,7 @@ return {
           -- the rest of the autocmd options (:h nvim_create_autocmd)
           desc = "Refresh codelens (buffer)",
           callback = function(args)
-            if require("astrolsp").config.features.codelens then vim.lsp.codelens.enable(true, { bufnr = args.buf }) end
+            if require("astrolsp").config.features.codelens then vim.lsp.codelens.refresh { bufnr = args.buf } end
           end,
         },
       },
@@ -89,13 +90,13 @@ return {
           function() require("astrolsp.toggles").buffer_semantic_tokens() end,
           desc = "Toggle LSP semantic highlight (buffer)",
           cond = function(client)
-            return client:supports_method "textDocument/semanticTokens/full" and vim.lsp.semantic_tokens ~= nil
+            return client.supports_method "textDocument/semanticTokens/full" and vim.lsp.semantic_tokens ~= nil
           end,
         },
       },
     },
     -- A custom `on_attach` function to be run after the default `on_attach` function
-    -- takes two parameters `client` and `bufnr`  (`:h lsp-attach`)
+    -- takes two parameters `client` and `bufnr`  (`:h lspconfig-setup`)
     on_attach = function(client, bufnr)
       -- this would disable semanticTokensProvider for all clients
       -- client.server_capabilities.semanticTokensProvider = nil

lua/plugins/astroui.lua

@@ -1,4 +1,4 @@
--- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
+if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
 
 -- AstroUI provides the basis for configuring the AstroNvim User Interface
 -- Configuration documentation can be found with `:h astroui`
@@ -16,7 +16,6 @@ return {
     highlights = {
       init = { -- this table overrides highlights in all themes
         -- Normal = { bg = "#000000" },
-        TrailingWhiteSpace = { bg = "red" },
       },
       astrodark = { -- a table of overrides/changes when applying the astrotheme theme
         -- Normal = { bg = "#000000" },

lua/plugins/codecompanion.lua

@@ -1,62 +0,0 @@
-local prefix = "<Leader>A"
-
----@type LazySpec
-return {
-  {
-    "olimorris/codecompanion.nvim",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "nvim-treesitter/nvim-treesitter",
-      {
-        "AstroNvim/astrocore",
-        ---@param opts AstroCoreOpts
-        opts = function(_, opts)
-          if not opts.mappings then opts.mappings = {} end
-
-          opts.mappings.n[prefix] = { desc = require("astroui").get_icon("CodeCompanion", 1, true) .. "CodeCompanion" }
-          opts.mappings.v[prefix] = { desc = require("astroui").get_icon("CodeCompanion", 1, true) .. "CodeCompanion" }
-
-          opts.mappings.n[prefix .. "c"] = { "<cmd>CodeCompanionChat Toggle<cr>", desc = "Toggle chat" }
-          opts.mappings.v[prefix .. "c"] = { "<cmd>CodeCompanionChat Toggle<cr>", desc = "Toggle chat" }
-
-          opts.mappings.n[prefix .. "p"] = { "<cmd>CodeCompanionActions<cr>", desc = "Open action palette" }
-          opts.mappings.v[prefix .. "p"] = { "<cmd>CodeCompanionActions<cr>", desc = "Open action palette" }
-
-          opts.mappings.n[prefix .. "q"] = { "<cmd>CodeCompanion<cr>", desc = "Open inline assistant" }
-          opts.mappings.v[prefix .. "q"] = { "<cmd>CodeCompanion<cr>", desc = "Open inline assistant" }
-
-          opts.mappings.v[prefix .. "a"] = { "<cmd>CodeCompanionChat Add<cr>", desc = "Add selection to chat" }
-
-          -- Expand cc to CodeCompanion in cmdline mode
-          vim.cmd [[cab cc CodeCompanion]]
-        end,
-      },
-      { "AstroNvim/astroui", opts = { icons = { CodeCompanion = "󱙺" } } },
-    },
-    event = "User AstroFile",
-    cmd = {
-      "CodeCompanion",
-      "CodeCompanionActions",
-      "CodeCompanionChat",
-      "CodeCompanionCmd",
-    },
-    opts = {
-      strategies = {
-        chat = {
-          adapter = "mistral",
-        },
-        inline = {
-          adapter = "mistral",
-        },
-      },
-    },
-  },
-  {
-    "MeanderingProgrammer/render-markdown.nvim",
-    optional = true,
-    opts = function(_, opts)
-      if not opts.file_types then opts.file_types = { "markdown" } end
-      opts.file_types = require("astrocore").list_insert_unique(opts.file_types, { "codecompanion" })
-    end,
-  },
-}

lua/plugins/minuet-ai.lua

@@ -1,71 +0,0 @@
--- if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
-return {
-  "milanglacier/minuet-ai.nvim",
-  opts = {
-    -- provider = "codestral",
-    virtualtext = {
-      auto_trigger_ft = { "sh", "lua", "python", "yaml", "json" },
-      keymap = {
-        -- accept whole completion
-        accept = "<A-y>",
-        -- accept one line
-        accept_line = "<A-l>",
-        -- accept n lines (prompts for number)
-        -- e.g. "A-z 2 CR" will accept 2 lines
-        accept_n_lines = "<A-z>",
-        -- Cycle to prev completion item, or manually invoke completion
-        prev = "<A-[>",
-        -- Cycle to next completion item, or manually invoke completion
-        next = "<A-]>",
-        -- Dismiss
-        dismiss = "<A-c>",
-      },
-    },
-  },
-  -- specs = {
-  --   "Saghen/blink.cmp",
-  --   optional = true,
-  --   opts = {
-  --     keymap = {
-  --       -- Manually invoke minuet completion.
-  --       ["<A-y>"] = require("minuet").make_blink_map(),
-  --     },
-  --     sources = {
-  --       -- Enable minuet for autocomplete
-  --       default = { "lsp", "path", "buffer", "snippets", "minuet" },
-  --       -- For manual completion only, remove 'minuet' from default
-  --       providers = {
-  --         minuet = {
-  --           name = "minuet",
-  --           module = "minuet.blink",
-  --           async = true,
-  --           -- Should match minuet.config.request_timeout * 1000,
-  --           -- since minuet.config.request_timeout is in seconds
-  --           timeout_ms = 3000,
-  --           score_offset = 50, -- Gives minuet higher priority among suggestions
-  --         },
-  --       },
-  --     },
-  --     -- Recommended to avoid unnecessary request
-  --     completion = { trigger = { prefetch_on_insert = false } },
-  --   },
-  -- },
-  -- specs = {
-  --   {
-  --     "AstroNvim/astrocore",
-  --     opts = {
-  --       options = {
-  --         g = {
-  --           -- set the ai_accept function
-  --           ai_accept = function()
-  --             if require("minuet.virtualtext").action.is_visible then
-  --               vim.api.nvim_input(require("minuet.virtualtext").action.accept_n_lines)
-  --               return true
-  --             end
-  --           end,
-  --         },
-  --       },
-  --     },
-  --   },
-  -- },
-}

lua/plugins/treesitter.lua

@@ -1,24 +1,15 @@
 if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
 
 -- Customize Treesitter
--- --------------------
--- Treesitter customizations are handled with AstroCore
--- as nvim-treesitter simply provides a download utility for parsers
 
 ---@type LazySpec
 return {
-  "AstroNvim/astrocore",
+  "nvim-treesitter/nvim-treesitter",
-  ---@type AstroCoreOpts
   opts = {
-    treesitter = {
-      highlight = true, -- enable/disable treesitter based highlighting
-      indent = true, -- enable/disable treesitter based indentation
-      auto_install = true, -- enable/disable automatic installation of detected languages
     ensure_installed = {
       "lua",
       "vim",
       -- add more arguments for adding more treesitter parsers
     },
   },
-  },
 }

lua/plugins/user.lua

@@ -49,12 +49,10 @@ return {
   {
     "L3MON4D3/LuaSnip",
     config = function(plugin, opts)
+      require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call
       -- add more custom luasnip configuration such as filetype extend or custom snippets
       local luasnip = require "luasnip"
       luasnip.filetype_extend("javascript", { "javascriptreact" })
-
-      -- include the default astronvim config that calls the setup call
-      require "astronvim.plugins.configs.luasnip"(plugin, opts)
     end,
   },
 

lua/polish.lua

@@ -1,5 +1,16 @@
-if true then return end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
-
 -- This will run last in the setup process.
 -- This is just pure lua so anything that doesn't
 -- fit in the normal config locations above can go here
+
+-- Custom keymaps
+
+-- use gp to set visual selection on the recently pasted text
+vim.keymap.set('n', 'gp', '`[v`]', { desc = 'Visual selection of pasted text' })
+
+-- Needed for python3 through mise
+-- Locate python3 using PATH
+local python_path = vim.fn.exepath("python3")
+if python_path == nil or python_path == "" then
+else
+  vim.g.python3_host_prog = python_path
+end