From d97cf260a2547a53853dafee896176c5814ef482 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sat, 16 May 2020 04:08:17 +0100
Subject: [PATCH] refactor(tools/emacs): Move third-party overrides to
 //third_party

EXWM and vterm are overridden, but this shouldn't be happening outside
of //third_party
---
 third_party/emacs/exwm.nix  | 13 +++++++++++++
 third_party/emacs/vterm.nix | 11 +++++++++++
 tools/emacs/default.nix     | 26 +++-----------------------
 3 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 third_party/emacs/exwm.nix
 create mode 100644 third_party/emacs/vterm.nix

diff --git a/third_party/emacs/exwm.nix b/third_party/emacs/exwm.nix
new file mode 100644
index 000000000..585520531
--- /dev/null
+++ b/third_party/emacs/exwm.nix
@@ -0,0 +1,13 @@
+# EXWM straight from GitHub. As of 2020-05-15, XELB in nixpkgs is
+# already at a recent enough version and does not need to be
+# overridden.
+{ pkgs, ... }:
+
+pkgs.emacsPackages.exwm.overrideAttrs(_: {
+  src = pkgs.fetchFromGitHub {
+    owner = "ch11ng";
+    repo = "exwm";
+    rev = "48db94f48bea1137132345abfe8256cfc6219248";
+    sha256 = "0jj12z6m5kvanq19gds3jpvid2mg8w28bbbq9iycl751y2sj4l1r";
+  };
+})
diff --git a/third_party/emacs/vterm.nix b/third_party/emacs/vterm.nix
new file mode 100644
index 000000000..674a919c9
--- /dev/null
+++ b/third_party/emacs/vterm.nix
@@ -0,0 +1,11 @@
+# Overridden vterm to fetch a newer version
+{ pkgs, ... }:
+
+pkgs.emacsPackages.vterm.overrideAttrs(_: {
+  src = pkgs.fetchFromGitHub{
+    owner = "akermu";
+    repo = "emacs-libvterm";
+    rev = "58b4cc40ee9872a08fc5cbfee78ad0e195a3306c";
+    sha256 = "1w5yfl8nq4k7xyldf0ivzv36vhz3dwdzk6q2vs3xwpx6ljy52px6";
+  };
+})
diff --git a/tools/emacs/default.nix b/tools/emacs/default.nix
index 790b8a904..d8f774093 100644
--- a/tools/emacs/default.nix
+++ b/tools/emacs/default.nix
@@ -21,18 +21,6 @@ let
 
   identity = x: x;
 
-  # EXWM straight from GitHub. As of 2020-02-07, XELB in nixpkgs is
-  # already at a recent enough version and does not need to be
-  # overridden.
-  exwmMaster = exwm.overrideAttrs(_: {
-    src = third_party.fetchFromGitHub {
-      owner = "ch11ng";
-      repo = "exwm";
-      rev = "48db94f48bea1137132345abfe8256cfc6219248";
-      sha256 = "0jj12z6m5kvanq19gds3jpvid2mg8w28bbbq9iycl751y2sj4l1r";
-    };
-  });
-
   tazjinsEmacs = pkgfun: (emacsWithPackages(epkgs: pkgfun(
   # Actual ELPA packages (the enlightened!)
   (with epkgs.elpaPackages; [
@@ -111,27 +99,19 @@ let
     xelb
     yaml-mode
     yasnippet
-
-    (vterm.overrideAttrs(_: {
-      src = third_party.fetchFromGitHub{
-        owner = "akermu";
-        repo = "emacs-libvterm";
-        rev = "58b4cc40ee9872a08fc5cbfee78ad0e195a3306c";
-        sha256 = "1w5yfl8nq4k7xyldf0ivzv36vhz3dwdzk6q2vs3xwpx6ljy52px6";
-      };
-    }))
   ]) ++
 
   # Custom packages
   (with depot.tools.emacs-pkgs; [
     carp-mode
-    exwmMaster
     dottime
     nix-util
     term-switcher
 
-    # patched version of rcirc
+    # patched / overridden versions of packages
+    depot.third_party.emacs.exwm
     depot.third_party.emacs.rcirc
+    depot.third_party.emacs.vterm
   ]))));
 in lib.fix(self: l: f: third_party.writeShellScriptBin "tazjins-emacs" ''
   export PATH="${emacsBinPath}:$PATH"