From b6813e83db6871332647f2af67db81f4bcd2d758 Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Wed, 14 Jan 2026 10:15:51 +0000
Subject: [PATCH] lsp config fixes

---
 ftplugin/nu.lua         |  7 +++++++
 lua/plugins/lang/nu.lua | 10 ----------
 lua/plugins/lsp.lua     |  4 ++--
 3 files changed, 9 insertions(+), 12 deletions(-)
 create mode 100644 ftplugin/nu.lua
 delete mode 100644 lua/plugins/lang/nu.lua

diff --git a/ftplugin/nu.lua b/ftplugin/nu.lua
new file mode 100644
index 0000000..cb4f819
--- /dev/null
+++ b/ftplugin/nu.lua
@@ -0,0 +1,7 @@
+local lspconfig = require("lspconfig")
+local config_path = (vim.env.XDG_CONFIG_HOME or vim.fn.expand("~/.config")) .. "/nushell/lsp.nu"
+
+lspconfig.nushell.setup({
+    cmd = { "nu", "--config", config_path, "--lsp" },
+    root_dir = lspconfig.util.root_pattern("env.nu", "config.nu", ".git"),
+})
diff --git a/lua/plugins/lang/nu.lua b/lua/plugins/lang/nu.lua
deleted file mode 100644
index ddcb4eb..0000000
--- a/lua/plugins/lang/nu.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
-    require("neovim/nvim-lspconfig").nushell.setup({
-        cmd = {
-            "nu",
-            "--config",
-            vim.env.XDG_CONFIG_HOME .. "/nushell/lsp.nu",
-            "--lsp",
-        },
-    }),
-}
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index d38741d..656f7d9 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -2,8 +2,8 @@ return {
     {
         "neovim/nvim-lspconfig",
         dependencies = {
-            "williamboman/mason.nvim",
-            "williamboman/mason-lspconfig.nvim",
+            "mason-org/mason.nvim",
+            "mason-org/mason-lspconfig.nvim",
             "WhoIsSethDaniel/mason-tool-installer.nvim",
             { "j-hui/fidget.nvim", opts = {} },
         },