diff --git a/.config/nvim/after/plugin/conform.lua b/.config/nvim/after/plugin/conform.lua
index 35045ce..e8ba607 100644
--- a/.config/nvim/after/plugin/conform.lua
+++ b/.config/nvim/after/plugin/conform.lua
@@ -15,6 +15,7 @@ require("conform").setup({
     html = { "prettierd", "prettier", stop_after_first = true },
     lua = { "stylua" }, -- configured in stylua.toml
     markdown = { "prettierd", "prettier", stop_after_first = true },
+    nix = { "nixfmt" },
     javascript = { "prettierd", "prettier", stop_after_first = true },
     javascriptreact = { "prettierd", "prettier", stop_after_first = true },
     json = { "prettierd", "prettier", stop_after_first = true },
diff --git a/.config/nvim/after/plugin/lspconfig.lua b/.config/nvim/after/plugin/lspconfig.lua
index 16e37dd..7624ba6 100644
--- a/.config/nvim/after/plugin/lspconfig.lua
+++ b/.config/nvim/after/plugin/lspconfig.lua
@@ -36,6 +36,7 @@ local servers = {
   },
   lua_ls = {},
   -- marksman = {},
+  nixd = {},
   pyright = {},
   -- tsserver = {},
   svelte = {
diff --git a/.config/nvim/flake.nix b/.config/nvim/flake.nix
index 894fa9a..22a4e6a 100644
--- a/.config/nvim/flake.nix
+++ b/.config/nvim/flake.nix
@@ -68,6 +68,8 @@
               tree-sitter
               ormolu
               nodePackages.prettier
+              nixd
+              nixfmt
               prettierd
               shellcheck-minimal
               stylua