tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: %desktop-services: Switch to GDM on 64-bit systems.

Browse Source 
* gnu/services/desktop.scm
(desktop-services-for-system): Use gdm on all 64-bit systems.

* gnu/services/xorg.scm (set-xorg-configuration): Adapt to
desktop-services-for-system change.

* gnu/system/examples/desktop.tmpl: Determine the support of Gnome by checking
for supported package.

Fixes: #5388
Change-Id: I0d512a7c31188cea0335e66f00a6d65ae59d09a4
Signed-off-by: Rutherther <rutherther@ditigal.xyz>
This commit is contained in:
Rutherther
2026-01-17 12:28:34 +01:00
parent 010af50497
commit 6d4cb99a15
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,8 @@
;; for a "desktop" setup with GNOME and Xfce where the
;; root partition is encrypted with LUKS, and a swap file.
(use-modules (gnu) (gnu system nss) (guix utils))
(use-modules (gnu) (gnu system nss) (guix utils)
(guix packages))
(use-service-modules desktop sddm xorg)
(use-package-modules gnome)
@@ -73,7 +74,10 @@
;; by clicking the gear. Use the "desktop" services, which
;; include the X11 log-in service, networking with
;; NetworkManager, and more.
(services (if (target-x86-64?)
(services (if (supported-package? gnome
(or (and=> (%current-target-system)
gnu-triplet->nix-system)
(%current-system)))
(append (list (service gnome-desktop-service-type)
(service xfce-desktop-service-type)
(set-xorg-configuration
@@ -81,16 +85,14 @@
(keyboard-layout keyboard-layout))))
%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.
;; FIXME: Since Gnome depends on Rust and Rust is currently
;; unavailable on some platforms, we use MATE here instead of
;; GNOME.
(append (list (service mate-desktop-service-type)
(service xfce-desktop-service-type)
(set-xorg-configuration
(xorg-configuration
(keyboard-layout keyboard-layout))
sddm-service-type))
(keyboard-layout keyboard-layout))))
%desktop-services)))
;; Allow resolution of '.local' host names with mDNS.