fix: refactor utils so that astrocore is lazily loaded (#718)

lua/astrocommunity/debugging/nvim-dap-repl-highlights/init.lua

@@ -1,4 +1,3 @@
-local utils = require "astrocore"
 return {
   "nvim-treesitter/nvim-treesitter",
   dependencies = {
@@ -8,7 +7,7 @@ return {
   },
   opts = function(_, opts)
     if opts.ensure_installed ~= "all" then
-      opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "dap_repl")
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "dap_repl")
     end
   end,
 }

lua/astrocommunity/editing-support/cutlass-nvim/init.lua

@@ -1,9 +1,8 @@
-local utils = require "astrocore"
-
 return {
   "gbprod/cutlass.nvim",
   event = { "User AstroFile" },
   opts = function(_, opts)
+    local utils = require "astrocore"
     if utils.is_available "leap.nvim" then opts.exclude = utils.list_insert_unique(opts.exclude, { "ns", "nS" }) end
     if utils.is_available "hop.nvim" then opts.exclude = utils.list_insert_unique(opts.exclude, { "ns", "nS" }) end
   end,

lua/astrocommunity/editing-support/nvim-regexplainer/init.lua

@@ -1,4 +1,3 @@
-local utils = require "astrocore"
 return {
   {
     "bennypowers/nvim-regexplainer",
@@ -11,7 +10,7 @@ return {
     opts = function(_, opts)
       -- add regex to treesitters
       if opts.ensure_installed ~= "all" then
-        opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "regex")
+        opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "regex")
       end
     end,
   },

lua/astrocommunity/editing-support/true-zen-nvim/init.lua

@@ -1,4 +1,3 @@
-local utils = require "astrocore"
 return {
   "Pocco81/true-zen.nvim",
   dependencies = {
@@ -44,6 +43,7 @@ return {
     },
   },
   opts = function(_, opts)
+    local utils = require "astrocore"
     return utils.extend_tbl(opts, {
       integrations = {
         tmux = os.getenv "TMUX" ~= nil, -- hide tmux status bar in (minimalist, ataraxis)

lua/astrocommunity/editing-support/zen-mode-nvim/init.lua

@@ -1,5 +1,3 @@
-local utils = require "astrocore"
-
 return {
   "folke/zen-mode.nvim",
   cmd = "ZenMode",
@@ -41,7 +39,7 @@ return {
         desc = "Ensure winbar stays disabled when writing to file, switching buffers, opening floating windows, etc.",
       })
 
-      if utils.is_available "vim-matchup" then
+      if require("astrocore").is_available "vim-matchup" then
         vim.cmd.NoMatchParen()
         vim.g.matchup_matchparen_offscreen_old = vim.g.matchup_matchparen_offscreen
         vim.g.matchup_matchparen_offscreen = {}
@@ -59,7 +57,7 @@ return {
       vim.api.nvim_clear_autocmds { group = "disable_winbar" }
       vim.o.winbar = vim.g.winbar_old
 
-      if utils.is_available "vim-matchup" then
+      if require("astrocore").is_available "vim-matchup" then
         vim.g.matchup_matchparen_offscreen = vim.g.matchup_matchparen_offscreen_old
         vim.cmd.DoMatchParen()
       end

lua/astrocommunity/markdown-and-latex/markmap-nvim/init.lua

@@ -1,5 +1,3 @@
-local utils = require "astrocore"
-
 --  [markdown markmap]
 --  https://github.com/Zeioth/markmap.nvim
 return {
@@ -11,6 +9,8 @@ return {
   {
     "jay-babu/mason-null-ls.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, { "markmap" }) end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, { "markmap" })
+    end,
   },
 }

lua/astrocommunity/note-taking/zk-nvim/init.lua

@@ -1,5 +1,3 @@
-local utils = require "astrocore"
-
 return {
   {
     "mickael-menu/zk-nvim",
@@ -10,6 +8,8 @@ return {
 
   {
     "williamboman/mason-lspconfig.nvim",
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "zk") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "zk")
+    end,
   },
 }

lua/astrocommunity/pack/angular/init.lua

@@ -1,5 +1,3 @@
-local utils = require "astrocore"
-
 return {
   { import = "astrocommunity.pack.typescript" },
   { import = "astrocommunity.pack.html-css" },
@@ -9,13 +7,15 @@ return {
     dependencies = { { "elgiano/nvim-treesitter-angular", branch = "topic/jsx-fix" } },
     opts = function(_, opts)
       if opts.ensure_installed ~= "all" then
-        opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "angular")
+        opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "angular")
       end
     end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "angularls") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "angularls")
+    end,
   },
 }

lua/astrocommunity/pack/ansible/init.lua

@@ -1,24 +1,26 @@
-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")
+        opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "yaml")
       end
     end,
   },
   {
     "jay-babu/mason-null-ls.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "ansiblelint") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").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,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "ansiblels")
+    end,
   },
   {
     "pearofducks/ansible-vim",

lua/astrocommunity/pack/astro/init.lua

@@ -1,23 +1,26 @@
-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
-        opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "astro")
+        opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "astro")
       end
     end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "astro") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").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,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "js")
+    end,
   },
 }

lua/astrocommunity/pack/bash/init.lua

@@ -1,29 +1,32 @@
-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")
+        opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "bash")
       end
     end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "bashls") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").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" })
+      opts.ensure_installed = require("astrocore").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,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "bash")
+    end,
   },
 }

lua/astrocommunity/pack/clojure/init.lua

@@ -1,19 +1,20 @@
 -- Clojure support with Conjure plugin
-local utils = require "astrocore"
 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,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").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")
+        opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "clojure")
       end
     end,
   },

lua/astrocommunity/pack/cmake/init.lua

@@ -1,17 +1,18 @@
-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")
+        opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "cmake")
       end
     end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "neocmake") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "neocmake")
+    end,
   },
 }

lua/astrocommunity/pack/cpp/init.lua

@@ -1,4 +1,3 @@
-local utils = require "astrocore"
 return {
   {
     "AstroNvim/astrolsp",
@@ -19,14 +18,17 @@ return {
     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" })
+        opts.ensure_installed =
+          require("astrocore").list_insert_unique(opts.ensure_installed, { "cpp", "c", "objc", "cuda", "proto" })
       end
     end,
   },
   {
     "williamboman/mason-lspconfig.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "clangd") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "clangd")
+    end,
   },
   {
     "p00f/clangd_extensions.nvim",
@@ -51,7 +53,9 @@ return {
     dependencies = {
       {
         "jay-babu/mason-nvim-dap.nvim",
-        opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "codelldb") end,
+        opts = function(_, opts)
+          opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "codelldb")
+        end,
       },
     },
     opts = {},

lua/astrocommunity/pack/crystal/init.lua

@@ -1,5 +1,4 @@
 vim.filetype.add { extension = { cr = "crystal" } }
-local utils = require "astrocore"
 
 return {
   {
@@ -8,10 +7,14 @@ return {
   },
   {
     "williamboman/mason-lspconfig.nvim",
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "crystalline") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "crystalline")
+    end,
   },
   {
     "jay-babu/mason-nvim-dap.nvim",
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "codelldb") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "codelldb")
+    end,
   },
 }

lua/astrocommunity/pack/cs/init.lua

@@ -1,28 +1,33 @@
-local utils = require "astrocore"
 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")
+        opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "c_sharp")
       end
     end,
   },
   {
     "jay-babu/mason-null-ls.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "csharpier") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").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,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "csharp_ls")
+    end,
   },
   {
     "jay-babu/mason-nvim-dap.nvim",
     optional = true,
-    opts = function(_, opts) opts.ensure_installed = utils.list_insert_unique(opts.ensure_installed, "coreclr") end,
+    opts = function(_, opts)
+      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, "coreclr")
+    end,
   },
 }