From a8d30738262dbfa0af9bbf912f6a828b91ef2d1c Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Wed, 24 Aug 2022 09:48:04 +0200 Subject: [PATCH] Plasma build --- gnu/system/examples/desktop.tmpl | 36 +++++++++++--------------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl index 6c4f737c47c..46c6d403b5e 100644 --- a/gnu/system/examples/desktop.tmpl +++ b/gnu/system/examples/desktop.tmpl @@ -17,9 +17,9 @@ ;; Use the UEFI variant of GRUB with the EFI System ;; Partition mounted on /boot/efi. - (bootloader (bootloader-configuration + (bootloader (bootloader-configuration (bootloader grub-efi-bootloader) - (targets '("/boot/efi")) + (targets '()) (keyboard-layout keyboard-layout))) ;; Specify a mapped device for the encrypted root partition. @@ -44,8 +44,8 @@ ;; Specify a swap file for the system, which resides on the ;; root file system. - (swap-devices (list (swap-space - (target "/swapfile")))) +; (swap-devices (list (swap-space +; (target "/swapfile")))) ;; Create user `bob' with `alice' as its initial password. (users (cons (user-account @@ -74,26 +74,14 @@ ;; 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?) - (append (list (service gnome-desktop-service-type) - (service plasma-desktop-service-type) - (service xfce-desktop-service-type) - (set-xorg-configuration - (xorg-configuration - (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. - (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))) + (services + (append (list + (service sddm-service-type + (sddm-configuration + (display-server "wayland"))) + (service elogind-service-type) + (service plasma-desktop-service-type)) + %base-services)) ;; Allow resolution of '.local' host names with mDNS. (name-service-switch %mdns-host-lookup-nss))