diff --git a/.config/nvim/plugin/lsp.lua b/.config/nvim/plugin/lsp.lua
index d8cca152..7af2d20f 100644
--- a/.config/nvim/plugin/lsp.lua
+++ b/.config/nvim/plugin/lsp.lua
@@ -21,7 +21,7 @@ local servers = {
     tinymist = {},
     nil_ls = {
         settings = {
-            ["nil"] = { formatting = { command = { "alejandra" } } },
+            ["nil"] = { formatting = { command = { "nixfmt" } } },
         },
     },
 }
diff --git a/nix/configurations/vanadium/home/programs.nix b/nix/configurations/vanadium/home/programs.nix
index 597e550a..c0296f94 100644
--- a/nix/configurations/vanadium/home/programs.nix
+++ b/nix/configurations/vanadium/home/programs.nix
@@ -69,7 +69,10 @@
     pkgs.just
 
     # nix tools
-    pkgs.alejandra
+    # # Alejandra handles inline comments poorly
+    # # https://github.com/kamadorueda/alejandra/issues/429
+    # pkgs.alejandra
+    pkgs.nixfmt-rfc-style
     pkgs.nurl
     pkgs.dix
     pkgs.niv