From b7bf3d53e6e87566928e70e26cdaba90fb0ee075 Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Sun, 17 Dec 2023 17:43:07 +0100 Subject: [PATCH] . --- config.org | 38 ++++++++++++++++++++------------------ config.scm | 1 + 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/config.org b/config.org index 4a6f691..fd41c0a 100644 --- a/config.org +++ b/config.org @@ -24,15 +24,17 @@ 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 -mkdir -p /mnt/boot/efi -mount /dev/disk/by-label/EFI /mnt/boot/efi -herd start cow-store /mnt -guix pull -C./channels.scm -hash guix -guix system -L. init ./config.scm /mnt --substitute-urls="https://ci.guix.gnu.org https://bordeaux.guix.gnu.org https://substitutes.nonguix.org" + #!/bin/sh + set euxo -pipefail + mount /dev/disk/by-label/guix /mnt + mkdir -p /mnt/boot/efi + mount /dev/disk/by-label/EFI /mnt/boot/efi + herd start cow-store /mnt + guix pull -C./channels.scm + $GUIX_PROFILE="/root/.config/guix/current" + . "$GUIX_PROFILE/etc/profile" + hash guix + 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 * Modules @@ -126,15 +128,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")) - (file-system - (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 diff --git a/config.scm b/config.scm index 2082343..42d2cf6 100644 --- a/config.scm +++ b/config.scm @@ -21,6 +21,7 @@ (use-modules (gnu) (gnu image) + (gnu packages gnome) (gnu services authentication) (gnu services base) (gnu services dbus)