mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-29 07:42:23 -05:00
a5acc17a3c
The 'title' field was easily overlooked and was an endless source of confusion. Now, the value of the 'device' field is self-contained. * gnu/system/file-systems.scm (<file-system>): Change constructor name to '%file-system'. [title]: Remove. (<file-system-label>): New record type with printer. (report-deprecation, device-expression) (process-file-system-declaration, file-system): New macros. (file-system-title): New procedure. (file-system->spec, spec->file-system): Adjust to handle <file-system-label>. * gnu/system.scm (bootable-kernel-arguments): Add case for 'file-system-label?'. (read-boot-parameters): Likewise. (mapped-device-user): Avoid 'file-system-title'. (fs->boot-device): Remove. (operating-system-boot-parameters): Use 'file-system-device' instead of 'fs->boot-device'. (device->sexp): Add case for 'file-system-label?'. * gnu/bootloader/grub.scm (grub-root-search): Add case for 'file-system-label?'. * gnu/system/examples/bare-bones.tmpl, gnu/system/examples/beaglebone-black.tmpl, gnu/system/examples/lightweight-desktop.tmpl, gnu/system/examples/vm-image.tmpl: Remove uses of 'title'. * gnu/system/vm.scm (virtualized-operating-system): Remove uses of 'file-system-title'. * guix/scripts/system.scm (check-file-system-availability): Likewise, and adjust fix-it hint. (check-initrd-modules)[file-system-/dev]: Likewise. * gnu/build/file-systems.scm (canonicalize-device-spec): Remove 'title' parameter. [canonical-title]: Remove. Match on SPEC's type rather than on CANONICAL-TITLE. (mount-file-system): Adjust caller. * gnu/build/linux-boot.scm (boot-system): Interpret ROOT here. * gnu/services/base.scm (file-system->fstab-entry): Remove use of 'file-system-title'. * doc/guix.texi (File Systems): Remove documentation of the 'title' field. Rewrite documentation of 'device' and document 'file-system-label'.
52 lines
1.9 KiB
Cheetah
52 lines
1.9 KiB
Cheetah
;; This is an operating system configuration template
|
|
;; for a "desktop" setup without full-blown desktop
|
|
;; environments.
|
|
|
|
(use-modules (gnu) (gnu system nss))
|
|
(use-service-modules desktop)
|
|
(use-package-modules bootloaders certs ratpoison suckless wm)
|
|
|
|
(operating-system
|
|
(host-name "antelope")
|
|
(timezone "Europe/Paris")
|
|
(locale "en_US.utf8")
|
|
|
|
;; Use the UEFI variant of GRUB with the EFI System
|
|
;; Partition mounted on /boot/efi.
|
|
(bootloader (bootloader-configuration
|
|
(bootloader grub-efi-bootloader)
|
|
(target "/boot/efi")))
|
|
|
|
;; Assume the target root file system is labelled "my-root",
|
|
;; and the EFI System Partition has UUID 1234-ABCD.
|
|
(file-systems (cons* (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))
|
|
|
|
(users (cons (user-account
|
|
(name "alice")
|
|
(comment "Bob's sister")
|
|
(group "users")
|
|
(supplementary-groups '("wheel" "netdev"
|
|
"audio" "video"))
|
|
(home-directory "/home/alice"))
|
|
%base-user-accounts))
|
|
|
|
;; 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))
|
|
|
|
;; Use the "desktop" services, which include the X11
|
|
;; log-in service, networking with NetworkManager, and more.
|
|
(services %desktop-services)
|
|
|
|
;; Allow resolution of '.local' host names with mDNS.
|
|
(name-service-switch %mdns-host-lookup-nss))
|