abstractions away

home/private_dot_config/nvim/lua/config/lazy.lua

@@ -14,7 +14,7 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.ui.edgy" },
     { import = "lazyvim.plugins.extras.lang.tex" },
     { import = "lazyvim.plugins.extras.lang.docker" },
-    { import = "lazyvim.plugins.extras.lang.markdown" },
+    -- { import = "lazyvim.plugins.extras.lang.markdown" },
     { import = "lazyvim.plugins.extras.lsp.none-ls" },
     { import = "plugins" },
     { import = "plugins.language" },

home/private_dot_config/nvim/lua/plugins/language/lua.lua

@@ -1,25 +1,11 @@
 return {
-  {
+  require("util").setup_lang({ treesitter = { "lua" }, mason = { "stylua", "lua-language-server" } }),
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, { "lua" })
-    end,
-  },
   {
     "nvimtools/none-ls.nvim",
     opts = function(_, opts)
       local nls = require("null-ls")
       opts.sources = vim.list_extend(opts.sources or {}, {
-        nls.builtins.formatting.stylua,
+        nls.builtins.formatting["stylua"],
-      })
-    end,
-  },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, {
-        "stylua",
-        "lua-language-server",
       })
     end,
   },

home/private_dot_config/nvim/lua/plugins/language/markdown.lua

@@ -0,0 +1,3 @@
+return {
+  require("util").setup_lang({treesitter = {"markdown", "markdown_inline"}})
+}

home/private_dot_config/nvim/lua/plugins/language/nim.lua

@@ -1,25 +1,3 @@
 return {
-  {
+  require("util").setup_lang({ treesitter = { "nim", "nim_format_string" }, mason = { "nimlsp" } }),
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "nim", "nim_format_string" })
-      end
-    end,
-  },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, {
-        "nimlsp",
-      })
-    end,
-  },
-  {
-    "nvimtools/none-ls.nvim",
-    opts = function(_, opts)
-      local nls = require("null-ls")
-      table.insert(opts.sources or {}, nls.builtins.formatting.nimpretty)
-    end,
-  },
 }

home/private_dot_config/nvim/lua/plugins/language/python.lua

@@ -1,20 +1,5 @@
 return {
-  {
+  require("util").setup_lang({ treesitter = { "python", "toml" }, mason = { "ruff", "ruff-lsp" } }),
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "python", "toml" })
-      end
-    end,
-  },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      if type(opts.ensure_installed) == "table" then
-        vim.list_extend(opts.ensure_installed, { "ruff", "ruff-lsp" })
-      end
-    end,
-  },
   {
     "nvimtools/none-ls.nvim",
     opts = function(_, opts)

home/private_dot_config/nvim/lua/plugins/language/shell.lua

@@ -1,10 +1,5 @@
 return {
-  {
+  require("util").setup_lang({ treesitter = { "bash" }, mason = { "shellcheck" } }),
-    "nvim-treesitter/nvim-treesitter",
-    opts = function(_, opts)
-      opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, { "bash" })
-    end,
-  },
   {
     "nvimtools/none-ls.nvim",
     opts = function(_, opts)
@@ -14,12 +9,4 @@ return {
       })
     end,
   },
-  {
-    "williamboman/mason.nvim",
-    opts = function(_, opts)
-      opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, {
-        "shellcheck",
-      })
-    end,
-  },
 }

home/private_dot_config/nvim/lua/util/init.lua

@@ -0,0 +1,30 @@
+local function setDefault(t, d)
+  local mt = {
+    __index = function()
+      return d
+    end,
+  }
+  setmetatable(t, mt)
+end
+
+local function setup_lang(defs)
+  setDefault(defs, {})
+  return {
+    {
+      "nvim-treesitter/nvim-treesitter",
+      opts = function(_, opts)
+        opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, defs.treesitter)
+      end,
+    },
+    {
+      "williamboman/mason.nvim",
+      opts = function(_, opts)
+        opts.ensure_installed = vim.list_extend(opts.ensure_installed or {}, defs.mason)
+      end,
+    },
+  }
+end
+
+return {
+  setup_lang = setup_lang,
+}