From dc788b1c007b3d85203b5591fcfe3cd8ce6ecd78 Mon Sep 17 00:00:00 2001
From: kjuulh <contact@kjuulh.io>
Date: Sat, 4 Feb 2023 17:25:37 +0100
Subject: [PATCH] fix mason

---
 plugins/heirline.lua       |  8 ++++++++
 plugins/mason-null-ls.lua  | 13 +++++++------
 plugins/mason-nvim-dap.lua |  4 ++--
 plugins/which-key.lua      | 13 -------------
 updater.lua                |  4 ++--
 5 files changed, 19 insertions(+), 23 deletions(-)
 create mode 100644 plugins/heirline.lua
 delete mode 100644 plugins/which-key.lua

diff --git a/plugins/heirline.lua b/plugins/heirline.lua
new file mode 100644
index 0000000..492d091
--- /dev/null
+++ b/plugins/heirline.lua
@@ -0,0 +1,8 @@
+return {
+  "rebelot/heirline.nvim",
+  opts = function(_, opts)
+    opts.tabline[2] =
+    astronvim.status.heirline.make_buflist(astronvim.status.component.tabline_file_info { close_button = false })
+    return opts
+  end,
+}
diff --git a/plugins/mason-null-ls.lua b/plugins/mason-null-ls.lua
index 4397817..60c3e5a 100644
--- a/plugins/mason-null-ls.lua
+++ b/plugins/mason-null-ls.lua
@@ -1,16 +1,17 @@
 return { -- overrides `require("mason-null-ls").setup(...)`
   "jay-babu/mason-null-ls.nvim",
-  config = function(plugin, opts)
-    plugin.default_config(opts) -- use the default configuration function
+  config = function(_, opts)
+    local mason_null_ls = require("mason-null-ls")
     local null_ls = require "null-ls"
-    require("mason-null-ls").setup_handlers { -- setup custom handlers
+    mason_null_ls.setup(opts)
+    mason_null_ls.setup_handlers { -- setup custom handlers
       prettier = function()
         require("null-ls").register(null_ls.builtins.formatting.prettier.with {
           condition = function(utils)
             return utils.root_has_file "package.json"
-              or utils.root_has_file ".prettierrc"
-              or utils.root_has_file ".prettierrc.json"
-              or utils.root_has_file ".prettierrc.js"
+                or utils.root_has_file ".prettierrc"
+                or utils.root_has_file ".prettierrc.json"
+                or utils.root_has_file ".prettierrc.js"
           end,
         })
       end,
diff --git a/plugins/mason-nvim-dap.lua b/plugins/mason-nvim-dap.lua
index 9ec4594..5ae8a8c 100644
--- a/plugins/mason-nvim-dap.lua
+++ b/plugins/mason-nvim-dap.lua
@@ -1,10 +1,10 @@
 return {
   "jay-babu/mason-nvim-dap.nvim",
-  config = function(self, opts)
-    self.default_config(opts) -- run default AstroNvim mason-nvim-dap config function
+  config = function(_, opts)
 
     -- do more configuration as needed
     local mason_nvim_dap = require "mason-nvim-dap"
+    mason_nvim_dap.setup(opts)
     mason_nvim_dap.setup_handlers {
       python = function(source_name)
         local dap = require "dap"
diff --git a/plugins/which-key.lua b/plugins/which-key.lua
deleted file mode 100644
index 5727c77..0000000
--- a/plugins/which-key.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
-  "folke/which-key.nvim",
-  config = function(plugin, opts)
-    plugin.default_config(opts)
-    local wk = require "which-key"
-    wk.register({
-      b = { name = "Buffer" },
-    }, {
-      mode = "n",
-      prefix = "<leader>",
-    })
-  end,
-}
diff --git a/updater.lua b/updater.lua
index bc5db22..72a507d 100644
--- a/updater.lua
+++ b/updater.lua
@@ -1,12 +1,12 @@
 return {
-  remote = "origin", -- remote to use
+  --remote = "origin", -- remote to use
   --channel = "stable", -- "stable" or "nightly"
   channel = "nightly", -- "stable" or "nightly"
   --version = "v2.11.7", -- "latest", tag name, or regex search like "v1.*" to only do updates before v2 (STABLE ONLY)
   --version="latest",
   branch = "v3", -- branch name (NIGHTLY ONLY)
   --commit = nil, -- commit hash (NIGHTLY ONLY)
-  pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only)
+  --pin_plugins = nil, -- nil, true, false (nil will pin plugins on stable only)
   skip_prompts = false, -- skip prompts about breaking changes
   show_changelog = true, -- show the changelog after performing an update
   auto_reload = false, -- automatically reload and sync packer after a successful update