fix(pack): make pack items optional (#664)

AstroNvim · Dec 2, 2023 · 6092e1b · 6092e1b
1 parent 08285ae
commit 6092e1b
Show file tree

Hide file tree

Showing 44 changed files with 125 additions and 6 deletions.
diff --git a/lua/astrocommunity/pack/angular/init.lua b/lua/astrocommunity/pack/angular/init.lua
@@ -5,6 +5,7 @@ return {
   { import = "astrocommunity.pack.html-css" },
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     dependencies = { { "elgiano/nvim-treesitter-angular", branch = "topic/jsx-fix" } },
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
@@ -14,6 +15,7 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "angularls") end,
   },
 }
diff --git a/lua/astrocommunity/pack/ansible/init.lua b/lua/astrocommunity/pack/ansible/init.lua
@@ -3,6 +3,7 @@ local utils = require "astrocore"
 return {
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "yaml")
@@ -11,10 +12,12 @@ return {
   },
   {
     "jay-babu/mason-null-ls.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "ansiblelint") end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "ansiblels") end,
   },
   {

diff --git a/lua/astrocommunity/pack/astro/init.lua b/lua/astrocommunity/pack/astro/init.lua
@@ -2,6 +2,7 @@ local utils = require "astrocore"
 return {
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       -- Ensure that opts.ensure_installed exists and is a table or string "all".
       if opts.ensure_installed ~= "all" then
@@ -11,10 +12,12 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "astro") end,
   },
   {
     "jay-babu/mason-nvim-dap.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "js") end,
   },
 }
diff --git a/lua/astrocommunity/pack/bash/init.lua b/lua/astrocommunity/pack/bash/init.lua
@@ -2,6 +2,7 @@ local utils = require "astrocore"
 return {
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "bash")
@@ -10,16 +11,19 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "bashls") end,
   },
   {
     "jay-babu/mason-null-ls.nvim",
+    optional = true,
     opts = function(_, opts)
       opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "shellcheck", "shfmt" })
     end,
   },
   {
     "jay-babu/mason-nvim-dap.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "bash") end,
   },
 }
diff --git a/lua/astrocommunity/pack/clojure/init.lua b/lua/astrocommunity/pack/clojure/init.lua
@@ -4,11 +4,13 @@ return {
   -- Clojure Language Server
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "clojure_lsp") end,
   },
   -- Clojure parser
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "clojure")

diff --git a/lua/astrocommunity/pack/cmake/init.lua b/lua/astrocommunity/pack/cmake/init.lua
@@ -2,6 +2,7 @@ local utils = require "astrocore"
 return {
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "cmake")
@@ -10,6 +11,7 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "neocmake") end,
   },
 }
diff --git a/lua/astrocommunity/pack/cpp/init.lua b/lua/astrocommunity/pack/cpp/init.lua
@@ -16,6 +16,7 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "cpp", "c", "objc", "cuda", "proto" })
@@ -24,6 +25,7 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "clangd") end,
   },
   {

diff --git a/lua/astrocommunity/pack/cs/init.lua b/lua/astrocommunity/pack/cs/init.lua
@@ -3,6 +3,7 @@ return {
   -- CSharp support
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "c_sharp")
@@ -11,17 +12,17 @@ return {
   },
   {
     "jay-babu/mason-null-ls.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "csharpier") end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "csharp_ls") end,
   },
   {
-    "mfussenegger/nvim-dap",
-    {
-      "jay-babu/mason-nvim-dap.nvim",
-      opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "coreclr") end,
-    },
+    "jay-babu/mason-nvim-dap.nvim",
+    optional = true,
+    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "coreclr") end,
   },
 }
diff --git a/lua/astrocommunity/pack/cue/init.lua b/lua/astrocommunity/pack/cue/init.lua
@@ -3,6 +3,7 @@ return {
   -- Cue support
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "cue")
@@ -12,10 +13,12 @@ return {
 
   {
     "jay-babu/mason-null-ls.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "cueimports" }) end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "dagger") end,
   },
 }
diff --git a/lua/astrocommunity/pack/dart/init.lua b/lua/astrocommunity/pack/dart/init.lua
@@ -9,6 +9,7 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "dart")
@@ -28,6 +29,7 @@ return {
       { "nvim-lua/plenary.nvim" },
       {
         "jay-babu/mason-nvim-dap.nvim",
+        optional = true,
         opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "dart") end,
       },
     },

diff --git a/lua/astrocommunity/pack/docker/init.lua b/lua/astrocommunity/pack/docker/init.lua
@@ -2,6 +2,7 @@ local utils = require "astrocore"
 return {
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "dockerfile")
@@ -10,13 +11,15 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts)
       opts.ensure_installed =
         utils.list_insert_unique(opts.ensure_installed, { "docker_compose_language_service", "dockerls" })
     end,
   },
   {
     "jay-babu/mason-null-ls.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "hadolint") end,
   },
 }
diff --git a/lua/astrocommunity/pack/go/init.lua b/lua/astrocommunity/pack/go/init.lua
@@ -3,6 +3,7 @@ return {
   -- Golang support
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "go", "gomod", "gosum", "gowork")
@@ -12,13 +13,15 @@ return {
 
   {
     "jay-babu/mason-null-ls.nvim",
+    optional = true,
     opts = function(_, opts)
       opts.ensure_installed =
         utils.list_insert_unique(opts.ensure_installed, { "gomodifytags", "gofumpt", "iferr", "impl", "goimports" })
     end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "gopls") end,
   },
   {
@@ -28,6 +31,7 @@ return {
       "mfussenegger/nvim-dap",
       {
         "jay-babu/mason-nvim-dap.nvim",
+        optional = true,
         opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "delve") end,
       },
     },

diff --git a/lua/astrocommunity/pack/godot/init.lua b/lua/astrocommunity/pack/godot/init.lua
@@ -19,6 +19,7 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed =

diff --git a/lua/astrocommunity/pack/haskell/init.lua b/lua/astrocommunity/pack/haskell/init.lua
@@ -10,6 +10,7 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "haskell")
@@ -35,10 +36,12 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "hls") end,
   },
   {
     "jay-babu/mason-nvim-dap.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "haskell") end,
   },
 }
diff --git a/lua/astrocommunity/pack/helm/init.lua b/lua/astrocommunity/pack/helm/init.lua
@@ -21,6 +21,7 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts)
       opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "helm_ls")
 

diff --git a/lua/astrocommunity/pack/html-css/init.lua b/lua/astrocommunity/pack/html-css/init.lua
@@ -4,6 +4,7 @@ return {
   { import = "astrocommunity.pack.json" },
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "html", "css" })
@@ -12,6 +13,7 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts)
       opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "html", "cssls", "emmet_ls" })
     end,

diff --git a/lua/astrocommunity/pack/java/init.lua b/lua/astrocommunity/pack/java/init.lua
@@ -3,6 +3,7 @@ local utils = require "astrocore"
 return {
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "java", "html" })
@@ -11,18 +12,21 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts)
       opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "jdtls", "lemminx" })
     end,
   },
 
   {
     "jay-babu/mason-null-ls.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "clang_format") end,
   },
 
   {
     "jay-babu/mason-nvim-dap.nvim",
+    optional = true,
     opts = function(_, opts)
       opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "javadbg", "javatest" })
     end,

diff --git a/lua/astrocommunity/pack/json/init.lua b/lua/astrocommunity/pack/json/init.lua
@@ -21,6 +21,7 @@ return {
   },
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "json", "jsonc" })
@@ -29,6 +30,7 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "jsonls") end,
   },
 }
diff --git a/lua/astrocommunity/pack/julia/init.lua b/lua/astrocommunity/pack/julia/init.lua
@@ -3,6 +3,7 @@ return {
   { import = "astrocommunity.pack.toml" },
   {
     "nvim-treesitter/nvim-treesitter",
+    optional = true,
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
         opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "julia")
@@ -11,10 +12,12 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
+    optional = true,
     opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "julials") end,
   },
   {
     "hrsh7th/nvim-cmp",
+    optional = true,
     -- add cmp latex symbols for easier julia editing
     dependencies = { "kdheepak/cmp-latex-symbols" },
     opts = function(_, opts)