From 23f26130d245ed4de01dd0239951f9b0823629c2 Mon Sep 17 00:00:00 2001
From: Charles Roelli <charles@aurox.ch>
Date: Thu, 5 Feb 2026 10:13:10 +0100
Subject: Make variables of password store directory and services

---
 home-configuration.scm | 114 +++++++++++++++++++++++++------------------------
 1 file changed, 59 insertions(+), 55 deletions(-)

diff --git a/home-configuration.scm b/home-configuration.scm
index 852e690..5e05df8 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -15,6 +15,64 @@
 	     (gnu home services mail)
 	     (gnu home services shells))
 
+(define-public %password-store-dir (local-file ".password-store"
+					       "password-store"
+					       #:recursive? #t))
+(define-public
+  %my-services
+  (list (simple-service 'home-environment-variables-service
+			home-environment-variables-service-type
+			'(("EDITOR" . "emacsclient")))
+	(service home-bash-service-type
+		 (home-bash-configuration
+		   (aliases '(("egrep" . "egrep --color=auto")
+			      ("fgrep" . "fgrep --color=auto")
+			      ("grep" . "grep --color=auto")
+			      ("l" . "ls -CF")
+			      ("la" . "ls -A")
+			      ("ll" . "ls -alF")
+			      ("ls" . "ls --color=auto")))
+		   (bashrc (list (local-file
+				  ".bashrc"
+				  "bashrc")))
+		   (bash-logout (list (local-file
+				       ".bash_logout"
+				       "bash_logout")))))
+	(service home-files-service-type
+		 (list
+		  (list ".emacs" (local-file ".emacs" "emacs"))
+		  (list ".password-store" %password-store-dir)))
+	(service home-msmtp-service-type
+		 (home-msmtp-configuration
+		   (accounts
+		    (list
+		     (msmtp-account
+		       (name "charles@aurox.ch")
+		       (configuration
+			(msmtp-configuration
+			  (auth? #t)
+			  (tls? #t)
+			  (tls-starttls? #f)
+			  (log-file "/home/charles/log/mail/charles@aurox.ch.log")
+			  (from "charles@aurox.ch")
+			  (host "smtp.migadu.com")
+			  (port 465)
+			  (user "charles@aurox.ch")
+			  (password-eval "pass charles@aurox.ch"))))))
+		   (default-account "charles@aurox.ch")))
+	(simple-service 'variant-packages-service
+			home-channels-service-type
+			(list
+			 (channel
+			   (name 'variant-packages)
+			   (branch "main")
+			   (url "https://codeberg.org/charlesroelli/channel.git")
+			   (introduction
+			    (make-channel-introduction
+			     "ffc27e1f5f8306faf47098e8cf8e06c610a315de"
+			     (openpgp-fingerprint
+			      "59B6 65CB 5FC8 1C50 8144  5049 3EEC E33F 63F9 8864"))))))))
+
 (define-public %home-environment (home-environment
   ;; Below is the list of packages that will show up in your
   ;; Home profile, under ~/.guix-home/profile.
@@ -48,61 +106,7 @@
   ;; Below is the list of Home services.  To search for available
   ;; services, run 'guix home search KEYWORD' in a terminal.
   (services
-   (append (list (simple-service 'home-environment-variables-service
-				 home-environment-variables-service-type
-				 '(("EDITOR" . "emacsclient")))
-		 (service home-bash-service-type
-			  (home-bash-configuration
-			   (aliases '(("egrep" . "egrep --color=auto")
-				      ("fgrep" . "fgrep --color=auto")
-				      ("grep" . "grep --color=auto")
-				      ("l" . "ls -CF")
-				      ("la" . "ls -A")
-				      ("ll" . "ls -alF")
-				      ("ls" . "ls --color=auto")))
-			   (bashrc (list (local-file
-					  ".bashrc"
-					  "bashrc")))
-			   (bash-logout (list (local-file
-					       ".bash_logout"
-					       "bash_logout")))))
-		 (service home-files-service-type
-			  (list
-			   (list ".emacs" (local-file ".emacs" "emacs"))
-			   (list ".password-store"
-				 (local-file ".password-store"
-					     "password-store"
-					     #:recursive? #t))))
-		 (service home-msmtp-service-type
-			  (home-msmtp-configuration
-			   (accounts
-			    (list
-			     (msmtp-account
-			      (name "charles@aurox.ch")
-			      (configuration
-			       (msmtp-configuration
-				(auth? #t)
-				(tls? #t)
-				(tls-starttls? #f)
-				(log-file "/home/charles/log/mail/charles@aurox.ch.log")
-				(from "charles@aurox.ch")
-				(host "smtp.migadu.com")
-				(port 465)
-				(user "charles@aurox.ch")
-				(password-eval "pass charles@aurox.ch"))))))
-			   (default-account "charles@aurox.ch")))
-		 (simple-service 'variant-packages-service
-				 home-channels-service-type
-				 (list
-				  (channel
-				    (name 'variant-packages)
-				    (branch "main")
-				    (url "https://codeberg.org/charlesroelli/channel.git")
-				    (introduction
-				     (make-channel-introduction
-				      "ffc27e1f5f8306faf47098e8cf8e06c610a315de"
-				      (openpgp-fingerprint
-				       "59B6 65CB 5FC8 1C50 8144  5049 3EEC E33F 63F9 8864")))))))
+   (append %my-services
 	   %base-home-services))))
 
 %home-environment
-- 
cgit v1.3