1
0
mirror of https://github.com/nix-community/home-manager synced 2024-06-26 16:38:34 +02:00

keychain: set SHELL during initialization (#2880)

Explicitly sets the SHELL environment variable in the snippets put into
the shell init files.

Fixes #2256
This commit is contained in:
Infinidoge 2022-04-16 18:33:07 -04:00 committed by GitHub
parent a640dddc9a
commit 0586d2d42a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -100,13 +100,13 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
programs.bash.initExtra = mkIf cfg.enableBashIntegration '' programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
eval "$(${shellCommand})" SHELL=bash eval "$(${shellCommand})"
''; '';
programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration ''
eval (${shellCommand}) SHELL=fish eval (${shellCommand})
''; '';
programs.zsh.initExtra = mkIf cfg.enableZshIntegration '' programs.zsh.initExtra = mkIf cfg.enableZshIntegration ''
eval "$(${shellCommand})" SHELL=zsh eval "$(${shellCommand})"
''; '';
xsession.initExtra = mkIf cfg.enableXsessionIntegration '' xsession.initExtra = mkIf cfg.enableXsessionIntegration ''
eval "$(${shellCommand})" eval "$(${shellCommand})"