From e7c66a3ccb20d32e17dd8b0264322969af05404c Mon Sep 17 00:00:00 2001 From: David Crompton Date: Sat, 4 May 2024 15:56:47 -0400 Subject: [PATCH] Proper Overlays --- flake.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index a3ab370..9a14c89 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,17 @@ emacs-overlay.overlays.default ]; }; + mkEmacs = pkgs: v: pkgs.emacsWithPackagesFromUsePackage { + config = ./main.org; + package = pkgs."${v}${pkgs.lib.optionalString pkgs.stdenv.isDarwin "-macport"}"; + }; in { packages = { - emacs = pkgs.emacsWithPackagesFromUsePackage { - config = ./main.org; - package = if pkgs.stdenv.isDarwin then pkgs.emacs29-macport else pkgs.emacs29; - }; + me-emacs = mkEmacs pkgs "emacs29"; + }; + + overlays.default = final: prev: { + me-emacs = mkEmacs final "emacs29"; }; }); }