From 185f1d75f35569b60df5918f9035662817a638ad Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sun, 28 Mar 2021 19:55:59 +0200 Subject: [PATCH] Reduce configuration done in `early-init.el` As per the documentation (see "(elisp)Startup Summary"), only variable customization that affect package initialization should go into the early init file. Defining package archives is explicitly mentioned as something that still may go into the main init file. So we move it there and adjust comments accordingly. --- early-init.el | 8 +------- init.el | 8 +++++++- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/early-init.el b/early-init.el index 6470ac9..c051374 100644 --- a/early-init.el +++ b/early-init.el @@ -1,11 +1,5 @@ ;; -*- lexical-binding: t -*- -(require 'package) - (setq package-user-dir (expand-file-name "elpa" user-emacs-directory)) -(setq package-archives - '(("melpa" . "https://melpa.org/packages/") - ("gnu" . "https://elpa.gnu.org/packages/") - ("melpa-stable" . "https://stable.melpa.org/packages/") - ("org" . "https://orgmode.org/elpa/"))) + diff --git a/init.el b/init.el index 9b3842d..a96c52c 100644 --- a/init.el +++ b/init.el @@ -42,9 +42,15 @@ ;; * Packages +(setq package-archives + '(("melpa" . "https://melpa.org/packages/") + ("gnu" . "https://elpa.gnu.org/packages/") + ("melpa-stable" . "https://stable.melpa.org/packages/") + ("org" . "https://orgmode.org/elpa/"))) + (when (< emacs-major-version 27) ;; Before Emacs 27.1, we had to do package initialization ourselves. In Emacs - ;; 27.1 and later, it's done in early-init.el. See + ;; 27.1 and later, it's done directly after loading early-init.el. See ;; https://www.gnu.org/software/emacs/news/NEWS.27.1 (load-file (expand-file-name "early-init.el" emacs-d)) (package-initialize))