me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Ricardo Wurmus 2022-01-05 21:46:41 +01:00
parent f831bb75f1
commit 0fea9aec59
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/system/examples/desktop.tmpl
View File

@ -2,8 +2,8 @@
;; for a "desktop" setup with GNOME and Xfce where the ;; for a "desktop" setup with GNOME and Xfce where the
;; root partition is encrypted with LUKS, and a swap file. ;; root partition is encrypted with LUKS, and a swap file.
(use-modules (gnu) (gnu system nss)) (use-modules (gnu) (gnu system nss) (guix utils))
(use-service-modules desktop xorg) (use-service-modules desktop sddm xorg)
(use-package-modules certs gnome) (use-package-modules certs gnome)
(operating-system (operating-system
@ -74,12 +74,25 @@
;; by clicking the gear. Use the "desktop" services, which ;; by clicking the gear. Use the "desktop" services, which
;; include the X11 log-in service, networking with ;; include the X11 log-in service, networking with
;; NetworkManager, and more. ;; NetworkManager, and more.
(services (append (list (service gnome-desktop-service-type) (services (if (target-x86-64?)
(append (list (service gnome-desktop-service-type)
(service xfce-desktop-service-type) (service xfce-desktop-service-type)
(set-xorg-configuration (set-xorg-configuration
(xorg-configuration (xorg-configuration
(keyboard-layout keyboard-layout)))) (keyboard-layout keyboard-layout))))
%desktop-services)) %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. ;; Allow resolution of '.local' host names with mDNS.
(name-service-switch %mdns-host-lookup-nss)) (name-service-switch %mdns-host-lookup-nss))