Message ID | 20220329013501.bpfihhyghky4jq2u@peregrine |
---|---|
State | Accepted |
Headers | show |
Series | [bug#54617] home: services: zsh: Fix zshenv creation. | expand |
Hi, Brian Kubisiak <brian@kubisiak.com> skribis: > Fixes a regression introduced by > 4935501fd9f690d8990bb798237d51702b87fb3f that would skip generating > the user's ~/.config/zsh/.zshenv unless both of zshenv and > environment-variables are set in the configuration. > > * gnu/home/services/shells.scm (zsh-get-configuration-files): > Generate ~/.config/zsh/.zshenv when only one of zshenv or > environment-variables is specified. Good catch! Applied, thanks. Ludo’.
diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 7b9769bcf3..b0147291fc 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -212,8 +212,8 @@ (define (zsh-file-by-field config field) (define (zsh-get-configuration-files config) `(("zprofile" ,(zsh-file-by-field config 'zprofile)) ;; Always non-empty - ,@(if (and (zsh-field-not-empty? config 'zshenv) - (zsh-field-not-empty? config 'environment-variables)) + ,@(if (or (zsh-field-not-empty? config 'zshenv) + (zsh-field-not-empty? config 'environment-variables)) `(("zshenv" ,(zsh-file-by-field config 'zshenv))) '()) ,@(if (zsh-field-not-empty? config 'zshrc) `(("zshrc" ,(zsh-file-by-field config 'zshrc))) '())