From 8c9f2c66672004d172cb27fa4208a8a53dbee79c Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Tue, 16 Jan 2024 12:00:08 +0100
Subject: Repair the home-bash-configuration service

While searching for a way to ensure $GUIX_PROFILE is always set, I found out
that the bash service should not be declared explicitly, but extended instead.

This commit solves both problems by switching to home-bash-extension and then
sourcing the .profile file within .bashrc .

The .profile file is sourced explicitly, because sourcing indirectly by means of
.bash_profile opens an infinite loop. As it turned out, the .bash_profile file
sources .bashrc .
---
 home-configuration.scm | 8 +++++---
 izumi.org              | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/home-configuration.scm b/home-configuration.scm
index 1b2cbe2..101dce2 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -175,13 +175,15 @@
            reconfigure-home
            and
            collect-garbage)))
-      (service
+      (simple-service
+       'bash-extension
        home-bash-service-type
-       (home-bash-configuration
+       (home-bash-extension
         (aliases
          `(("collect-garbage" . ,collect-garbage)
            ("edit" . "$EDITOR")
            ("pull-guix" . ,pull-guix)
            ("reconfigure-home" . ,reconfigure-home)
            ("reconfigure-system" . ,reconfigure-system)
-           ("update-system" . ,update-system))))))))))
+           ("update-system" . ,update-system)))
+        (bashrc (list (plain-file "source-home-profile" "source ~/.profile\n"))))))))))
diff --git a/izumi.org b/izumi.org
index 44c0d41..02a7de5 100644
--- a/izumi.org
+++ b/izumi.org
@@ -848,16 +848,18 @@
          reconfigure-home
          and
          collect-garbage)))
-    (service
+    (simple-service
+     'bash-extension
      home-bash-service-type
-     (home-bash-configuration
+     (home-bash-extension
       (aliases
        `(("collect-garbage" . ,collect-garbage)
          ("edit" . "$EDITOR")
          ("pull-guix" . ,pull-guix)
          ("reconfigure-home" . ,reconfigure-home)
          ("reconfigure-system" . ,reconfigure-system)
-         ("update-system" . ,update-system))))))
+         ("update-system" . ,update-system)))
+      (bashrc (list (plain-file "source-home-profile" "source ~/.profile\n"))))))
 #+END_SRC
 
 * [[https://www.leonrische.me/fc/][Emacs-Org-FC-TN]]
-- 
cgit v1.2.3