diff --git a/modules/home/doom/doom.nix b/modules/home/doom/doom.nix
index e95a118..7ad5a20 100644
--- a/modules/home/doom/doom.nix
+++ b/modules/home/doom/doom.nix
@@ -29,6 +29,7 @@
     lldb
     mermaid-filter
     mlocate
+    nixd
     nodejs_22
     pandoc
     pandoc-katex
diff --git a/modules/home/doom/static/config.el b/modules/home/doom/static/config.el
index ccf856a..bd23d37 100644
--- a/modules/home/doom/static/config.el
+++ b/modules/home/doom/static/config.el
@@ -149,6 +149,14 @@
 
 (set-formatter! 'alejandra '("alejandra" "--quiet") :modes '(nix-mode))
 
+;; nixd
+(after! 'lsp-mode
+  (lsp-register-client
+   (make-lsp-client :new-connection (lsp-stdio-connection "nixd")
+                    :major-modes '(nix-mode)
+                    :priority 0
+                    :server-id 'nixd)))
+
 ;;Use TS-modes
 (after! treesit
   (load! "packages/treesit-docgen.el")
diff --git a/modules/home/zsh/tools.nix b/modules/home/zsh/tools.nix
index c51962e..620a11a 100644
--- a/modules/home/zsh/tools.nix
+++ b/modules/home/zsh/tools.nix
@@ -7,7 +7,6 @@
     htop
     killall
     neofetch
-    nil
     nix-search-cli
     nixpkgs-fmt
     pass