From 6b6316652e4bfbba3436359be862ca99379216df Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Fri, 24 Jul 2026 14:59:39 -0700
Subject: emacs: Move package configuration to init.org

---
 _mbsetupuser/.emacs.d/init.el |  5 -----
 emacs/.emacs.d/init.org       | 10 ++++++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/_mbsetupuser/.emacs.d/init.el b/_mbsetupuser/.emacs.d/init.el
index 7bfd28d..a47ce90 100644
--- a/_mbsetupuser/.emacs.d/init.el
+++ b/_mbsetupuser/.emacs.d/init.el
@@ -23,11 +23,6 @@
 
 ;;; Code:
 
-(require 'package)
-
-(add-to-list 'package-archives '("oni" . "https://ryuslash.srht.site/emacs-config/packages/"))
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
-
 (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t))
 
 (use-package menu-bar
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 01f1bbf..e957286 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -66,10 +66,12 @@ So now that that's settled, I should be writing ='= in words like “shouldn't''
 Add MELPA to package archives, this lets me install more packages.
 
 #+begin_src emacs-lisp
-  (eval-and-compile
-    (use-package package
-      :config
-      (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)))
+  (use-package package
+    :if (eq system-type 'darwin)
+    :demand t
+    :config
+    (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
+    (add-to-list 'package-archives '("oni" . "https://ryuslash.srht.site/emacs-config/packages/")))
 #+end_src
 
 Make use-package default to ensuring everything. This way each =use-package= doesn't need to have its own ~:ensure t~ and when I use Guix to install these modules they don't try to download everything from everywhere else.
-- 
cgit v1.3-2-g0d8e