ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/system/shadow.scm
View file

@ -155,11 +155,31 @@ (define (default-skeletons)
if [ -f ~/.profile ]; then . ~/.profile; fi
# 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)
(zprofile (plain-file "zprofile" "\
# 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" "\
XTerm*utf8: always
XTerm*metaSendsEscape: true\n"))