From 68ecfc7c411a2d110d498af76fa7367cc0485adf Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Tue, 12 Dec 2023 09:33:21 +0100
Subject: [PATCH] .

---
 config.scm | 10 +++++-----
 sysinst.sh |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/config.scm b/config.scm
index 800c4e9..a47dfaa 100644
--- a/config.scm
+++ b/config.scm
@@ -59,7 +59,7 @@
 
 ;; [[file:config.org::*File System][File System:1]]
 (define %local-filesystem
-  (call-with-input-file "/etc/config.scm"
+  (call-with-input-file "/mnt/mnt/mnt/etc/config.scm"
     (lambda (port)
       (read port)
       (read port)
@@ -73,8 +73,8 @@
 
 
 ;; [[file:config.org::*File System][File System:2]]
-(define %local-swap
-  (call-with-input-file "/etc/config.scm"
+#;(define %local-swap
+  (call-with-input-file "/mnt/mnt/mnt/etc/config.scm"
     (lambda (port)
       (read port)
       (read port)
@@ -109,7 +109,7 @@
     '("/boot/efi"))
    (keyboard-layout keyboard-layout)))
  (file-systems %local-filesystem)
- (swap-devices %local-swap)
+ #;(swap-devices %local-swap)
  (users
   (cons*
    (user-account
@@ -120,7 +120,7 @@
    %base-user-accounts))
   (packages
    (append
-    (list emacs emacs-desktop-environment font-terminus git hwdata nss-certs readline swayfx)
+    (list emacs emacs-desktop-environment font-terminus git nss-certs readline)
     %base-packages))
   (services
    (append
diff --git a/sysinst.sh b/sysinst.sh
index 4a5b7ca..e1eca04 100644
--- a/sysinst.sh
+++ b/sysinst.sh
@@ -2,6 +2,11 @@
 herd start cow-store /mnt
 mkdir -p ~/.config/guix
 cp channels.scm ~/.config/guix/channels.scm
+mkdir -p /mnt/etc/guix/
+cp channels.scm /mnt/etc/guix/
+mkdir -p /etc/guix
+cp channels.scm /etc/guix
 guix pull
 sed -i 's|/etc/config.scm|/mnt/etc/config.scm|g' ./config.scm
-guix system init ./config.scm /mnt
+guix system init ./config.scm /mnt --substitute-urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org"
+