From 7e4a8470bef8649e8a803f073b89c17d5cdcb45f Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@protonmail.com>
Date: Fri, 11 Oct 2024 13:54:16 +0200
Subject: [PATCH] feat: move to more robust solution than time-machine

The problem with time-machine is that the guix
derivation might need to be recomputed and rebuilt.
This can happen because the underlying guix version used
to build it can differ. The solution to this can be
to keep the resulting guix in a folder, and use it out of
that folder, instead of recomputing it every time.

This can still mean that there will be need for
duplicit recomputation between building the guix
and pulling it into user profile. I don't know what
a good solution to this is, yet.
---
 .gitignore                  |  1 +
 Makefile                    | 51 ++++++++++++++++++++++++-------------
 channels-manifest.scm       | 11 ++++++++
 channels-profile.scm        |  7 +++++
 home/home-configuration.scm |  6 +++++
 5 files changed, 59 insertions(+), 17 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 channels-manifest.scm
 create mode 100644 channels-profile.scm

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1de5659
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 02a3c3b..7820d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,29 +4,46 @@ SYSTEM_ARGS = -L ./modules ./config.scm
 HOME_ARGS = -L ./home/modules ./home/home-configuration.scm
 TIMEMACHINE = guix time-machine -C channels-lock.scm
 
-system-build: channels-lock.scm
-	$(TIMEMACHINE) -- system build $(SYSTEM_ARGS)
+GUIX=target/guix/bin/guix
 
-system-reconfigure: channels-lock.scm
-	$(TIMEMACHINE) -- system reconfigure $(SYSTEM_ARGS)
+target/guix: channels-lock.scm channels-profile.scm channels-manifest.scm
+	mkdir -p target
+	rm -rf ./target/guix
+	guix build \
+    -f ./channels-profile.scm \
+		-r ./target/guix
 
-system-vm: channels-lock.scm
-	$(TIMEMACHINE) -- system vm $(SYSTEM_ARGS)
+pull: channels-lock.scm channels-manifest.scm target/guix
+  # TODO: investigate what guix version to use here.
+  # How to ensure it is not built twice unnecessarily?
+  # The problem is that guix-for-channels actually produces
+  # a different derivation if we are in different current guix.
+  # Maybe it would make sense to have sort of a bootstrap guix
+  # built that will not be updated so regularly, and be used
+  # only to obtain the guix instances?
+	guix install --profile='~/.config/guix/current' \
+    --manifest=./channels-manifest.scm
 
-system-container: channels-lock.scm
-	$(TIMEMACHINE) -- system container $(SYSTEM_ARGS)
+system-build: channels-lock.scm target/guix
+	$(GUIX) system build $(SYSTEM_ARGS)
 
-home-build: channels-lock.scm
-	$(TIMEMACHINE) -- home build $(HOME_ARGS)
+system-reconfigure: channels-lock.scm target/guix
+	$(GUIX) system reconfigure $(SYSTEM_ARGS) --cores=10 --max-jobs=5
 
-home-reconfigure: channels-lock.scm
-	$(TIMEMACHINE) -- home reconfigure $(HOME_ARGS)
+system-vm: channels-lock.scm target/guix
+	$(GUIX) system vm $(SYSTEM_ARGS)
 
-home-container: channels-lock.scm
-	$(TIMEMACHINE) -- home container $(HOME_ARGS)
+system-container: channels-lock.scm target/guix
+	$(GUIX) system container $(SYSTEM_ARGS)
+
+home-build: channels-lock.scm target/guix
+	$(GUIX) home build $(HOME_ARGS)
+
+home-reconfigure: channels-lock.scm target/guix
+	$(GUIX) home reconfigure $(HOME_ARGS) --cores=10 --max-jobs=5
+
+home-container: channels-lock.scm target/guix
+	$(GUIX) home container $(HOME_ARGS)
 
 channels-lock.scm: channels.scm
 	guix time-machine -C channels.scm -- describe -f channels > channels-lock.scm
-
-pull: channels-lock.scm
-	guix pull -C channels-lock.scm
diff --git a/channels-manifest.scm b/channels-manifest.scm
new file mode 100644
index 0000000..0d6b669
--- /dev/null
+++ b/channels-manifest.scm
@@ -0,0 +1,11 @@
+(use-modules
+ (guix ui)
+ (gnu packages package-management))
+
+(define (load-channels file)
+  (load* file (make-user-module '((guix channels)))))
+
+(packages->manifest
+ (list
+  (guix-for-channels
+   (load-channels "./channels-lock.scm"))))
diff --git a/channels-profile.scm b/channels-profile.scm
new file mode 100644
index 0000000..78ca258
--- /dev/null
+++ b/channels-profile.scm
@@ -0,0 +1,7 @@
+(use-modules
+ (guix ui)
+ (guix profiles))
+
+(profile
+ (content
+  (load "./channels-manifest.scm")))
diff --git a/home/home-configuration.scm b/home/home-configuration.scm
index 372826d..1ca5889 100644
--- a/home/home-configuration.scm
+++ b/home/home-configuration.scm
@@ -4,10 +4,16 @@
 ;; need to capture the channels being used, as returned by "guix describe".
 ;; See the "Replicating Guix" section in the manual.
 
+;; TODO: ~/.msmtpd, ~/.offlineimaprc, ~/.offlineimap.py, ~/.notmuch-config, ~/.notmuch/post-new
+;;       ~/.emacs.d/lisp/custom-packages.el
+;; from_full_name =?utf-8?B?RnJhbnRpxaFlayBCb2jDocSNZWs=?=
+
 (use-modules (guix packages)
              (guix gexp)
+             (guix transformations)
              (gnu home)
              (gnu packages)
+             (gnu packages librewolf)
              (gnu packages gnupg)
              (gnu packages base)
              (gnu packages emacs)
-- 
2.48.1