mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-05 08:17:01 +00:00
Code Activity

environment: include extraInit in set-environment script

Browse source
This commit is contained in:
Daiderd Jordan 2017-10-07 12:27:43 +02:00
parent 94fddd38af
commit a8b4770275
No known key found for this signature in database
GPG key ID: D02435D05B810C96
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/environment/default.nix
View file

@ -154,7 +154,13 @@ in {
inherit (cfg) postBuild pathsToLink extraOutputsToInstall;
};
system.build.setEnvironment = concatStringsSep "\n" exportVariables;
system.build.setEnvironment = ''
${concatStringsSep "\n" exportVariables}
# Extra initialisation
${cfg.extraInit}
'';
system.build.setAliases = concatStringsSep "\n" aliasCommands;
};

1
modules/programs/bash.nix
View file

@ -76,7 +76,6 @@ in
${config.system.build.setEnvironment}
${config.system.build.setAliases}
${config.environment.extraInit}
${config.environment.interactiveShellInit}
${cfg.interactiveShellInit}

4
modules/programs/fish.nix
View file

@ -9,7 +9,7 @@ let
foreignEnv = pkgs.writeText "fish-foreign-env" ''
# TODO: environment.shellInit
${cfge.extraInit}
${config.system.build.setEnvironment}
'';
loginForeignEnv = pkgs.writeText "fish-login-foreign-env" ''
@ -125,8 +125,6 @@ in
set PATH ${replaceStrings [":"] [" "] config.environment.systemPath}
${config.system.build.setEnvironment}
fenv source ${foreignEnv}
${cfg.shellInit}

1
modules/programs/zsh/default.nix
View file

@ -131,7 +131,6 @@ in
export PATH=${config.environment.systemPath}
${config.system.build.setEnvironment}
${config.environment.extraInit}
${cfg.shellInit}