summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Paśnikowski <marek@marekpasnikowski.pl>2024-01-16 12:00:08 +0100
committerMarek Paśnikowski <marek@marekpasnikowski.pl>2024-01-16 12:00:08 +0100
commit8c9f2c66672004d172cb27fa4208a8a53dbee79c (patch)
tree582a7d171d2939bac229a416a29677777aa7c509
parent1a284fa4279fc2f4085a827b24de5d60c6037502 (diff)
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 .
-rw-r--r--home-configuration.scm8
-rw-r--r--izumi.org8
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]]