Merge pull request #30418 from LnL7/inline-set-environment

nixos: inline set-environment for bash and zsh

Changed files
+2 -2
nixos
modules
programs
bash
zsh
+1 -1
nixos/modules/programs/bash/bash.nix
···
programs.bash = {
shellInit = ''
-
. ${config.system.build.setEnvironment}
${cfge.shellInit}
'';
···
programs.bash = {
shellInit = ''
+
${config.system.build.setEnvironment.text}
${cfge.shellInit}
'';
+1 -1
nixos/modules/programs/zsh/zsh.nix
···
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
-
. ${config.system.build.setEnvironment}
${cfge.shellInit}
···
if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
export __ETC_ZSHENV_SOURCED=1
+
${config.system.build.setEnvironment.text}
${cfge.shellInit}