about summary refs log tree commit diff
path: root/users/tazjin/emacs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2020-08-14T13·19+0100
committertazjin <mail@tazj.in>2020-08-14T13·34+0000
commit8b2d0ae064e294fc2409dea0e36cc7ed5b6fd3a3 (patch)
tree791857de87616e5ff50667b48f6fa0afe43cac6b /users/tazjin/emacs
parentd1c38d9597e110bef92a548c86a651174bd385dc (diff)
refactor(tazjin/emacs): Use telega.el from unstable channel r/1650
This removes the need for supplying a locally built telega-server
binary, as the new upstream derivation includes this.

It also ensures that the frontend/backend are synchronised, which I
think has been causing some issues on vauxhall.

Change-Id: If504624e607a24fa12d68516cde65fef25ed2838
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1749
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'users/tazjin/emacs')
-rw-r--r--users/tazjin/emacs/default.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/users/tazjin/emacs/default.nix b/users/tazjin/emacs/default.nix
index 8de4660bc536..5bb9a720a0a0 100644
--- a/users/tazjin/emacs/default.nix
+++ b/users/tazjin/emacs/default.nix
@@ -14,8 +14,12 @@ let
 
   emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs26).emacsWithPackages;
 
+  # Pick telega from unstable channel for recent fixes.
+  unstable = import third_party.nixpkgsSrc {};
+  telegaUnstable = (unstable.emacsPackagesGen third_party.emacs26).telega;
+
   # $PATH for binaries that need to be available to Emacs
-  emacsBinPath = lib.makeBinPath [ third_party.telega ];
+  emacsBinPath = lib.makeBinPath [ telegaUnstable ];
 
   identity = x: x;
 
@@ -34,6 +38,7 @@ let
   # MELPA packages:
   (with epkgs.melpaPackages; [
     ace-link
+    bazel-mode
     browse-kill-ring
     cargo
     clojure-mode
@@ -86,7 +91,7 @@ let
     sly
     string-edit
     swiper
-    telega
+    telegaUnstable
     telephone-line
     terraform-mode
     toml-mode