From 576f190972224044397128df91a72a07180461e4 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Thu, 12 Mar 2020 23:49:39 +0000
Subject: fix(ops/nixos/nugget): Ensure that 'nuggetEmacs' is used for EXWM

---
 ops/nixos/nugget/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ops/nixos/nugget/default.nix b/ops/nixos/nugget/default.nix
index 8b9793f923..7f6e116783 100644
--- a/ops/nixos/nugget/default.nix
+++ b/ops/nixos/nugget/default.nix
@@ -7,6 +7,12 @@ config: let
   };
 
   lieer = (depot.third_party.lieer {});
+
+  # google-c-style is installed only on nugget because other
+  # machines get it from, eh, elsewhere.
+  nuggetEmacs = (depot.tools.emacs.overrideEmacs(epkgs: epkgs ++ [
+    depot.third_party.emacsPackages.google-c-style
+  ]));
 in depot.lib.fix(self: {
   imports = [
     ../modules/tailscale.nix
@@ -91,15 +97,10 @@ in depot.lib.fix(self: {
     # programs from the depot
     (with depot; [
       lieer
+      nuggetEmacs
       ops.kontemplate
       third_party.git
       third_party.tailscale
-
-      # google-c-style is installed only on nugget because other
-      # machines get it from, eh, elsewhere.
-      (tools.emacs.overrideEmacs(epkgs: epkgs ++ [
-        third_party.emacsPackages.google-c-style
-      ]))
     ]) ++
 
     # programs from nixpkgs
@@ -222,7 +223,7 @@ in depot.lib.fix(self: {
 
       windowManager.session = lib.singleton {
         name = "exwm";
-        start = "${depot.tools.emacs}/bin/tazjins-emacs";
+        start = "${nuggetEmacs}/bin/tazjins-emacs";
       };
     };
 
-- 
cgit 1.4.1