From 2f64631f0e81f951d747c56feebcaa0501519a25 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sat, 12 Sep 2026 02:46:22 -0700
Subject: emacs: Remove dependency on ‘oni-core’

This is now mostly, if not completely, part of the emacs config in this
repository, and it was getting in the way of my other configuration setup.
---
 oni/home/config/rincewind.scm   | 19 ++++++++++++++++++-
 oni/home/services/emacs/init.el |  1 -
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/oni/home/config/rincewind.scm b/oni/home/config/rincewind.scm
index 4185a7a..bce5862 100644
--- a/oni/home/config/rincewind.scm
+++ b/oni/home/config/rincewind.scm
@@ -142,7 +142,6 @@
 
                   (emacs-oni-org-roam my-emacs)
                   emacs-oni-elisp
-                  emacs-oni-core
                   emacs-oni-elfeed
                   emacs-oni-eshell
                   emacs-oni-compilation
@@ -193,6 +192,24 @@
                   emacs-oni-php
                   emacs-oni-web-mode
                   emacs-oni-js
+                  emacs-oni-embrace
+                  emacs-oni-hydra
+                  emacs-expand-region
+                  emacs-multiple-cursors
+                  emacs-gcmh
+                  emacs-diminish
+                  emacs-ws-butler
+                  emacs-which-key
+                  emacs-insert-char-preview
+                  emacs-mixed-pitch
+                  emacs-ace-window-next
+                  emacs-vertico
+                  emacs-marginalia
+                  emacs-orderless
+                  emacs-consult
+                  emacs-embark
+                  emacs-docstr
+                  emacs-mini-frame
 
                   tree-sitter-bash
                   tree-sitter-scheme
diff --git a/oni/home/services/emacs/init.el b/oni/home/services/emacs/init.el
index 244d394..cb4619c 100644
--- a/oni/home/services/emacs/init.el
+++ b/oni/home/services/emacs/init.el
@@ -24,7 +24,6 @@
 
 ;;; Code:
 
-(require 'oni-core)
 (require 'oni-gui)
 
 (add-to-list
-- 
cgit v1.3-2-g0d8e