From 40310efde9b4a4f2cf98081d6cd10f843685ebb6 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Wed, 8 Feb 2023 10:37:35 +0800 Subject: system: default-skeletons: Merge search-paths of multiple profiles. Fixes . * gnu/system/shadow.scm (default-skeletons)[bash_profile, zprofile]: Merge search-paths from multiple profiles via "guix package". --- gnu/system/shadow.scm | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'gnu/system') diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 2bd72d3e96..8d428bf743 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -155,11 +155,31 @@ alias grep='grep --color=auto'\n")) 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")) -- cgit v1.2.3