Update to AstroNvim v6

.luarc.json

@@ -0,0 +1,3 @@
+{
+  "format.enable": false
+}

README.md

@@ -4,8 +4,9 @@ A Neovim configuration based on the [AstroNvim](https://astronvim.com/) distribu
 
 ## ⚡ Requirements
 
-- [Neovim v0.10+](https://neovim.io/)
+- [Neovim v0.11+](https://neovim.io/)
 - [Git v2.19.0+](https://git-scm.com/)
+- [Tree-sitter CLI](https://github.com/tree-sitter/tree-sitter/blob/master/crates/cli/README.md) (_Note:_ If not installed, this will be auto-installed with Mason if available)
 - A C compiler in your path and `libstdc++` installed (Ex. `gcc`, `clang`, `zig`, [Windows users please read this!](https://github.com/nvim-treesitter/nvim-treesitter/wiki/Windows-support))
 - [A Nerd Font](https://www.nerdfonts.com/)
 - [A Terminal with true color support](https://github.com/termstandard/colors?tab=readme-ov-file#truecolor-support-in-output-devices)[^1]

init.lua

@@ -8,7 +8,10 @@ vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup {
   -- Add AstroNvim and import the plugins it provides
-  { "AstroNvim/AstroNvim", version = "^5", import = "astronvim.plugins" },
+  { "AstroNvim/AstroNvim", branch = "v6", import = "astronvim.plugins" },
+  { "AstroNvim/astrolsp", branch = "v4" },
+  { "AstroNvim/astrocore", branch = "v3" },
+  { "AstroNvim/astroui", branch = "v4" },
   -- Load AstroNvim community marketplace plugins before user plugins
   { import = "cape.community" },
   -- Load CAPE plugins last

lua/cape/plugins/bash.lua

@@ -4,23 +4,16 @@
 
 ---@type LazySpec
 return {
-  {
+  { -- Treesitter parsers to be installed and filetypes
     "astrocore",
     ---@type AstroCoreOpts
     opts = {
-      filetypes = {
-        pattern = {
-          ["%.env%.[%w_.-]+"] = "sh",
-        },
-      },
-    },
-  },
-  { -- Treesitter parsers to be installed
-    "nvim-treesitter",
-    opts = {
-      ensure_installed = {
+      filetypes = { pattern = {
+        ["%.env%.[%w_.-]+"] = "sh",
+      } },
+      treesitter = { ensure_installed = {
         "bash",
-      },
+      } },
     },
   },
   { -- Tools to be installed

lua/cape/plugins/docker.lua

@@ -4,12 +4,19 @@
 
 ---@type LazySpec
 return {
-  { -- Treesitter parsers to be installed
-    "nvim-treesitter",
+  { -- Treesitter parsers to be installed and filetypes
+    "AstroNvim/astrocore",
+    ---@type AstroCoreOpts
     opts = {
-      ensure_installed = {
-        "dockerfile",
+      filetypes = {
+        filename = {
+          ["docker-compose.yml"] = "yaml.docker-compose",
+          ["docker-compose.yaml"] = "yaml.docker-compose",
+        },
       },
+      treesitter = { ensure_installed = {
+        "dockerfile",
+      } },
     },
   },
   { -- Tools to be installed
@@ -20,16 +27,4 @@ return {
       },
     },
   },
-  {
-    "AstroNvim/astrocore",
-    ---@type AstroCoreOpts
-    opts = {
-      filetypes = {
-        filename = {
-          ["docker-compose.yml"] = "yaml.docker-compose",
-          ["docker-compose.yaml"] = "yaml.docker-compose",
-        },
-      },
-    },
-  },
 }

lua/cape/plugins/html.lua

@@ -5,12 +5,13 @@
 ---@type LazySpec
 return {
   { -- Treesitter parsers to be installed
-    "nvim-treesitter",
+    "astrocore",
+    ---@type AstroCoreOpts
     opts = {
-      ensure_installed = {
+      treesitter = { ensure_installed = {
         "html",
         "css",
-      },
+      } },
     },
   },
   { -- Tools to be installed
@@ -39,7 +40,6 @@ return {
     "astrolsp",
     ---@type AstroLSPOpts
     opts = {
-      ---@diagnostic disable: missing-fields
       config = {
         cssls = { settings = { css = { lint = { unknownAtRules = "ignore" } } } },
       },

lua/cape/plugins/javascript.lua

@@ -5,13 +5,16 @@
 ---@type LazySpec
 return {
   { -- Treesitter parsers to be installed
-    "nvim-treesitter",
+    "astrocore",
+    ---@type AstroCoreOpts
     opts = {
-      ensure_installed = {
-        "javascript",
-        "typescript",
-        "tsx",
-        "jsdoc",
+      treesitter = {
+        ensure_installed = {
+          "javascript",
+          "typescript",
+          "tsx",
+          "jsdoc",
+        },
       },
     },
   },
@@ -85,7 +88,6 @@ return {
     "astrolsp",
     ---@type AstroLSPOpts
     opts = {
-      ---@diagnostic disable: missing-fields
       config = {
         vtsls = {
           settings = {

lua/cape/plugins/jinja.lua

@@ -4,22 +4,19 @@
 
 ---@type LazySpec
 return {
-  { -- Set up filetypes
+  { -- Treesitter parsers to be installed and filetypes
     "AstroNvim/astrocore",
     ---@type AstroCoreOpts
-    opts = { filetypes = { extension = {
-      j2 = "jinja",
-      jinja2 = "jinja",
-      jinja = "jinja",
-    } } },
-  },
-  { -- Treesitter parsers to be installed
-    "nvim-treesitter",
     opts = {
-      ensure_installed = {
+      filetypes = { extension = {
+        j2 = "jinja",
+        jinja2 = "jinja",
+        jinja = "jinja",
+      } },
+      treesitter = { ensure_installed = {
         "jinja",
         "jinja_inline",
-      },
+      } },
     },
   },
   { -- Tools to be installed

lua/cape/plugins/json.lua

@@ -5,12 +5,13 @@
 ---@type LazySpec
 return {
   { -- Treesitter parsers to be installed
-    "nvim-treesitter",
+    "astrocore",
+    ---@type AstroCoreOpts
     opts = {
-      ensure_installed = {
+      treesitter = { ensure_installed = {
         "json",
         "jsonc",
-      },
+      } },
     },
   },
   { -- Tools to be installed
@@ -35,10 +36,9 @@ return {
     "astrolsp",
     ---@type AstroLSPOpts
     opts = {
-      ---@diagnostic disable: missing-fields
       config = {
         jsonls = {
-          on_new_config = function(config)
+          before_init = function(_, config)
             if not config.settings.json.schemas then config.settings.json.schemas = {} end
             vim.list_extend(config.settings.json.schemas, require("schemastore").json.schemas())
           end,

lua/cape/plugins/lua.lua

@@ -5,12 +5,13 @@
 ---@type LazySpec
 return {
   { -- Treesitter parsers to be installed
-    "nvim-treesitter",
+    "astrocore",
+    ---@type AstroCoreOpts
     opts = {
-      ensure_installed = {
+      treesitter = { ensure_installed = {
         "lua",
         "luap",
-      },
+      } },
     },
   },
   { -- Tools to be installed
@@ -50,7 +51,6 @@ return {
     "astrolsp",
     ---@type AstroLSPOpts
     opts = {
-      ---@diagnostic disable: missing-fields
       config = {
         lua_ls = { settings = { Lua = { hint = { enable = true, arrayIndex = "Disable" } } } },
       },

lua/cape/plugins/markdown.lua

@@ -5,13 +5,17 @@
 
 ---@type LazySpec
 return {
-  { -- Treesitter parsers to be installed
-    "nvim-treesitter",
+  { -- Treesitter parsers to be installed and filetypes
+    "astrocore",
+    ---@type AstroCoreOpts
     opts = {
-      ensure_installed = {
+      filetypes = { extensions = {
+        qmd = "markdown",
+      } },
+      treesitter = { ensure_installed = {
         "markdown",
         "markdown_inline",
-      },
+      } },
     },
   },
   { -- Tools to be installed
@@ -37,15 +41,4 @@ return {
       },
     },
   },
-  {
-    "astrocore",
-    ---@type AstroCoreOpts
-    opts = {
-      filetypes = {
-        extensions = {
-          qmd = "markdown",
-        },
-      },
-    },
-  },
 }

lua/cape/plugins/nextflow.lua

@@ -54,23 +54,6 @@ return {
       },
     },
   },
-  { -- add nextflow_ls to mason-lspconfig
-    "AstroNvim/astrolsp",
-    ---@type AstroLSPOpts
-    opts = {
-      mason_lspconfig = {
-        servers = {
-          nextflow_ls = {
-            package = "nextflow-language-server",
-            filetypes = { "nextflow" },
-            config = {
-              cmd = { "nextflow-language-server" },
-            },
-          },
-        },
-      },
-    },
-  },
   { -- Icons
     "echasnovski/mini.icons",
     optional = true,

lua/cape/plugins/other.lua

@@ -1,12 +1,5 @@
 ---@type LazySpec
 return {
-  {
-    "mason.nvim",
-    opts = {
-      -- add AstroNvim Mason registry
-      registries = { "github:AstroNvim/mason-registry" },
-    },
-  },
   {
     "nvim-bqf",
     opts = {
@@ -41,15 +34,14 @@ return {
     opts = {
       ensure_installed = {
         { "prettier", condition = function() return vim.fn.executable "npm" == 1 end },
-        "tree-sitter-cli",
       },
     },
   },
   {
     "astrolsp",
     opts = {
       config = {
-        typos_lsp = { single_file_support = false },
+        typos_lsp = { workspace_requires = true },
       },
     },
   },

lua/cape/plugins/packer.lua

@@ -4,23 +4,16 @@
 
 ---@type LazySpec
 return {
-  {
+  { -- Treesitter parsers to be installed and filetypes
     "astrocore",
     ---@type AstroCoreOpts
     opts = {
-      filetypes = {
-        pattern = {
-          [".*%.pkr.*%.hcl"] = "hcl.packer",
-        },
-      },
-    },
-  },
-  { -- Treesitter parsers to be installed
-    "nvim-treesitter",
-    opts = {
-      ensure_installed = {
+      filetypes = { pattern = {
+        [".*%.pkr.*%.hcl"] = "hcl.packer",
+      } },
+      treesitter = { ensure_installed = {
         "hcl",
-      },
+      } },
     },
   },
   { -- Linters to use