diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua
index 0430c49..4a872d3 100644
--- a/lua/plugins/conform.lua
+++ b/lua/plugins/conform.lua
@@ -4,6 +4,7 @@ return {
     require("conform").setup({
       formatters_by_ft = {
         lua = { "stylua" },
+        nix = { "nixfmt" },
         python = function(bufnr)
           if require("conform").get_formatter_info("ruff_format", bufnr).available then
             return { "ruff_fix", "ruff_format" }
diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua
index 5dbdfeb..a6bbef2 100644
--- a/lua/plugins/lsp.lua
+++ b/lua/plugins/lsp.lua
@@ -74,6 +74,7 @@ return {
       jqls = {},
       jsonls = {},
       marksman = {},
+      nil_ls = {},
       pyright = {
         python = {
           analysis = {
@@ -83,7 +84,6 @@ return {
           },
         },
       },
-      rnix = {},
       rust_analyzer = {
         diagnostics = {
           enable = true,