From 01b867a97a08438c035b77566438f7054420c1d3 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 9 Mar 2021 16:46:19 +0100
Subject: Emacs: use package-quickstart

---
 user/emacs/early-init.el | 2 +-
 user/emacs/init.el       | 1 -
 user/settings/emacs.nix  | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/user/emacs/early-init.el b/user/emacs/early-init.el
index 7d591550..22c5161c 100644
--- a/user/emacs/early-init.el
+++ b/user/emacs/early-init.el
@@ -1,7 +1,7 @@
 (setq inhibit-startup-screen t
       initial-scratch-message ""
       initial-major-mode 'fundamental-mode
-      package-enable-at-startup nil
+      package-quickstart t
       frame-inhibit-implied-resize t)
 
 ;; Disable all the bars, unless on OSX, in which case, keep the menu bar.
diff --git a/user/emacs/init.el b/user/emacs/init.el
index 51356dd9..e3dcaab4 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -13,7 +13,6 @@
                                (setq gc-cons-threshold default-gc-cons-threshold
                                      gc-cons-percentage 0.1))))
 
-(package-initialize)
 
 (defun reload-user-init-file ()
   "Reload init file."
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index d48921b0..d88abdfb 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -197,6 +197,7 @@ in
     source = ../emacs/init.el;
     onChange = ''
       ${config.programs.emacs.finalPackage}/bin/emacs -Q -batch -f batch-byte-compile .config/emacs/init.el
+      ${config.programs.emacs.finalPackage}/bin/emacs -Q -batch -l package -f package-quickstart-refresh
     '';
   };
 
-- 
cgit 1.4.1