diff options
Diffstat (limited to 'gnu/system/examples')
| -rw-r--r-- | gnu/system/examples/bare-bones.tmpl | 10 | ||||
| -rw-r--r-- | gnu/system/examples/beaglebone-black.tmpl | 24 | ||||
| -rw-r--r-- | gnu/system/examples/desktop.tmpl | 32 | ||||
| -rw-r--r-- | gnu/system/examples/docker-image.tmpl | 2 | ||||
| -rw-r--r-- | gnu/system/examples/lightweight-desktop.tmpl | 16 | ||||
| -rw-r--r-- | gnu/system/examples/vm-image.tmpl | 12 |
6 files changed, 56 insertions, 40 deletions
diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 902dacbe57..a88bab034f 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -44,8 +44,8 @@ ;; Add services to the baseline: a DHCP client and ;; an SSH server. - (services (cons* (service dhcp-client-service-type) - (service openssh-service-type - (openssh-configuration - (port-number 2222))) - %base-services))) + (services (append (list (service dhcp-client-service-type) + (service openssh-service-type + (openssh-configuration + (port-number 2222)))) + %base-services))) diff --git a/gnu/system/examples/beaglebone-black.tmpl b/gnu/system/examples/beaglebone-black.tmpl index efef682e3a..11678063b2 100644 --- a/gnu/system/examples/beaglebone-black.tmpl +++ b/gnu/system/examples/beaglebone-black.tmpl @@ -43,15 +43,15 @@ %base-user-accounts)) ;; Globally-installed packages. - (packages (cons* screen openssh %base-packages)) - - (services (cons* (service dhcp-client-service-type) - ;; mingetty does not work on serial lines. - ;; Use agetty with board-specific serial parameters. - (agetty-service - (agetty-configuration - (extra-options '("-L")) - (baud-rate "115200") - (term "vt100") - (tty "ttyO0"))) - %base-services))) + (packages (append (list screen openssh) %base-packages)) + + (services (append (list (service dhcp-client-service-type) + ;; mingetty does not work on serial lines. + ;; Use agetty with board-specific serial parameters. + (agetty-service + (agetty-configuration + (extra-options '("-L")) + (baud-rate "115200") + (term "vt100") + (tty "ttyO0")))) + %base-services))) diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 1b8d46afaf..c59bf92681 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -25,12 +25,17 @@ (target "my-root") (type luks-device-mapping)))) - (file-systems (cons (file-system - (device (file-system-label "my-root")) - (mount-point "/") - (type "ext4") - (dependencies mapped-devices)) - %base-file-systems)) + (file-systems (append + (list (file-system + (device (file-system-label "my-root")) + (mount-point "/") + (type "ext4") + (dependencies mapped-devices)) + (file-system + (device (uuid "1234-ABCD" 'fat)) + (mount-point "/boot/efi") + (type "vfat"))) + %base-file-systems)) (users (cons (user-account (name "bob") @@ -42,17 +47,20 @@ %base-user-accounts)) ;; This is where we specify system-wide packages. - (packages (cons* nss-certs ;for HTTPS access - gvfs ;for user mounts - %base-packages)) + (packages (append (list + ;; for HTTPS access + nss-certs + ;; for user mounts + gvfs) + %base-packages)) ;; Add GNOME and/or Xfce---we can choose at the log-in ;; screen with F1. Use the "desktop" services, which ;; include the X11 log-in service, networking with ;; NetworkManager, and more. - (services (cons* (gnome-desktop-service) - (xfce-desktop-service) - %desktop-services)) + (services (append (list (gnome-desktop-service) + (xfce-desktop-service)) + %desktop-services)) ;; Allow resolution of '.local' host names with mDNS. (name-service-switch %mdns-host-lookup-nss)) diff --git a/gnu/system/examples/docker-image.tmpl b/gnu/system/examples/docker-image.tmpl index d73187398f..9690d651c1 100644 --- a/gnu/system/examples/docker-image.tmpl +++ b/gnu/system/examples/docker-image.tmpl @@ -44,4 +44,4 @@ (type "does-not-matter")))) ;; Guix is all you need! - (services (list (guix-service)))) + (services (list (service guix-service-type)))) diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl index 360ee62ffe..a234badd2b 100644 --- a/gnu/system/examples/lightweight-desktop.tmpl +++ b/gnu/system/examples/lightweight-desktop.tmpl @@ -19,15 +19,16 @@ ;; Assume the target root file system is labelled "my-root", ;; and the EFI System Partition has UUID 1234-ABCD. - (file-systems (cons* (file-system + (file-systems (append + (list (file-system (device (file-system-label "my-root")) (mount-point "/") (type "ext4")) (file-system (device (uuid "1234-ABCD" 'fat)) (mount-point "/boot/efi") - (type "vfat")) - %base-file-systems)) + (type "vfat"))) + %base-file-systems)) (users (cons (user-account (name "alice") @@ -40,9 +41,12 @@ ;; Add a bunch of window managers; we can choose one at ;; the log-in screen with F1. - (packages (cons* ratpoison i3-wm i3status dmenu ;window managers - nss-certs ;for HTTPS access - %base-packages)) + (packages (append (list + ;; window managers + ratpoison i3-wm i3status dmenu + ;; for HTTPS access + nss-certs) + %base-packages)) ;; Use the "desktop" services, which include the X11 ;; log-in service, networking with NetworkManager, and more. diff --git a/gnu/system/examples/vm-image.tmpl b/gnu/system/examples/vm-image.tmpl index 36e272722d..4d292c1bc6 100644 --- a/gnu/system/examples/vm-image.tmpl +++ b/gnu/system/examples/vm-image.tmpl @@ -24,6 +24,8 @@ partprobe, and then 2) resizing the filesystem with resize2fs.\n")) (timezone "Etc/UTC") (locale "en_US.utf8") + (firmware '()) + ;; Assuming /dev/sdX is the target hard disk, and "my-root" is ;; the label of the target root file system. (bootloader (bootloader-configuration @@ -42,10 +44,12 @@ partprobe, and then 2) resizing the filesystem with resize2fs.\n")) (users %base-user-accounts) ;; Globally-installed packages. - (packages (cons* nvi fdisk - grub ; mostly so xrefs to its manual work - parted ; partprobe - %base-packages)) + (packages (append (list nvi fdisk + ;; mostly so xrefs to its manual work + grub + ;; partprobe + parted) + %base-packages)) (services (modify-services %base-services (login-service-type config => |