diff --git a/README.org b/README.org
index 34f08a1..5c855f0 100644
--- a/README.org
+++ b/README.org
@@ -815,11 +815,7 @@ Notice how I am including all of my software here. It may be a big file, but hav
     # (with import <nixpkgs> {}; libsForQt5.callPackage ../../bismuth {})
   ];
 
-  services.emacs = {
-    enable = true;
-    package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools epkgs.languagetool pkgs.mu ]));
-  };
-
+  <<emacs>>
   <<samba>>
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index 122b4f1..0de7971 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -400,9 +400,112 @@
 
   services.emacs = {
     enable = true;
-    package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: [ epkgs.vterm epkgs.magit epkgs.pdf-tools epkgs.languagetool pkgs.mu ]));
+    package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages 
+      (epkgs: with epkgs; [
+        vterm
+        magit
+        pdf-tools
+        eglot
+        consult-eglot
+        org
+        org-roam
+        command-log-mode
+        all-the-icons
+        doom-modeline
+        doom-themes
+        rainbow-delimiters
+        smartparens
+        aggressive-indent
+        adaptive-wrap
+        which-key
+        exec-path-from-shell
+        no-littering
+        evil
+        evil-collection
+        general
+        evil-escape
+        evil-surround
+        evil-org
+        org-super-agenda
+        websocket
+        org-roam-ui
+        org-present
+        org-modern
+        unicode-fonts
+        emojify
+        undo-tree
+        visual-fill-column
+        toc-org
+        pulsar
+        vertico
+        consult
+        marginalia
+        all-the-icons-completion
+        embark
+        embark-consult
+        corfu
+        orderless
+        cape
+        devdocs
+        yasnippet
+        tempel
+        projectile
+        simple-httpd
+        avy
+        evil-avy
+        ace-link
+        ace-window
+        helpful
+        format-all
+        web-mode
+        lua-mode
+        nix-mode
+        cmake-mode
+        fennel-mode
+        yaml-mode
+        docker
+        docker-tramp
+        fish-mode
+        markdown-mode
+        qml-mode
+        csv-mode
+        restclient
+        ob-restclient
+        dart-mode
+        flutter
+        hover
+        direnv
+        all-the-icons-dired
+        dired-single
+        dired-rainbow
+        diredfl
+        dired-rsync
+        ledger-mode
+        org-msg
+        calfw
+        calfw-org
+        calfw-ical
+        org-caldav
+        org-wild-notifier
+        magit
+        sly
+        nov
+        elfeed
+        elfeed-org
+        bongo
+        emms
+        transmission
+        hass
+        pass
+        password-store
+        password-store-otp
+        plz
+        ement
+        qrencode
+        gcmh
+        use-package
+        pkgs.mu ]));
   };
-
   services.samba-wsdd.enable = true;
   services.samba = {
     enable = true;