diff --git a/modules/emacs/doom/config.org b/modules/emacs/doom/config.org
index 149aa8f..a455a9d 100644
--- a/modules/emacs/doom/config.org
+++ b/modules/emacs/doom/config.org
@@ -875,9 +875,11 @@ mu4e + mbsync + msmtp:
   :after (consult)
   :commands eglot eglot-ensure
 
+  :hook (nix-ts-mode . eglot-ensure)
+
   :config
   (delete '(nix-mode "rnix-lsp") eglot-server-programs)
-  (add-to-list 'eglot-server-programs '(nix-mode . ("nil")))
+  (add-to-list 'eglot-server-programs '(nix-ts-mode . ("nil")))
 
   (add-to-list 'eglot-server-programs '(gleam-ts-mode . ("gleam" "lsp")))
 
@@ -887,7 +889,7 @@ mu4e + mbsync + msmtp:
          eglot-extend-to-xref t)
 
   (setq-default eglot-workspace-configuration
-                '(:nil (:formatting (:command ["nixpkgs-fmt"])
+                '(:nil (:formatting (:command ["nixfmt"])
                         :nix (:flake (:autoArchive t
                                       :autoEvalInputs t
                                       :nixpkgsInputName "nixpkgs"))))))