diff --git a/nix/configuration/network.nix b/nix/configuration/network.nix
index 0da0a7b..1217898 100644
--- a/nix/configuration/network.nix
+++ b/nix/configuration/network.nix
@@ -5,9 +5,7 @@
 
   networking.dhcpcd.enable = false;
   networking.useDHCP = false;
-  # networking.nameservers = ["8.8.8.8" "8.8.4.4"];
   networking.nameservers = [ "194.242.2.2#doh.mullvad.net" "2a07:e340::2#doh.mullvad.net" ];
-  # networking.nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
   services.resolved = {
     enable = true;
     dnssec = "true";
diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index 7f4b578..69fb870 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -39,6 +39,7 @@ in
     plainmacs
     emacs29-pgtk
     clang # To compile tree-sitter grammars
+    nixd # nix language server
   ];
 
   home-manager.users.talexander = { pkgs, ... }: {
diff --git a/nix/configuration/roles/emacs/files/emacs/elisp/lang-nix.el b/nix/configuration/roles/emacs/files/emacs/elisp/lang-nix.el
index 9ba0abd..a817024 100644
--- a/nix/configuration/roles/emacs/files/emacs/elisp/lang-nix.el
+++ b/nix/configuration/roles/emacs/files/emacs/elisp/lang-nix.el
@@ -7,15 +7,15 @@
   :commands nix-mode
   :hook (
          (nix-mode . (lambda ()
-                             ;; (eglot-ensure)
-                             ;; (defclass my/eglot-nix (eglot-lsp-server) ()
-                             ;;   :documentation
-                             ;;   "Own eglot server class.")
+                       (eglot-ensure)
+                       (defclass my/eglot-nix (eglot-lsp-server) ()
+                         :documentation
+                         "Own eglot server class.")
 
-                             ;; (add-to-list 'eglot-server-programs
-                             ;;              '(nix-mode . (my/eglot-nix "nixd")))
-                             ;; (add-hook 'before-save-hook 'eglot-format-buffer nil 'local)
-                             ))
+                       (add-to-list 'eglot-server-programs
+                                    '(nix-mode . (my/eglot-nix "nixd")))
+                       (add-hook 'before-save-hook 'eglot-format-buffer nil 'local)
+                       ))
          )
   )