diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index a0c4a0f6..69265026 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -51,74 +51,14 @@
       (load-theme '${custom-theme-name})
     '';
     extraPackages = epkgs:
-      with epkgs; [
-        # Tree-sitter grammars, not a real Emacs package
-        treesit-grammars.with-all-grammars
-        # Maildir utils with linked Emacs package
-        mu4e
-        # Theme
-        base16-theme
-        # UI
-        all-the-icons
-        nerd-icons
-        nerd-icons-completion
-        nerd-icons-corfu
-        nerd-icons-dired
-        nerd-icons-ibuffer
-        minions
-        ligature
-        page-break-lines
-        helpful
-        which-key
-        ace-window
-        link-hint
-        diff-hl
-        # Completion
-        vertico
-        orderless
-        marginalia
-        cape
-        corfu
-        corfu-terminal
-        consult
-        consult-eglot
-        consult-flyspell
-        embark
-        embark-consult
-        flyspell-correct
-        tempel
-        # IDE
-        treesit-auto
-        magit
-        forge
-        flymake-popon
-        flymake-shellcheck
-        flymake-yamllint
-        flymake-eslint
-        apheleia
-        envrc
-        rainbow-delimiters
-        aggressive-indent
-        python-docstring
-        nix-mode
-        lua-mode
-        # Writing
-        org-roam
-        org-noter
-        citar
-        citar-embark
-        markdown-mode
-        pandoc-mode
-        auctex
-        htmlize
-        # Other
-        password-store
-        emms
-        bbdb
-        ement
-        elfeed
-        elfeed-org
-      ];
+      with epkgs;
+        [
+          # Tree-sitter grammars, not a real Emacs package
+          treesit-grammars.with-all-grammars
+          # Maildir utils with linked Emacs package
+          mu4e
+        ]
+        ++ (import ./emacs-packages.nix epkgs);
   };
   home.packages = with pkgs; [
     # Emacs requirements
diff --git a/home/emacs/emacs-packages.nix b/home/emacs/emacs-packages.nix
new file mode 100644
index 00000000..587a0c4e
--- /dev/null
+++ b/home/emacs/emacs-packages.nix
@@ -0,0 +1,65 @@
+epkgs:
+with epkgs; [
+  # Theme
+  base16-theme
+  # UI
+  all-the-icons
+  nerd-icons
+  nerd-icons-completion
+  nerd-icons-corfu
+  nerd-icons-dired
+  nerd-icons-ibuffer
+  minions
+  ligature
+  page-break-lines
+  helpful
+  which-key
+  ace-window
+  link-hint
+  diff-hl
+  # Completion
+  vertico
+  orderless
+  marginalia
+  cape
+  corfu
+  corfu-terminal
+  consult
+  consult-eglot
+  consult-flyspell
+  embark
+  embark-consult
+  flyspell-correct
+  tempel
+  # IDE
+  treesit-auto
+  magit
+  forge
+  flymake-popon
+  flymake-shellcheck
+  flymake-yamllint
+  flymake-eslint
+  apheleia
+  envrc
+  rainbow-delimiters
+  aggressive-indent
+  python-docstring
+  nix-mode
+  lua-mode
+  # Writing
+  org-roam
+  org-noter
+  citar
+  citar-embark
+  markdown-mode
+  pandoc-mode
+  auctex
+  htmlize
+  # Other
+  password-store
+  emms
+  bbdb
+  ement
+  elfeed
+  elfeed-org
+]