From 2775931557fa6302a10d6afc312dc9c5bc518424 Mon Sep 17 00:00:00 2001
From: Jakub Czajka <jakub@ekhem.eu.org>
Date: Thu, 22 Dec 2022 20:52:13 +0100
Subject: [PATCH] [home] Symlink profile.d files.

---
 conf/home/bash.scm | 17 +++++++++++++++--
 home.scm           | 15 ++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/conf/home/bash.scm b/conf/home/bash.scm
index d5dbd6b..9efb1c7 100644
--- a/conf/home/bash.scm
+++ b/conf/home/bash.scm
@@ -4,13 +4,13 @@
 ;; bash.scm - custom bash configuration.
 
 (define-module (conf home bash)
+  #:use-module (conf home symlink)
   #:use-module (gnu home services)
   #:use-module (gnu packages bash)
   #:use-module (gnu services configuration)
   #:use-module (guix gexp)
   #:use-module (guix packages)
-  #:export (home-bash-configuration
-	    home-bash-service-type))
+  #:export (bash-services))
 
 (define (serialize-string field-name value)
   value)
@@ -48,3 +48,16 @@
    (default-value (home-bash-configuration))
    (description "Installs bash packages and symlinks @file{.bash_profile} and
 @file{.bashrc}.")))
+
+(define bash-service
+  (service home-bash-service-type))
+
+(define profile-service
+  (service home-symlink-service-type
+	   (list "bash/.config/profile.d/10-xdg.sh"
+	         "bash/.config/profile.d/20-less.sh"
+		 "bash/.config/profile.d/50-bash.sh")))
+
+(define bash-services
+  (list bash-service
+	profile-service))
diff --git a/home.scm b/home.scm
index a9de340..7dcee55 100644
--- a/home.scm
+++ b/home.scm
@@ -5,7 +5,6 @@
 
 (use-modules (conf home bash)
 	     (conf home program)
-	     (conf home symlink)
              (gnu home services)
 	     (gnu packages base)
 	     (gnu packages version-control)
@@ -15,11 +14,9 @@
 (home-environment
  (packages (list))
  (services
-  (list (service home-bash-service-type)
-	(service home-symlink-service-type
-		 (list "bash/.config/profile.d/10-xdg.sh"
-		       "bash/.config/profile.d/20-less.sh"))
-	(service home-program-service-type
-		 (home-program-configuration
-		  (packages (list git))
-		  (dotfiles (list "git/.config/git/config")))))))
+  (append
+   (list (service home-program-service-type
+		  (home-program-configuration
+		   (packages (list git))
+		   (dotfiles (list "git/.config/git/config")))))
+   bash-services)))
-- 
2.39.5