Browse Source

doc: Add "lightweight desktop" OS config example.

* gnu/system/examples/desktop.tmpl (packages): Remove XFCE and
RATPOISON.
(services): Add 'gnome-desktop-service' and 'xfce-desktop-service'.
* gnu/system/examples/lightweight-desktop.tmpl: New file.
* Makefile.am (EXAMPLES): Add it.
* doc.am (OS_CONFIG_EXAMPLES_TEXI): Add
doc/os-config-lightweight-desktop.texi.
* gnu/system/install.scm (/etc/configuration-files)[directory]: Add
lightweight-desktop.tmpl.
gn-latest-20200428
Ludovic Courtès 4 years ago
parent
commit
d038b674cf
7 changed files with 75 additions and 15 deletions
  1. +1
    -0
      .gitignore
  2. +2
    -1
      Makefile.am
  3. +2
    -1
      doc.am
  4. +10
    -2
      doc/guix.texi
  5. +11
    -9
      gnu/system/examples/desktop.tmpl
  6. +45
    -0
      gnu/system/examples/lightweight-desktop.tmpl
  7. +4
    -2
      gnu/system/install.scm

+ 1
- 0
.gitignore View File

@@ -123,3 +123,4 @@ Makefile.in
config.cache
stamp-h[0-9]
tmp
/doc/os-config-lightweight-desktop.texi

+ 2
- 1
Makefile.am View File

@@ -183,7 +183,8 @@ KCONFIGS = \
# Templates, examples.
EXAMPLES = \
gnu/system/examples/bare-bones.tmpl \
gnu/system/examples/desktop.tmpl
gnu/system/examples/desktop.tmpl \
gnu/system/examples/lightweight-desktop.tmpl

GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go



+ 2
- 1
doc.am View File

@@ -47,7 +47,8 @@ EXTRA_DIST += \

OS_CONFIG_EXAMPLES_TEXI = \
doc/os-config-bare-bones.texi \
doc/os-config-desktop.texi
doc/os-config-desktop.texi \
doc/os-config-lightweight-desktop.texi

# Bundle this file so that makeinfo finds it in out-of-source-tree builds.
BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI)


+ 10
- 2
doc/guix.texi View File

@@ -6218,13 +6218,21 @@ to create a new configuration which has the same values as the old
configuration, but with a few modifications.

The configuration for a typical ``desktop'' usage, with the X11 display
server, a desktop environment, network management, power management, and
more, would look like this:
server, GNOME and Xfce (users can choose which of these desktop
environments to use at the log-in screen by pressing @kbd{F1}), network
management, power management, and more, would look like this:

@lisp
@include os-config-desktop.texi
@end lisp

A graphical environment with a choice of lightweight window managers
instead of full-blown desktop environments would look like this:

@lisp
@include os-config-lightweight-desktop.texi
@end lisp

@xref{Desktop Services}, for the exact list of services provided by
@var{%desktop-services}. @xref{X.509 Certificates}, for background
information about the @code{nss-certs} package that is used here.


+ 11
- 9
gnu/system/examples/desktop.tmpl View File

@@ -1,9 +1,9 @@
;; This is an operating system configuration template
;; for a "desktop" setup with X11.
;; for a "desktop" setup with GNOME and Xfce.

(use-modules (gnu) (gnu system nss))
(use-service-modules desktop)
(use-package-modules xfce ratpoison certs)
(use-package-modules certs)

(operating-system
(host-name "antelope")
@@ -29,15 +29,17 @@
(home-directory "/home/bob"))
%base-user-accounts))

;; 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
nss-certs ;for HTTPS access
;; This is where we specify system-wide packages.
(packages (cons* nss-certs ;for HTTPS access
%base-packages))

;; Use the "desktop" services, which include the X11
;; log-in service, networking with Wicd, and more.
(services %desktop-services)
;; 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 Wicd,
;; and more.
(services (cons* (gnome-desktop-service)
(xfce-desktop-service)
%desktop-services))

;; Allow resolution of '.local' host names with mDNS.
(name-service-switch %mdns-host-lookup-nss))

+ 45
- 0
gnu/system/examples/lightweight-desktop.tmpl View File

@@ -0,0 +1,45 @@
;; 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 wm ratpoison certs)

(operating-system
(host-name "antelope")
(timezone "Europe/Paris")
(locale "en_US.UTF-8")

;; Assuming /dev/sdX is the target hard disk, and "my-root"
;; is the label of the target root file system.
(bootloader (grub-configuration (device "/dev/sdX")))

(file-systems (cons (file-system
(device "my-root")
(title 'label)
(mount-point "/")
(type "ext4"))
%base-file-systems))

(users (cons (user-account
(name "alice")
(comment "Bob's brother")
(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 xmonad ;window managers
nss-certs ;for HTTPS access
%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))

+ 4
- 2
gnu/system/install.scm View File

@@ -215,9 +215,11 @@ the user's target storage device rather than on the RAM disk."
(string-append #$output "/"
target)))
'(#$(file "bare-bones.tmpl")
#$(file "desktop.tmpl"))
#$(file "desktop.tmpl")
#$(file "lightweight-desktop.tmpl"))
'("bare-bones.scm"
"desktop.scm"))
"desktop.scm"
"lightweight-desktop.scm"))
#t)
#:modules '((guix build utils))))



Loading…
Cancel
Save