mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 22:08:16 -05:00
65e8472a4b
This is a follow-up to commit 86afaadb51 ("system: Add 'nss-certs' to
%base-packages-networking.")
* doc/guix-cookbook.texi (Running Guix on a Linode Server): Remove nss-certs
from operating system's packages field.
(Running Guix on a Kimsufi Server): Likewise.
* doc/guix.texi (Using the Configuration System): Likewise.
(X.509 Certificates): Adjust to mention nss-certs *is* part of %base-packages.
* gnu/installer/services.scm (%system-services): Remove recommendation to
install nss-certs.
* gnu/system/examples/bare-bones.tmpl (host-name): Remove obsolete comments.
* gnu/system/examples/desktop.tmpl (packages): Remove nss-certs.
* gnu/system/examples/lightweight-desktop.tmpl (packages): Likewise.
* gnu/system/examples/plasma.tmpl (packages): Likewise.
* gnu/system/examples/raspberry-pi-64-nfs-root.tmpl (packages): Likewise.
* gnu/system/examples/raspberry-pi-64.tmpl (packages): Likewise.
* gnu/system/examples/vm-image.tmpl (packages): Likewise.
* gnu/system/images/orangepi-r1-plus-lts-rk3328.scm (packages): Likewise.
* gnu/system/images/pine64.scm (packages): Likewise.
* gnu/system/install.scm (installation-os) [packages]: Likewise.
Change-Id: If09123a69b987178bcb0aab61c4570c14fc1286f
97 lines
3.8 KiB
Scheme
97 lines
3.8 KiB
Scheme
;; -*- mode: scheme; -*-
|
|
;; This is an operating system configuration template
|
|
;; for a "desktop" setup with GNOME and Xfce where the
|
|
;; root partition is encrypted with LUKS, and a swap file.
|
|
|
|
(use-modules (gnu) (gnu system nss) (guix utils))
|
|
(use-service-modules desktop sddm xorg)
|
|
(use-package-modules gnome)
|
|
|
|
(operating-system
|
|
(host-name "antelope")
|
|
(timezone "Europe/Paris")
|
|
(locale "en_US.utf8")
|
|
|
|
;; Choose US English keyboard layout. The "altgr-intl"
|
|
;; variant provides dead keys for accented characters.
|
|
(keyboard-layout (keyboard-layout "us" "altgr-intl"))
|
|
|
|
;; Use the UEFI variant of GRUB with the EFI System
|
|
;; Partition mounted on /boot/efi.
|
|
(bootloader (bootloader-configuration
|
|
(bootloader grub-efi-bootloader)
|
|
(targets '("/boot/efi"))
|
|
(keyboard-layout keyboard-layout)))
|
|
|
|
;; Specify a mapped device for the encrypted root partition.
|
|
;; The UUID is that returned by 'cryptsetup luksUUID'.
|
|
(mapped-devices
|
|
(list (mapped-device
|
|
(source (uuid "12345678-1234-1234-1234-123456789abc"))
|
|
(target "my-root")
|
|
(type luks-device-mapping))))
|
|
|
|
(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))
|
|
|
|
;; Specify a swap file for the system, which resides on the
|
|
;; root file system.
|
|
(swap-devices (list (swap-space
|
|
(target "/swapfile"))))
|
|
|
|
;; Create user `bob' with `alice' as its initial password.
|
|
(users (cons (user-account
|
|
(name "bob")
|
|
(comment "Alice's brother")
|
|
(password (crypt "alice" "$6$abc"))
|
|
(group "students")
|
|
(supplementary-groups '("wheel" "netdev"
|
|
"audio" "video")))
|
|
%base-user-accounts))
|
|
|
|
;; Add the `students' group
|
|
(groups (cons* (user-group
|
|
(name "students"))
|
|
%base-groups))
|
|
|
|
;; This is where we specify system-wide packages.
|
|
(packages (append (list
|
|
;; for user mounts
|
|
gvfs)
|
|
%base-packages))
|
|
|
|
;; Add GNOME and Xfce---we can choose at the log-in screen
|
|
;; by clicking the gear. Use the "desktop" services, which
|
|
;; include the X11 log-in service, networking with
|
|
;; NetworkManager, and more.
|
|
(services (if (target-x86-64?)
|
|
(append (list (service gnome-desktop-service-type)
|
|
(service xfce-desktop-service-type)
|
|
(set-xorg-configuration
|
|
(xorg-configuration
|
|
(keyboard-layout keyboard-layout))))
|
|
%desktop-services)
|
|
|
|
;; FIXME: Since GDM depends on Rust (gdm -> gnome-shell -> gjs
|
|
;; -> mozjs -> rust) and Rust is currently unavailable on
|
|
;; non-x86_64 platforms, we use SDDM and Mate here instead of
|
|
;; GNOME and GDM.
|
|
(append (list (service mate-desktop-service-type)
|
|
(service xfce-desktop-service-type)
|
|
(set-xorg-configuration
|
|
(xorg-configuration
|
|
(keyboard-layout keyboard-layout))
|
|
sddm-service-type))
|
|
%desktop-services)))
|
|
|
|
;; Allow resolution of '.local' host names with mDNS.
|
|
(name-service-switch %mdns-host-lookup-nss))
|