diff --git a/system/emacs.nix b/system/emacs.nix
index 8d161694..f7599231 100644
--- a/system/emacs.nix
+++ b/system/emacs.nix
@@ -9,90 +9,84 @@
     languagetool
     wordnet
     (aspellWithDicts (ds: with ds; [ en en-computers en-science ]))
+    ((emacsPackagesFor emacs29-pgtk).emacsWithPackages (epkgs:
+      with epkgs; [
+        # theme-packages
+        doom-themes
+
+        # completion-packages
+        cape
+        consult
+        corfu
+        corfu-terminal
+        embark
+        embark-consult
+        marginalia
+        orderless
+        vertico
+
+        # ide-packages
+        editorconfig
+        aggressive-indent
+        ibuffer-project
+        treesit-grammars.with-all-grammars
+        treesit-auto
+        apheleia
+        direnv
+        goto-chg
+        rainbow-delimiters
+        yasnippet
+        yasnippet-snippets
+        nix-mode
+        rust-mode
+
+        # media-packages
+        emms
+
+        # org-packages
+        denote
+        org-appear
+        org-cliplink
+        org-journal
+        org-modern
+        khalel
+
+        # project-packages
+        magit
+
+        # social-packages
+        mastodon
+
+        # ui-packages
+        all-the-icons
+        nerd-icons
+        nerd-icons-completion
+        nerd-icons-dired
+        nerd-icons-ibuffer
+        page-break-lines
+        dashboard
+        doom-modeline
+        helpful
+        which-key
+        link-hint
+
+        # writing-packages
+        pdf-tools
+        markdown-mode
+        pandoc-mode
+        auctex
+        auctex-latexmk
+
+        # email-packages
+        mu4e
+        mu4e-alert
+
+        # feed-packages
+        elfeed
+        elfeed-org
+        elfeed-webkit
+        elfeed-tube
+        elfeed-tube-mpv
+      ]))
   ];
-  services.emacs = {
-    enable = true;
-    install = true;
-    defaultEditor = true;
-    package = with pkgs;
-      ((emacsPackagesFor emacs29-pgtk).emacsWithPackages (epkgs:
-        with epkgs; [
-          # theme-packages
-          doom-themes
-
-          # completion-packages
-          cape
-          consult
-          corfu
-          corfu-terminal
-          embark
-          embark-consult
-          marginalia
-          orderless
-          vertico
-
-          # ide-packages
-          editorconfig
-          aggressive-indent
-          ibuffer-project
-          treesit-grammars.with-all-grammars
-          treesit-auto
-          apheleia
-          direnv
-          goto-chg
-          rainbow-delimiters
-          yasnippet
-          yasnippet-snippets
-          nix-mode
-          rust-mode
-
-          # media-packages
-          emms
-
-          # org-packages
-          denote
-          org-appear
-          org-cliplink
-          org-journal
-          org-modern
-          khalel
-
-          # project-packages
-          magit
-
-          # social-packages
-          mastodon
-
-          # ui-packages
-          all-the-icons
-          nerd-icons
-          nerd-icons-completion
-          nerd-icons-dired
-          nerd-icons-ibuffer
-          page-break-lines
-          dashboard
-          doom-modeline
-          helpful
-          which-key
-          link-hint
-
-          # writing-packages
-          pdf-tools
-          markdown-mode
-          pandoc-mode
-          auctex
-          auctex-latexmk
-
-          # email-packages
-          mu4e
-          mu4e-alert
-
-          # feed-packages
-          elfeed
-          elfeed-org
-          elfeed-webkit
-          elfeed-tube
-          elfeed-tube-mpv
-        ]));
-  };
 }