marusich pushed a commit to branch master
in repository guix.
commit 2f4d43584cb26315c028dfbd2197da0d175933a2
Author: Chris Marusich <[email protected]>
Date: Sat Oct 13 22:50:36 2018 -0700
system: Rename .zlogin to .zprofile.
Reported by Meiyo Peng <[email protected]>.
* gnu/system/shadow.scm (default-skeletons): Rename zlogin to zprofile.
---
gnu/system/shadow.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index f800c3b..63f544c 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -181,7 +181,7 @@ fi
alias ls='ls -p --color=auto'
alias ll='ls -l'
alias grep='grep --color=auto'\n"))
- (zlogin (plain-file "zlogin" "\
+ (zprofile (plain-file "zprofile" "\
# Honor system-wide environment variables
source /etc/profile\n"))
(guile-wm (computed-file "guile-wm" copy-guile-wm))
@@ -197,7 +197,10 @@ set debug-file-directory ~/.guix-profile/lib/debug
set auto-load safe-path /gnu/store/*/lib\n")))
`((".bash_profile" ,profile)
(".bashrc" ,bashrc)
- (".zlogin" ,zlogin)
+ ;; Zsh sources ~/.zprofile before ~/.zshrc, and it sources ~/.zlogin
+ ;; after ~/.zshrc. To avoid interfering with any customizations a user
+ ;; may have made in their ~/.zshrc, put this in .zprofile, not .zlogin.
+ (".zprofile" ,zprofile)
(".nanorc" ,(plain-file "nanorc" "\
# Include all the syntax highlighting modules.
include /run/current-system/profile/share/nano/*.nanorc\n"))
