summary refs log tree commit diff
path: root/gnu/home
diff options
context:
space:
mode:
authorBrian Kubisiak <brian@kubisiak.com>2022-03-28 18:35:01 -0700
committerLudovic Courtès <ludo@gnu.org>2022-04-03 12:42:18 +0200
commit032f2e261caee641d29ebc604a7d7a9be2410ac7 (patch)
treedc5965bd69b8be81a5c8d530e35754610f1afed0 /gnu/home
parent9535b6217026d6a329898c9d8f4e1e54caef3401 (diff)
downloadguix-032f2e261caee641d29ebc604a7d7a9be2410ac7.tar.gz
home: services: zsh: Fix zshenv creation.
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.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/home')
-rw-r--r--gnu/home/services/shells.scm4
1 files changed, 2 insertions, 2 deletions
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 @@ source ~/.profile
 
 (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))) '())