Prefer --subst-var over --subst-var-by
Rename a few other template vars to remain consistent.
This commit is contained in:
parent
48c4531e2e
commit
ce63f7f54a
2 changed files with 10 additions and 10 deletions
12
default.nix
12
default.nix
|
|
@ -325,15 +325,15 @@ let
|
|||
fi
|
||||
rm $out/doomdir/init.el
|
||||
if [[ -z "$profileName" ]]; then
|
||||
setProfile="(setq doom-profile-dir \"$out/profile\")"
|
||||
maybeSetProfileDir="(setq doom-profile-dir \"$out/profile\")"
|
||||
else
|
||||
setProfile=""
|
||||
maybeSetProfileDir=""
|
||||
fi
|
||||
substitute $initEl $out/doomdir/init.el \
|
||||
--subst-var-by maybe-set-profile-dir "$setProfile" \
|
||||
--subst-var-by profile-name "$profileName" \
|
||||
--subst-var-by user-init "$doomDir/init.el" \
|
||||
--subst-var-by straight-base-dir $out
|
||||
--subst-var maybeSetProfileDir \
|
||||
--subst-var profileName \
|
||||
--subst-var-by userInit "$doomDir/init.el" \
|
||||
--subst-var-by straightBaseDir $out
|
||||
ln -sf $doomIntermediates/packages.el $out/doomdir/
|
||||
export DOOMDIR=$out/doomdir
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue