summaryrefslogtreecommitdiff
path: root/gnu/system/examples
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2022-01-05 21:46:41 +0100
committerRicardo Wurmus <rekado@elephly.net>2022-01-05 21:46:41 +0100
commit0fea9aec59f8f328c269d585d849a8f954e39aae (patch)
tree8c9119f27e75a7a30439b935f64d01ad6083b99c /gnu/system/examples
parentf831bb75f1128d545f7f08cca96908507901fabc (diff)
doc: Only use GDM and GNOME on x86_64.
* gnu/system/examples/desktop.tmpl: Only use gnome-desktop-service-type and the default login manager in set-xorg-configuration when the target system is x86_64.
Diffstat (limited to 'gnu/system/examples')
-rw-r--r--gnu/system/examples/desktop.tmpl29
1 files changed, 21 insertions, 8 deletions
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index a209fbcb05f..7055a8f92d4 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -2,8 +2,8 @@
2;; for a "desktop" setup with GNOME and Xfce where the 2;; for a "desktop" setup with GNOME and Xfce where the
3;; root partition is encrypted with LUKS, and a swap file. 3;; root partition is encrypted with LUKS, and a swap file.
4 4
5(use-modules (gnu) (gnu system nss)) 5(use-modules (gnu) (gnu system nss) (guix utils))
6(use-service-modules desktop xorg) 6(use-service-modules desktop sddm xorg)
7(use-package-modules certs gnome) 7(use-package-modules certs gnome)
8 8
9(operating-system 9(operating-system
@@ -74,12 +74,25 @@
74 ;; by clicking the gear. Use the "desktop" services, which 74 ;; by clicking the gear. Use the "desktop" services, which
75 ;; include the X11 log-in service, networking with 75 ;; include the X11 log-in service, networking with
76 ;; NetworkManager, and more. 76 ;; NetworkManager, and more.
77 (services (append (list (service gnome-desktop-service-type) 77 (services (if (target-x86-64?)
78 (service xfce-desktop-service-type) 78 (append (list (service gnome-desktop-service-type)
79 (set-xorg-configuration 79 (service xfce-desktop-service-type)
80 (xorg-configuration 80 (set-xorg-configuration
81 (keyboard-layout keyboard-layout)))) 81 (xorg-configuration
82 %desktop-services)) 82 (keyboard-layout keyboard-layout))))
83 %desktop-services)
84
85 ;; FIXME: Since GDM depends on Rust (gdm -> gnome-shell -> gjs
86 ;; -> mozjs -> rust) and Rust is currently unavailable on
87 ;; non-x86_64 platforms, we use SDDM and Mate here instead of
88 ;; GNOME and GDM.
89 (append (list (service mate-desktop-service-type)
90 (service xfce-desktop-service-type)
91 (set-xorg-configuration
92 (xorg-configuration
93 (keyboard-layout keyboard-layout))
94 sddm-service-type))
95 %desktop-services)))
83 96
84 ;; Allow resolution of '.local' host names with mDNS. 97 ;; Allow resolution of '.local' host names with mDNS.
85 (name-service-switch %mdns-host-lookup-nss)) 98 (name-service-switch %mdns-host-lookup-nss))