diff --git a/home-manager/modules/programs/emacs/default.nix b/home-manager/modules/programs/emacs/default.nix
index f90322b..a54dfe2 100644
--- a/home-manager/modules/programs/emacs/default.nix
+++ b/home-manager/modules/programs/emacs/default.nix
@@ -16,10 +16,10 @@ in
     home.packages = with pkgs; [
       fd
       multimarkdown
+      nil # Nix language server
       nodejs_20 # required for copilot
       nodePackages.prettier # formatting files
       nodePackages.prettier-plugin-toml
-      unstable.nixd # Nix language server
       unstable.nixfmt-rfc-style
       pandoc
       ripgrep
diff --git a/home-manager/modules/programs/emacs/emacs.d/lib/az_languageserver.el b/home-manager/modules/programs/emacs/emacs.d/lib/az_languageserver.el
index 5ebf8b9..3787256 100644
--- a/home-manager/modules/programs/emacs/emacs.d/lib/az_languageserver.el
+++ b/home-manager/modules/programs/emacs/emacs.d/lib/az_languageserver.el
@@ -7,12 +7,6 @@
          ;; if you want which-key integration
          (lsp-mode . lsp-enable-which-key-integration))
   :config
-  (with-eval-after-load 'lsp-mode
-    (lsp-register-client
-     (make-lsp-client :new-connection (lsp-stdio-connection "nixd")
-                      :major-modes '(nix-mode)
-                      :priority 0
-                      :server-id 'nixd)))
   (lsp-treemacs-sync-mode 1)
   (setq company-minimum-prefix-length 1
         company-idle-delay 0.0 ;; default is 0.2
@@ -25,6 +19,13 @@
         lsp-pylsp-plugins-pylint-enabled t)
   :commands lsp)
 
+(use-package lsp-nix
+  :ensure lsp-mode
+  :after (lsp-mode)
+  :demand t
+  :custom
+  (lsp-nix-nil-formatter ["nixfmt"]))
+
 ;; optionally
 (use-package lsp-ui :commands lsp-ui-mode)
 ;; if you are ivy user