local/bin/homeinit: Install default profile like other profiles.

master
Pierre Neidhardt 2020-06-11 12:45:21 +02:00
parent 09256e6de8
commit 2f352b8cda
1 changed files with 11 additions and 9 deletions

View File

@ -219,11 +219,16 @@ guix_install_profile() {
if [ -f "$manifest"]; then
warning "Manifest $manifest not found."
else
profile=$HOME/.guix-extra-profiles/$i/$i
mkdir -p $(dirname "$profile")
~/.config/guix/current/bin/guix package --manifest=$HOME/.package-lists/guix-$i-manifest.scm --keep-failed --profile="$profile" --substitute-urls="$SUBSTITUTE_URLS"
if [ -f "$profile"/etc/profile ]; then
. "$profile"/etc/profile
if [ "$i" = "default"]; then
~/.config/guix/current/bin/guix package --manifest="$manifest" --keep-failed --substitute-urls="$SUBSTITUTE_URLS"
. ~/.guix-profile/etc/profile
else
profile=$HOME/.guix-extra-profiles/$i/$i
mkdir -p $(dirname "$profile")
~/.config/guix/current/bin/guix package --manifest="$manifest" --keep-failed --profile="$profile" --substitute-urls="$SUBSTITUTE_URLS"
if [ -f "$profile"/etc/profile ]; then
. "$profile"/etc/profile
fi
fi
fi
}
@ -236,10 +241,7 @@ if inpath guix; then
hash guix
fi
~/.config/guix/current/bin/guix package --manifest=$HOME/.package-lists/guix-default-manifest.scm --keep-failed --substitute-urls="$SUBSTITUTE_URLS"
. ~/.guix-profile/etc/profile
for i in main emacs next texlive; do
for i in default main emacs next texlive; do
guix_install_profile "$i"
done
if $is_laptop; then