From 0586d2d42a7790554842e31efc61c06d1e236280 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Sat, 16 Apr 2022 18:33:07 -0400 Subject: [PATCH] keychain: set SHELL during initialization (#2880) Explicitly sets the SHELL environment variable in the snippets put into the shell init files. Fixes #2256 --- modules/programs/keychain.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/programs/keychain.nix b/modules/programs/keychain.nix index 9a25702f3..70b74c91d 100644 --- a/modules/programs/keychain.nix +++ b/modules/programs/keychain.nix @@ -100,13 +100,13 @@ in { config = mkIf cfg.enable { home.packages = [ cfg.package ]; programs.bash.initExtra = mkIf cfg.enableBashIntegration '' - eval "$(${shellCommand})" + SHELL=bash eval "$(${shellCommand})" ''; programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration '' - eval (${shellCommand}) + SHELL=fish eval (${shellCommand}) ''; programs.zsh.initExtra = mkIf cfg.enableZshIntegration '' - eval "$(${shellCommand})" + SHELL=zsh eval "$(${shellCommand})" ''; xsession.initExtra = mkIf cfg.enableXsessionIntegration '' eval "$(${shellCommand})"