From bbda49daf5c3242e397740a78445f59a320d0268 Mon Sep 17 00:00:00 2001
From: Fraser Fewster <fraser.fewster@imaginelearning.com>
Date: Thu, 2 Oct 2025 00:06:55 +0100
Subject: [PATCH] Upate Mason Config

---
 init.lua                               | 10 +++++++++
 lua/custom/plugins/init.lua            |  1 -
 lua/custom/plugins/masonconfig.lua     | 31 --------------------------
 lua/custom/plugins/neo-tree-config.lua |  4 +---
 4 files changed, 11 insertions(+), 35 deletions(-)
 delete mode 100644 lua/custom/plugins/masonconfig.lua

diff --git a/init.lua b/init.lua
index 219095de..20ae6563 100644
--- a/init.lua
+++ b/init.lua
@@ -716,6 +716,16 @@ require('lazy').setup({
       local ensure_installed = vim.tbl_keys(servers or {})
       vim.list_extend(ensure_installed, {
         'stylua', -- Used to format Lua code
+        'ts_ls',
+        'biome',
+        'docker_compose_language_service',
+        'dockerls',
+        'graphql',
+        'jsonls',
+        'sqlls',
+        'yamlls',
+        'eslint',
+        'bashls',
       })
       require('mason-tool-installer').setup { ensure_installed = ensure_installed }
 
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index fbc067bc..846e264a 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -6,6 +6,5 @@ return {
   require 'custom.plugins.comment',
   require 'custom.plugins.tabs',
   require 'custom.plugins.copilot',
-  require 'custom.plugins.masonconfig',
   require 'custom.plugins.neo-tree-config',
 }
diff --git a/lua/custom/plugins/masonconfig.lua b/lua/custom/plugins/masonconfig.lua
deleted file mode 100644
index d4fa5be9..00000000
--- a/lua/custom/plugins/masonconfig.lua
+++ /dev/null
@@ -1,31 +0,0 @@
-return {
-  {
-    'williamboman/mason.nvim',
-    opts = function(_, opts)
-      -- Ensure these tools are installed
-      opts.ensure_installed = opts.ensure_installed or {}
-
-      local ensure_installed = {
-        'ts_ls',
-        'biome',
-        'docker_compose_language_service',
-        'dockerls',
-        'graphql',
-        'jsonls',
-        'sqlls',
-        'yamlls',
-        'eslint',
-        'bashls',
-      }
-
-      -- Merge with existing ensure_installed if any
-      for _, tool in ipairs(ensure_installed) do
-        if not vim.tbl_contains(opts.ensure_installed, tool) then
-          table.insert(opts.ensure_installed, tool)
-        end
-      end
-
-      return opts
-    end,
-  },
-}
diff --git a/lua/custom/plugins/neo-tree-config.lua b/lua/custom/plugins/neo-tree-config.lua
index 6e0394a7..925a5a84 100644
--- a/lua/custom/plugins/neo-tree-config.lua
+++ b/lua/custom/plugins/neo-tree-config.lua
@@ -24,9 +24,7 @@ return {
       end, { desc = 'Focus NeoTree' })
 
       -- Setup neo-tree
-      require('neo-tree').setup {
-        -- Add any neo-tree options here if needed
-      }
+      require('neo-tree').setup {}
     end,
   },
 }