From 2f352b8cdabf2ec56367f5c910accb6bd666465c Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Thu, 11 Jun 2020 12:45:21 +0200
Subject: [PATCH] local/bin/homeinit: Install default profile like other
 profiles.

---
 .local/bin/homeinit | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.local/bin/homeinit b/.local/bin/homeinit
index f1a9dd2f..886dd32b 100755
--- a/.local/bin/homeinit
+++ b/.local/bin/homeinit
@@ -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