From 09014b57fddace0c3faec3e4276e1e6671a85799 Mon Sep 17 00:00:00 2001
From: Fredrik Salomonsson <plattfot@posteo.net>
Date: Sat, 25 Oct 2025 17:09:19 -0700
Subject: [PATCH] installer: Add Sway as an option in the Desktop environment
 page.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/installer/services.scm (%system-services): desktop-environment for sway
and its minimal companion packages.
* gnu/tests/install.scm (installation-target-desktop-os-for-gui-tests): Add
sway and its companion packages to operating-system packages.

Change-Id: I22f4cb67752ce1a15009680a1ba081fae129d45a
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/installer/services.scm | 6 ++++++
 gnu/tests/install.scm      | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm
index fe5d7998dda2ad63abbb44794dfc46a97bb6df68..c460539212a2e227234199e11cd60f6d5f17c91b 100644
--- a/gnu/installer/services.scm
+++ b/gnu/installer/services.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2023 Denys Nykula <vegan@libre.net.ua>
 ;;; Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2025 Fredrik Salomonsson <plattfot@posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -107,6 +108,11 @@
       (packages '((specification->package "emacs")
                   (specification->package "emacs-exwm")
                   (specification->package "emacs-desktop-environment"))))
+     (desktop-environment
+      (name "Sway")
+      (packages (map (lambda (package)
+                       `(specification->package ,package))
+                     '("sway" "wmenu" "foot"))))
 
      ;; Networking.
      (system-service
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index ab290e1658273328ea4eca53d845139f415769f7..1bf7ebcb80c7e91479b4ae906b8773c07641be38 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -46,6 +46,7 @@
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages ratpoison)
   #:use-module (gnu packages suckless)
+  #:use-module (gnu packages terminals)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages wm)
   #:use-module (gnu packages xorg)
@@ -2061,7 +2062,8 @@ build (current-guix) and then store a couple of full system images.")
     (packages (append
                (list icewm openbox awesome i3-wm i3status
                      dmenu st ratpoison xterm
-                     emacs emacs-exwm emacs-desktop-environment)
+                     emacs emacs-exwm emacs-desktop-environment
+                     sway wmenu foot)
                %base-packages))
     (services
      (append