diff --git a/nvim/files/lsp/nixd.lua b/nvim/files/lsp/nixd.lua
new file mode 100644
index 0000000..6c5dacf
--- /dev/null
+++ b/nvim/files/lsp/nixd.lua
@@ -0,0 +1,5 @@
+return {
+	cmd = { "nixd" },
+	filetypes = { "nix" },
+	root_markers = { "flake.nix", ".git" },
+}
diff --git a/nvim/files/lua/plugins/lsp.lua b/nvim/files/lua/plugins/lsp.lua
index de6be4b..10e4da8 100644
--- a/nvim/files/lua/plugins/lsp.lua
+++ b/nvim/files/lua/plugins/lsp.lua
@@ -1,7 +1,4 @@
 return {
-	-- Mason for installing LSP servers
-	{ "mason-org/mason.nvim", opts = {} },
-	"WhoIsSethDaniel/mason-tool-installer.nvim",
 
 	-- Useful status updates for LSP.
 	{ "j-hui/fidget.nvim", opts = {} },
@@ -178,18 +175,6 @@ return {
 			})
 
 			-- Install tools via mason-tool-installer
-			require("mason-tool-installer").setup({
-				ensure_installed = {
-					"stylua",
-					"lua-language-server",
-					"pyright",
-					"css-lsp",
-					"eslint-lsp",
-					"vtsls",
-					"tailwindcss-language-server",
-					"biome",
-				},
-			})
 
 			-- Load custom LSP configs from nvim/lsp/*.lua to override nvim-lspconfig defaults
 			local lsp_path = vim.fn.stdpath("config") .. "/lsp"
@@ -215,6 +200,7 @@ return {
 				"svelte",
 				"tailwindcss",
 				"biome",
+				"nixd",
 			})
 		end,
 	},
diff --git a/nvim/files/lua/plugins/treesitter.lua b/nvim/files/lua/plugins/treesitter.lua
index 05d909c..f75e80c 100644
--- a/nvim/files/lua/plugins/treesitter.lua
+++ b/nvim/files/lua/plugins/treesitter.lua
@@ -14,7 +14,6 @@ return {
 			"javascript",
 			"typescript",
 			"tsx",
-			"ripple",
 			"c",
 			"lua",
 			"rust",
@@ -26,14 +25,9 @@ return {
 			"css",
 			"scss",
 			"gdscript",
+			"nix",
 		})
 
-		-- Enable treesitter highlighting and indentation
-		vim.api.nvim_create_autocmd("FileType", {
-			callback = function()
-				pcall(vim.treesitter.start)
-				vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
-			end,
-		})
+		-- Enable treesitter highlighting - indentexpr set automatically per filetype
 	end,
 }