doc: Add desktop configuration example.

* gnu/system/examples/bare-bones.tmpl: Change 'packages' and
  'host-name'.  Remove D-Bus, Avahi, and SLiM services, and add lsh
  instead.
* gnu/system/examples/desktop.tmpl: New file.
* Makefile.am (EXAMPLES): Add it.
This commit is contained in:
Ludovic Courtès 2015-05-09 23:16:11 +02:00
parent c217cbd84d
commit 36ffaca246
3 changed files with 55 additions and 13 deletions

View File

@ -135,7 +135,8 @@ KCONFIGS = \
# Templates, examples. # Templates, examples.
EXAMPLES = \ EXAMPLES = \
gnu/system/examples/bare-bones.tmpl gnu/system/examples/bare-bones.tmpl \
gnu/system/examples/desktop.tmpl
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go

View File

@ -1,12 +1,13 @@
;; This is an operating system configuration template. ;; This is an operating system configuration template
;; for a "bare bones" setup, with no X11 display server.
(use-modules (gnu)) (use-modules (gnu))
(use-service-modules xorg networking dbus avahi) (use-service-modules networking ssh)
(use-package-modules xorg avahi) (use-package-modules admin)
(operating-system (operating-system
(host-name "antelope") (host-name "komputilo")
(timezone "Europe/Paris") (timezone "Europe/Berlin")
(locale "en_US.UTF-8") (locale "en_US.UTF-8")
;; Assuming /dev/sdX is the target hard disk, and "root" is ;; Assuming /dev/sdX is the target hard disk, and "root" is
@ -36,12 +37,10 @@
(home-directory "/home/alice")))) (home-directory "/home/alice"))))
;; Globally-installed packages. ;; Globally-installed packages.
(packages (cons xterm %base-packages)) (packages (cons tcpdump %base-packages))
;; Add services to the baseline: the SLiM log-in manager ;; Add services to the baseline: a DHCP client and
;; for Xorg sessions, a DHCP client, Avahi, and D-Bus. ;; an SSH server.
(services (cons* (slim-service) (services (cons* (dhcp-client-service)
(dhcp-client-service) (lsh-service #:port-number 2222)
(avahi-service)
(dbus-service (list avahi))
%base-services))) %base-services)))

View File

@ -0,0 +1,42 @@
;; This is an operating system configuration template
;; for a "desktop" setup with X11.
(use-modules (gnu) (gnu system nss))
(use-service-modules desktop)
(use-package-modules xfce ratpoison wicd avahi xorg)
(operating-system
(host-name "antelope")
(timezone "Europe/Paris")
(locale "en_US.UTF-8")
;; Assuming /dev/sdX is the target hard disk, and "root" is
;; the label of the target root file system.
(bootloader (grub-configuration (device "/dev/sdX")))
(file-systems (cons (file-system
(device "root")
(title 'label)
(mount-point "/")
(type "ext4"))
%base-file-systems))
(users (list (user-account
(name "bob")
(comment "Alice's brother")
(group "users")
(supplementary-groups '("wheel"
"audio" "video"))
(home-directory "/home/bob"))))
;; Add Xfce and Ratpoison; that allows us to choose
;; sessions using either of these at the log-in screen.
(packages (cons* xfce ratpoison ;desktop environments
xterm wicd avahi ;useful tools
%base-packages))
;; Use the "desktop" services, which include the X11
;; log-in service, networking with Wicd, and more.
(services %desktop-services)
;; Allow resolution of '.local' host names with mDNS.
(name-service-switch %mdns-host-lookup-nss))