feat(wpcarro/emacs): Test that my Emacs can initialize r/3696

...without warnings, errors.

This was previously a step in my buildkite instance, but I'm no longer
supporting that (in favor of the TVL one).

Change-Id: Ifed39aef248b21a1eb5a6c9d8427ebe6996abc3a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5103
Tested-by: BuildkiteCI
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: wpcarro <wpcarro@gmail.com>

3 files changed, 23 insertions, 29 deletions

diff --git a/users/wpcarro/ci/pipelines/post-receive.nix b/users/wpcarro/ci/pipelines/post-receive.nix
index b69ee28af3..cb7501bdea 100644
--- a/users/wpcarro/ci/pipelines/post-receive.nix
+++ b/users/wpcarro/ci/pipelines/post-receive.nix
@@ -2,7 +2,6 @@
 
 let
   inherit (builtins) path toJSON;
-  inherit (depot.users.wpcarro.emacs) initEl runScript;
 
   pipeline.steps = [
     {
@@ -10,19 +9,5 @@ let
       command = "${pkgs.git-secrets}/bin/git-secrets --scan-history";
       label = ":broom: lint secrets";
     }
-    {
-      key = "init-emacs";
-      command = let
-        scriptEl = path {
-          path = ./script.el;
-          name = "script.el";
-        };
-        runScriptEl = runScript {
-          script = scriptEl;
-        };
-      in "${runScriptEl} ${initEl}";
-      label = ":gnu: initialize Emacs";
-      depends_on = "lint-secrets";
-    }
   ];
 in pkgs.writeText "pipeline.yaml" (toJSON pipeline)
diff --git a/users/wpcarro/ci/pipelines/script.el b/users/wpcarro/emacs/ci.el
index da079b64ba..da079b64ba 100644
--- a/users/wpcarro/ci/pipelines/script.el
+++ b/users/wpcarro/emacs/ci.el
diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix
index 20ef805dba..b8c97ac176 100644
--- a/users/wpcarro/emacs/default.nix
+++ b/users/wpcarro/emacs/default.nix
@@ -165,25 +165,34 @@ let
         --load ${initEl} \
         "$@"
     '';
-in {
-  inherit initEl withEmacsPath;
 
-  # I need to start my Emacs from CI without the call to `--load ${initEl}`.
-  runScript = { script }:
-    writeShellScript "run-emacs-script" ''
-      export PATH="${emacsBinPath}:$PATH"
-      export EMACSLOADPATH="${wpcDir}:${vendorDir}:${wpcarrosEmacs.deps}/share/emacs/site-lisp"
-      exec ${wpcarrosEmacs}/bin/emacs \
-        --no-site-file \
-        --no-site-lisp \
-        --no-init-file \
-        --script ${script} \
-        "$@"
+  # I need this to start my Emacs from CI without the call to
+  # `--load ${initEl}`.
+  runScript = script: writeShellScript "run-emacs-script" ''
+    export PATH="${emacsBinPath}:$PATH"
+    export EMACSLOADPATH="${loadPath}"
+    exec ${wpcarrosEmacs}/bin/emacs \
+      --no-site-file \
+      --no-site-lisp \
+      --no-init-file \
+      --script ${script} \
+      "$@"
     '';
 
+in {
+  inherit withEmacsPath;
+
   nixos = withEmacsPath {
     emacsBin = "${wpcarrosEmacs}/bin/emacs";
   };
 
-  meta.targets = [ "nixos" ];
+  meta = {
+    targets = [ "nixos" ];
+    extraSteps = [
+      {
+        label = ":gnu: initialize Emacs";
+        command = "${runScript ./ci.el} ${./.emacs.d/init.el}";
+      }
+    ];
+  };
 }