From 7f22b5035829f86f8126b13527156354e2d983fb Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Fri, 15 Dec 2023 00:48:17 +0100
Subject: [PATCH] .

---
 config.org | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/config.org b/config.org
index c7c5b55..492e81e 100644
--- a/config.org
+++ b/config.org
@@ -26,9 +26,10 @@ This is to be run after setting up the partitions.
 #+begin_src sh :tangle sysinst.sh
   #!/bin/sh
   set euxo -pipefail
+  mount /dev/disk/by-label/guix /mnt
+  mount /dev/disk/by-label/EFI /mnt/boot/efi
   herd start cow-store /mnt
-  guix pull -L.
-  sed -i 's|/etc/config.scm|/mnt/etc/config.scm|g' ./config.scm
+  guix pull -C./channels.scm
   guix system -L. init ./config.scm /mnt --substitute-urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org"
 #+end_src
 
@@ -37,6 +38,7 @@ This is to be run after setting up the partitions.
 #+NAME: module-list
 - gnu
 - gnu image
+- gnu packages gnome
 - gnu services authentication
 - gnu services base
 - gnu services dbus
@@ -93,7 +95,7 @@ The variable ~%local-filesystem~ extracts the file system definitions from the i
 =config.scm= file.
 
 #+begin_src scheme :tangle config.scm
-  (define %local-filesystem
+  #;(define %local-filesystem
     (call-with-input-file "/etc/config.scm"
       (lambda (port)
         (read port)
@@ -105,7 +107,7 @@ The variable ~%local-filesystem~ extracts the file system definitions from the i
 As a sibling to the former, the variable ~%local-swap~ does the same with the swap partition.
 
 #+begin_src scheme :tangle config.scm
-  (define %local-swap
+  #;(define %local-swap
     (call-with-input-file "/etc/config.scm"
       (lambda (port)
         (read port)
@@ -122,14 +124,15 @@ As a sibling to the former, the variable ~%local-swap~ does the same with the sw
 #+NAME: config-filesystems
 #+begin_src scheme :noweb yes
   (file-systems (append (list
-                         (file-system
-                          (device (file-system-label "EFI")
-                                  (mount-point "/boot/efi")
-                                  (type "vfat"))
-                          (device (file-system-label "guix")
-                                  (mount-point "/")
-                                  (type "xfs"))))
-                        %base-file-systems))
+			 (file-system
+			  (device (file-system-label "EFI"))
+				  (mount-point "/boot/efi")
+				  (type "vfat"))
+		         (file-system
+			  (device (file-system-label "guix"))
+				  (mount-point "/")
+				  (type "xfs")))
+			%base-file-systems))
 #+end_src
 
 #+NAME: config-swap
@@ -165,6 +168,7 @@ This adds the Nonguix channel.
 - git
 - hwdata
 - nss-certs
+- network-manager
 - readline
 
 #+NAME: root-package-block
@@ -221,7 +225,7 @@ These services are unmodified, or have just few settings.
 #+end_src
 
 #+NAME: root-modified-desktop-services
-#+begin_src scheme :exports none :results code
+#+begin_src scheme :exports none :results code :noweb no-export
     (modify-services
      %desktop-services
      (delete login-service-type)