This commit is contained in:
Daniel Ziltener 2023-12-15 00:48:17 +01:00
parent 8eddd92c42
commit 7f22b50358

View file

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