diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 0ec5ef02..944b16e7 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -55,104 +55,7 @@
       (add-to-list 'custom-safe-themes "${custom-theme-hash}")
       (load-theme '${custom-theme-name})
     '';
-    extraPackages = epkgs:
-      with epkgs; [
-        # Theme
-        base16-theme
-
-        # UI
-        all-the-icons
-        nerd-icons
-        nerd-icons-completion
-        nerd-icons-corfu
-        nerd-icons-dired
-        nerd-icons-ibuffer
-        diminish
-        ligature
-        page-break-lines
-        helpful
-        which-key
-        ace-window
-        link-hint
-        diff-hl
-
-        # Completion
-        cape
-        consult
-        consult-eglot
-        consult-flyspell
-        corfu
-        corfu-terminal
-        embark
-        embark-consult
-        marginalia
-        orderless
-        vertico
-
-        # Templates
-        tempel
-        license-templates
-        gitignore-templates
-
-        # spell-checking
-        flyspell-correct
-
-        # password-store
-        pass
-        password-store
-
-        # IDE
-        treesit-grammars.with-all-grammars
-        treesit-auto
-        flymake-popon
-        flymake-shellcheck
-        flymake-yamllint
-        flymake-eslint
-        apheleia
-        envrc
-        rainbow-delimiters
-        aggressive-indent
-        python-docstring
-        nix-mode
-        lua-mode
-
-        # Media
-        emms
-
-        # org-mode
-        org-roam
-        org-noter
-
-        # org-cite
-        citar
-        citar-embark
-
-        # org-mode HTML export
-        htmlize
-
-        # Projects
-        magit
-        forge
-        treemacs
-        treemacs-nerd-icons
-
-        # Writing
-        markdown-mode
-        pandoc-mode
-        auctex
-        auctex-latexmk
-        latex-preview-pane
-
-        # Contacts
-        bbdb
-        mu4e
-        ement
-
-        # RSS feeds
-        elfeed
-        elfeed-org
-        elfeed-tube
-      ];
+    extraPackages = epkgs: with epkgs; [ treesit-grammars.with-all-grammars];
   };
   home.packages = with pkgs; [
     # Emacs requirements