From c6feb6f05b685e11c49fea6ff3a6c6416d8110fe Mon Sep 17 00:00:00 2001
From: Uzair Aftab <muaf@nmbu.no>
Date: Sat, 30 Mar 2024 10:38:47 +0100
Subject: [PATCH] Revert "fix(fish): Use mason-null-ls instead of none-ls"

This reverts commit 26232a165f53f4c87d002b46c24dd978f69a377e.
---
 lua/astrocommunity/pack/fish/init.lua | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lua/astrocommunity/pack/fish/init.lua b/lua/astrocommunity/pack/fish/init.lua
index 2a7dee9bb..c415ec4f6 100644
--- a/lua/astrocommunity/pack/fish/init.lua
+++ b/lua/astrocommunity/pack/fish/init.lua
@@ -8,10 +8,16 @@ return {
     end,
   },
   {
-    "jay-babu/mason-null-ls.nvim",
+    "nvimtools/none-ls.nvim",
     optional = true,
     opts = function(_, opts)
-      opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, { "fish_indent", "fish" })
+      local nls = require "null-ls"
+      if type(opts.sources) == "table" then
+        opts.sources = vim.list_extend(opts.sources, {
+          nls.builtins.formatting.fish_indent,
+          nls.builtins.diagnostics.fish,
+        })
+      end
     end,
   },
   {