From 78ecc56ed3d5ec35231243c472bbcfd0ff4c83b3 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 31 Mar 2022 01:28:00 +0200 Subject: [PATCH] dev: move shell.nix out of test/ And delete test/, as it will live elsewhere when Doom core and modules are separated. --- test/shell.nix => shell.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename test/shell.nix => shell.nix (95%) diff --git a/test/shell.nix b/shell.nix similarity index 95% rename from test/shell.nix rename to shell.nix index 110606ed2..62a1aafaf 100644 --- a/test/shell.nix +++ b/shell.nix @@ -9,7 +9,7 @@ # # With your own DOOMDIR: # -# nix-shell --argstr doomdir ~/.config/doom +# nix-shell --argstr doomdir ~/.config/other-doom-config # # With a specific version of Emacs # @@ -39,9 +39,9 @@ ]; } , emacs ? "27" -, emacsdir ? "$(pwd)/.." -, doomdir ? "$(pwd)" -, doomlocaldir ? "$(pwd)/.local" }: +, emacsdir ? "$(pwd)" +, doomdir ? "" +, doomlocaldir ? "$EMACSDIR/.local" }: let emacsPkg = (if emacs == "26" then pkgs.emacs26 else if emacs == "26.3" then pkgs.emacs26 @@ -88,6 +88,6 @@ in pkgs.stdenv.mkDerivation { cp -r "$EMACSDIR/.local/straight/repos" ./repos fi popd >/dev/null - echo "Ready!" + echo "Ready! Remember to 'doom sync'!" ''; }