home

commit fab5a780d90bc50c9403070a8c8252f1d2eb21ec
parent 8634858f49f5563a700f37a18a95b59650aea07a
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Sat,  6 Jun 2020 12:47:40 +0200

nix: move custom emacs to pkgs…

… that way, I can cache the build on cachix.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
pkgs/default.nix
 | 
1
+
M
users/vincent/dev/emacs.nix
 | 
5
++---

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -18,6 +18,7 @@ rec {
   sec = pkgs.callPackage ./sec { };
   systemd-email = pkgs.callPackage ./systemd-email { };
   yak = pkgs.callPackage ./yak { };
+  emacs = pkgs.emacs27.override { inherit (pkgs) imagemagick; withXwidgets = true; };
 
   # Maybe upstream
   athens = pkgs.callPackage ./athens { };
diff --git a/users/vincent/dev/emacs.nix b/users/vincent/dev/emacs.nix
@@ -6,7 +6,6 @@ let
     #!${pkgs.stdenv.shell}
     emacsclient -s /run/user/1000/emacs/org -n -F '((name . "capture") (width . 150) (height . 90))' -e '(org-capture)'
   '';
-  myEmacs = pkgs.emacs27.override { inherit (pkgs) imagemagick; withXwidgets = true; };
 in
 {
   home.file.".local/share/applications/org-protocol.desktop".source = ./emacs/org-protocol.desktop;
@@ -26,7 +25,7 @@ in
   };
   programs.emacs = {
     enable = true;
-    package = myEmacs;
+    package = my.emacs;
     extraPackages = epkgs: with epkgs; [
       ace-window
       aggressive-indent
@@ -135,7 +134,7 @@ in
   };
   services.emacs-server = {
     enable = true;
-    package = myEmacs;
+    package = my.emacs;
     name = "org";
     shell = pkgs.zsh + "/bin/zsh -i -c";
     # FIXME do this in the derivation :)