From e00331bf9436cf0555d72e29f17fa151fb61fa0d Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 18 Jan 2025 21:26:17 -0500
Subject: [PATCH 1/4] Wrap emacs settings in a mkMerge.

---
 nix/configuration/roles/emacs/default.nix | 69 ++++++++++++-----------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index 1d14883..eb82469 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -39,43 +39,48 @@ let
   e_shorthand = pkgs.writeShellScriptBin "e" ''
     exec ${pkgs.emacs29-pgtk}/bin/emacs "''${@}"
   '';
+
 in
 {
   imports = [ ];
 
-  environment.systemPackages = with pkgs; [
-    plainmacs
-    e_shorthand
-    emacs29-pgtk
-    clang # To compile tree-sitter grammars
-    nixd # nix language server
-    nixfmt-rfc-style # auto-formatting nix files through nixd
-  ];
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
+  config = lib.mkMerge [
     {
-      home.file.".config/emacs" = {
-        source = ./files/emacs;
-        recursive = true;
+      environment.systemPackages = with pkgs; [
+        plainmacs
+        e_shorthand
+        emacs29-pgtk
+        clang # To compile tree-sitter grammars
+        nixd # nix language server
+        nixfmt-rfc-style # auto-formatting nix files through nixd
+      ];
+
+      home-manager.users.talexander =
+        { pkgs, ... }:
+        {
+          home.file.".config/emacs" = {
+            source = ./files/emacs;
+            recursive = true;
+          };
+        };
+
+      environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
+        hideMounts = true;
+        users.talexander = {
+          directories = [
+            ".config/emacs/eln-cache" # Installed packages
+            ".config/emacs/elpa" # Installed packages
+            ".config/emacs/private" # For recentf
+            ".config/emacs/tree-sitter" # Compiled tree-sitter grammars
+          ];
+          files = [
+            ".config/emacs/history" # For savehist
+            ".config/emacs/.last-package-update-day" # For use-package
+          ];
+        };
       };
-    };
 
-  environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        ".config/emacs/eln-cache" # Installed packages
-        ".config/emacs/elpa" # Installed packages
-        ".config/emacs/private" # For recentf
-        ".config/emacs/tree-sitter" # Compiled tree-sitter grammars
-      ];
-      files = [
-        ".config/emacs/history" # For savehist
-        ".config/emacs/.last-package-update-day" # For use-package
-      ];
-    };
-  };
-
-  environment.variables.EDITOR = "${plainmacs}/bin/plainmacs";
+      environment.variables.EDITOR = "${plainmacs}/bin/plainmacs";
+    }
+  ];
 }

From 3baf18f435a4cd9b07648d8a37cac4aa81cad68a Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sat, 18 Jan 2025 22:36:13 -0500
Subject: [PATCH 2/4] Install aspell into the emacs_full environment.

---
 nix/configuration/roles/emacs/default.nix | 32 +++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index eb82469..fcdf4a2 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -39,7 +39,6 @@ let
   e_shorthand = pkgs.writeShellScriptBin "e" ''
     exec ${pkgs.emacs29-pgtk}/bin/emacs "''${@}"
   '';
-
 in
 {
   imports = [ ];
@@ -49,12 +48,41 @@ in
       environment.systemPackages = with pkgs; [
         plainmacs
         e_shorthand
-        emacs29-pgtk
+        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; [
+              emacs29-pgtk
+              (pkgs.aspellWithDicts (
+                dicts: with dicts; [
+                  en
+                  en-computers
+                ]
+              ))
+            ];
+            pathsToLink = [
+              "/share/man"
+              "/share/doc"
+              "/share/info"
+              "/bin"
+              "/etc"
+            ];
+            extraOutputsToInstall = [
+              "man"
+              "doc"
+              "info"
+            ];
+          };
+        })
+      ];
+
       home-manager.users.talexander =
         { pkgs, ... }:
         {

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 3/4] 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"

From 1b342d3402af2ae898acbbee0fe803c63ab7f557 Mon Sep 17 00:00:00 2001
From: Tom Alexander <tom@fizz.buzz>
Date: Sun, 19 Jan 2025 10:09:49 -0500
Subject: [PATCH 4/4] Switch from buildEnv to symlinkJoin to keep dependencies
 out of the system path.

---
 nix/configuration/roles/emacs/default.nix | 41 ++++++++++-------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index 3758cfe..dc1911a 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -53,32 +53,25 @@ in
 
       nixpkgs.overlays = [
         (final: prev: {
-          emacs_full = pkgs.buildEnv {
+          emacs_full = pkgs.symlinkJoin {
             name = "emacs_full";
-            paths = with prev; [
-              emacs29-pgtk
-              (pkgs.aspellWithDicts (
-                dicts: with dicts; [
-                  en
-                  en-computers
+            paths = [ pkgs.emacs29-pgtk ];
+            buildInputs = [ pkgs.makeWrapper ];
+            postBuild = ''
+              wrapProgram $out/bin/emacs --prefix PATH : ${
+                lib.makeBinPath [
+                  (pkgs.aspellWithDicts (
+                    dicts: with dicts; [
+                      en
+                      en-computers
+                    ]
+                  ))
+                  pkgs.nixd # nix language server
+                  pkgs.nixfmt-rfc-style # auto-formatting nix files through nixd
+                  pkgs.clang # To compile tree-sitter grammars
                 ]
-              ))
-              nixd # nix language server
-              nixfmt-rfc-style # auto-formatting nix files through nixd
-              clang # To compile tree-sitter grammars
-            ];
-            pathsToLink = [
-              "/share/man"
-              "/share/doc"
-              "/share/info"
-              "/bin"
-              "/etc"
-            ];
-            extraOutputsToInstall = [
-              "man"
-              "doc"
-              "info"
-            ];
+              }
+            '';
           };
         })
       ];