From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Wed, 9 Aug 2023 06:37:42 +0000 (+0200)
Subject: [emacs] Fix use-package failing to load packages.
X-Git-Url: https://git.ekhem.eu.org/?a=commitdiff_plain;h=ae8feef46f66b6c4344e9aff9062fd4e0c58f122;p=guix.git

[emacs] Fix use-package failing to load packages.
---

diff --git a/emacs/.config/emacs/conf/conf-package.el b/emacs/.config/emacs/conf/conf-package.el
index 8b1c77e..2f411b7 100644
--- a/emacs/.config/emacs/conf/conf-package.el
+++ b/emacs/.config/emacs/conf/conf-package.el
@@ -8,16 +8,15 @@
 
 (push '("melpa" . "https://melpa.org/packages/") package-archives)
 
-(defun conf:install-if-missing (package)
-  "Install PACKAGE if it is not already installed."
-  (unless (package-installed-p package)
-    (package-refresh-contents t)
-    (package-install package)))
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents t)
+  (package-install 'use-package)
+  (eval-when-compile
+    ;; https://stackoverflow.com/a/73790884
+    (unless (bound-and-true-p package--initialized)
+      (package-initialize))
+    (require 'use-package)))
 
-(conf:install-if-missing 'use-package)
-
-(eval-when-compile
-  (require 'use-package))
 ;; Required by the `:bind' directive in `use-package'.
 (use-package bind-key)