diff options
Diffstat (limited to 'users/wpcarro/emacs')
| -rw-r--r-- | users/wpcarro/emacs/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index 40e6f8d65d..c2669f6949 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -3,12 +3,11 @@ # TODO(wpcarro): See if it's possible to expose emacsclient on PATH, so that I # don't need to depend on wpcarros-emacs and emacs in my NixOS configurations. let - inherit (builtins) path; inherit (depot.third_party.nixpkgs) emacsPackagesGen emacs27; inherit (depot.users) wpcarro; - inherit (pkgs) runCommand writeShellScriptBin; inherit (lib) mapAttrsToList; inherit (lib.strings) concatStringsSep makeBinPath; + inherit (pkgs) runCommand writeShellScriptBin; emacsBinPath = makeBinPath ( wpcarro.common.shell-utils ++ @@ -129,7 +128,7 @@ let makeEnvVars = env: concatStringsSep "\n" (mapAttrsToList (k: v: "export ${k}=\"${v}\"") env); - withEmacsPath = { emacsBin, env ? {} }: + withEmacsPath = { emacsBin, env ? {}, load ? [] }: writeShellScriptBin "wpcarros-emacs" '' export XMODIFIERS=emacs export PATH="${emacsBinPath}:$PATH" @@ -141,12 +140,14 @@ let --no-site-file \ --no-site-lisp \ --load ${./.emacs.d/init.el} \ + ${concatStringsSep "\n" (map (el: "--load ${el} \\") load)} "$@" ''; in { inherit withEmacsPath; - nixos = withEmacsPath { + nixos = { load ? [] }: withEmacsPath { + inherit load; emacsBin = "${wpcarrosEmacs}/bin/emacs"; }; @@ -166,5 +167,5 @@ in { touch $out ''; - meta.targets = [ "nixos" "check" ]; + meta.targets = [ "check" ]; } |