From a1fba7bc851f188febc1e5676f08d0808b50b58e Mon Sep 17 00:00:00 2001
From: "David T. Sadler" <davidtsadler@googlemail.com>
Date: Sat, 28 Feb 2026 14:23:48 +0000
Subject: Add lsp, formatter, linter for Nix

---
 nvim/.config/nvim/lsp/nixd.lua              | 6 ++++++
 nvim/.config/nvim/lua/config/lsp.lua        | 3 ++-
 nvim/.config/nvim/lua/plugins/conform.lua   | 3 ++-
 nvim/.config/nvim/lua/plugins/nvim-lint.lua | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 nvim/.config/nvim/lsp/nixd.lua

diff --git a/nvim/.config/nvim/lsp/nixd.lua b/nvim/.config/nvim/lsp/nixd.lua
new file mode 100644
index 0000000..9c8a825
--- /dev/null
+++ b/nvim/.config/nvim/lsp/nixd.lua
@@ -0,0 +1,6 @@
+---@type vim.lsp.Config
+return {
+	cmd = { "nixd" },
+	filetypes = { "nix" },
+	root_markers = { "flake.nix", ".git" },
+}
diff --git a/nvim/.config/nvim/lua/config/lsp.lua b/nvim/.config/nvim/lua/config/lsp.lua
index 44e0a5a..be37e27 100644
--- a/nvim/.config/nvim/lua/config/lsp.lua
+++ b/nvim/.config/nvim/lua/config/lsp.lua
@@ -1,7 +1,8 @@
 vim.lsp.enable({
-	"marksman",
 	"intelephense",
 	"lua_ls",
+	"marksman",
+	"nixd",
 })
 
 vim.diagnostic.config({
diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua
index 3229cbd..31d0302 100644
--- a/nvim/.config/nvim/lua/plugins/conform.lua
+++ b/nvim/.config/nvim/lua/plugins/conform.lua
@@ -2,8 +2,9 @@ vim.pack.add({ "https://github.com/stevearc/conform.nvim" })
 
 require("conform").setup({
 	formatters_by_ft = {
-		markdown = { "prettier" },
 		lua = { "stylua" },
+		markdown = { "prettier" },
+		nix = { "nixfmt" },
 		php = { "php_cs_fixer" },
 	},
 	formatters = {
diff --git a/nvim/.config/nvim/lua/plugins/nvim-lint.lua b/nvim/.config/nvim/lua/plugins/nvim-lint.lua
index 96025c9..7129dab 100644
--- a/nvim/.config/nvim/lua/plugins/nvim-lint.lua
+++ b/nvim/.config/nvim/lua/plugins/nvim-lint.lua
@@ -1,7 +1,8 @@
 vim.pack.add({ "https://github.com/mfussenegger/nvim-lint" })
 
 require("lint").linters_by_ft = {
-	markdown = { "markdownlint-cli2" },
 	lua = { "luacheck" },
+	markdown = { "markdownlint-cli2" },
+	nix = { "statix" },
 	php = { "phpcs" },
 }
-- 
cgit v1.2.3-13-gbd6f