diff --git a/emacs/emacs.nix b/emacs/emacs.nix
index 384bf56..b3a008f 100644
--- a/emacs/emacs.nix
+++ b/emacs/emacs.nix
@@ -19,6 +19,17 @@
   programs.emacs = {
     enable = true;
     package = pkgs.emacs29-pgtk;
-   # extraConfig = builtins.readFile ./init.el;
+    # extraConfig = builtins.readFile ./init.el;
+  };
+  services.emacs = {
+    enable = true;
+    package = pkgs.emacs29-pgtk;
+    defaultEditor = true;
+    extraOptions = [];
+    startWithUserSession = true;
+    client = {
+      enable = true;
+      arguments = [];
+    };
   };
 }
diff --git a/emacs/init.el b/emacs/init.el
index fbf33da..1c16f75 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -624,11 +624,11 @@ Point must be at the beginning of balanced expression (sexp)."
                 '((clojure-lsp (maxCompletions . 300))))
   :hook
   (clojure-mode . eglot-ensure)
-  (eglot-managed-mode . (lambda ()
-                          (add-hook 'before-save-hook
-                                    (lambda ()
-                                      (call-interactively #'eglot-format-buffer))
-                                    nil 'local)))
+  ;; (eglot-managed-mode . (lambda ()
+  ;;                         (add-hook 'before-save-hook
+  ;;                                   (lambda ()
+  ;;                                     (call-interactively #'eglot-format-buffer))
+  ;;                                   nil 'local)))
   (eglot-managed-mode . eglot-inlay-hints-mode))
 
 (use-package consult-eglot
@@ -747,7 +747,9 @@ Point must be at the beginning of balanced expression (sexp)."
   :mode ("\\.zig\\'" . zig-mode))
 
 (use-package nix-mode
-  :mode ("\\.nix\\'" . nix-mode))
+  :mode ("\\.nix\\'" . nix-mode)
+  :hook
+  (nix-mode . eglot-ensure))
 
 ;; (use-package lsp-tailwindcss
 ;;   :init
@@ -863,10 +865,6 @@ Point must be at the beginning of balanced expression (sexp)."
   (require 'git-email-gnus)
   (require 'git-email-piem))
 
-(use-package notmuch)
-
-(use-package consult-notmuch)
-
 ;;;; IRC
 (use-package rcirc
   :ensure nil