diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index 60cd5ff9..ae79ee96 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -57,9 +57,88 @@
     '';
     extraPackages = epkgs:
       with epkgs; [
+        # Tree-sitter grammars, not a real Emacs package
         treesit-grammars.with-all-grammars
-        mu4e # Linked to `mu` tool
-        org-roam # To bring in emacs-sqlite
+        # 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-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
+        mu4e
+        bbdb
+        ement
+        # RSS feeds
+        elfeed
+        elfeed-org
+        elfeed-tube
       ];
   };
   home.packages = with pkgs; [