system: default-skeletons: Merge search-paths of multiple profiles.

Fixes <https://issues.guix.gnu.org/20255>.

* gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]:
Merge search-paths from multiple profiles via "guix package".
This commit is contained in:
宋文武 2023-02-08 10:37:35 +08:00
parent 6419ca7fd7
commit 40310efde9
No known key found for this signature in database
GPG key ID: D415BF253B515976

View file

@ -155,11 +155,31 @@ (define (default-skeletons)
if [ -f ~/.profile ]; then . ~/.profile; fi if [ -f ~/.profile ]; then . ~/.profile; fi
# Honor per-interactive-shell startup file # Honor per-interactive-shell startup file
if [ -f ~/.bashrc ]; then . ~/.bashrc; fi\n")) if [ -f ~/.bashrc ]; then . ~/.bashrc; fi
# Merge search-paths from multiple profiles, the order matters.
eval \"$(guix package --search-paths \\
-p $HOME/.config/guix/current \\
-p $HOME/.guix-profile \\
-p /run/current-system/profile)\"
# Prepend setuid programs.
export PATH=/run/setuid-programs:$PATH
"))
(bashrc %default-bashrc) (bashrc %default-bashrc)
(zprofile (plain-file "zprofile" "\ (zprofile (plain-file "zprofile" "\
# Honor system-wide environment variables # Honor system-wide environment variables
source /etc/profile\n")) source /etc/profile
# Merge search-paths from multiple profiles, the order matters.
eval \"$(guix package --search-paths \\
-p $HOME/.config/guix/current \\
-p $HOME/.guix-profile \\
-p /run/current-system/profile)\"
# Prepend setuid programs.
export PATH=/run/setuid-programs:$PATH
"))
(xdefaults (plain-file "Xdefaults" "\ (xdefaults (plain-file "Xdefaults" "\
XTerm*utf8: always XTerm*utf8: always
XTerm*metaSendsEscape: true\n")) XTerm*metaSendsEscape: true\n"))