From f6e59dc09a2b60840d53a960e46f0075d6479c97 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Wed, 14 Apr 2021 00:19:59 +0200
Subject: refactor(tazjin/emacs): Use Emacs packages exclusively from fixpoint

In preparation for native comp ...

Change-Id: I4386ec195673aa664a353236b85d13c3258629e5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3006
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
---
 users/tazjin/emacs/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'users/tazjin')

diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index b4d5f952e954..4babc106dd48 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -7,7 +7,7 @@
 # Forcing Emacs to link against Imagemagick currently causes libvterm
 # to segfault, which is a lot less desirable than not having telega
 # render images correctly.
-{ depot, lib, pkgs, ... }:
+{ lib, pkgs, ... }:
 
 let
   emacsWithPackages = (pkgs.emacsPackagesGen pkgs.emacs27).emacsWithPackages;
@@ -91,21 +91,22 @@ let
     yasnippet
   ]) ++
 
+  # Other external packages:
+  (with epkgs; [
+    exwm
+    vterm
+    telega
+  ]) ++
+
   # Custom packages
-  (with depot.tools.emacs-pkgs; [
+  (with epkgs.tvlPackages; [
     dottime
     nix-util
     term-switcher
     tvl
 
-    # telega comes from a mysterious third package set
-    pkgs.emacsPackages.telega
-
     # patched / overridden versions of packages
-    depot.third_party.emacs.exwm
-    depot.third_party.emacs.rcirc
-    depot.third_party.emacs.vterm
-    depot.third_party.emacs.explain-pause-mode
+    rcirc
   ]))));
 in lib.fix(self: l: f: pkgs.writeShellScriptBin "tazjins-emacs" ''
   export PATH="${emacsBinPath}:$PATH"
-- 
cgit 1.4.1