From 9976e232e6c58dfd623f7bb68868f54acddcd52d Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 18 Jan 2025 23:11:35 -0500
Subject: [PATCH] Move packages out of systemPackages and into the emacs_full
 package.

---
 nix/configuration/roles/emacs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index fcdf4a2..3758cfe 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -49,16 +49,13 @@ in
         plainmacs
         e_shorthand
         emacs_full
-        clang # To compile tree-sitter grammars
-        nixd # nix language server
-        nixfmt-rfc-style # auto-formatting nix files through nixd
       ];
 
       nixpkgs.overlays = [
         (final: prev: {
           emacs_full = pkgs.buildEnv {
             name = "emacs_full";
-            paths = with pkgs; [
+            paths = with prev; [
               emacs29-pgtk
               (pkgs.aspellWithDicts (
                 dicts: with dicts; [
@@ -66,6 +63,9 @@ in
                   en-computers
                 ]
               ))
+              nixd # nix language server
+              nixfmt-rfc-style # auto-formatting nix files through nixd
+              clang # To compile tree-sitter grammars
             ];
             pathsToLink = [
               "/share/man"