From 5f0277a30d9800a72784a011109c13d09ae008c3 Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Sat, 27 Jul 2024 13:27:55 +0200
Subject: feat(update): incorporate GUILE_LOAD_PATH to enable quick guix
 testing

---
 suweren/update.scm | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'suweren')

diff --git a/suweren/update.scm b/suweren/update.scm
index 2826b00..90c60f6 100644
--- a/suweren/update.scm
+++ b/suweren/update.scm
@@ -3,12 +3,13 @@
   #:use-module (gnu services))
 
 (define-public (update-commands system user)
-  (let* ((allow-downgrades "--allow-downgrades ")
-	 (and "&& ")
-	 (collect-garbage "sudo guix gc -d 7d ")
+  (let* ((and "&& ")
+	 (delete-home-generations "guix home delete-generations 7d ; ")
+	 (delete-roots "sudo guix gc -d 7d ")
+	 (delete-system-generations "sudo guix system delete-generations 7d ; ")
+	 (guile-load-path "GUILE_LOAD_PATH='$HOME/Szablony/distribution:$HOME/Szablony/deployment' ")
 	 (pull-guix "guix pull ")
-	 (reconfigure-home (string-append "guix home delete-generations 7d ; "
-					  "guix home reconfigure -e "
+	 (reconfigure-home (string-append "guix home reconfigure -e "
 					  "'((@ (users "
 					  user
 					  ") "
@@ -16,24 +17,20 @@
 					  "-home-environment) \""
 					  system
 					  "\")' "))
-	 (reconfigure-system (string-append "sudo guix system delete-generations 7d ; "
-					    "sudo guix system reconfigure -e "
+	 (reconfigure-system (string-append "sudo guix system reconfigure -e "
 					    "'(@ (systems "
 					    system
 					    " system-configuration) "
 					    system
 					    ")' "))
 
-	 (reupdate-system (string-append pull-guix
-					 allow-downgrades
-					 and
-					 reconfigure-system
-					 allow-downgrades
-					 and
-					 reconfigure-home
-					 allow-downgrades
-					 and
-					 collect-garbage))
+	 (collect-garbage (string-append delete-home-generations
+					 delete-system-generations
+					 delete-roots))
+	 (test-home (string-append guile-load-path
+				   reconfigure-home))
+	 (test-system (string-append guile-load-path
+				     reconfigure-system))
 	 (update-system (string-append pull-guix
 				       and
 				       reconfigure-system
@@ -46,8 +43,9 @@
 		    ("pull-guix" . ,pull-guix)
 		    ("reconfigure-home" . ,reconfigure-home)
 		    ("reconfigure-system" . ,reconfigure-system)
-		    ("update-system" . ,update-system)
-		    ("reupdate-system" . ,reupdate-system)))
+		    ("test-home" . ,test-home)
+		    ("test-system" . ,test-system)
+		    ("update-system" . ,update-system)))
 	 
 	 (value (home-bash-extension (aliases aliases))))
     
-- 
cgit v1.2.3