diff options
| author | Fredrik Salomonsson <plattfot@posteo.net> | 2025-10-25 17:09:19 -0700 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-11-04 17:49:29 +0100 |
| commit | 09014b57fddace0c3faec3e4276e1e6671a85799 (patch) | |
| tree | 555183a78265b9eaedca981acf1613cdec1d93c3 /gnu | |
| parent | 3b9d0e0e5c79c836a2063eb216c020ec4f7c5593 (diff) | |
installer: Add Sway as an option in the Desktop environment page.
* 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>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/installer/services.scm | 6 | ||||
| -rw-r--r-- | gnu/tests/install.scm | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index fe5d7998dda..c460539212a 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | ;;; Copyright © 2021 Leo Famulari <leo@famulari.name> | 6 | ;;; Copyright © 2021 Leo Famulari <leo@famulari.name> |
| 7 | ;;; Copyright © 2023 Denys Nykula <vegan@libre.net.ua> | 7 | ;;; Copyright © 2023 Denys Nykula <vegan@libre.net.ua> |
| 8 | ;;; Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de> | 8 | ;;; Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de> |
| 9 | ;;; Copyright © 2025 Fredrik Salomonsson <plattfot@posteo.net> | ||
| 9 | ;;; | 10 | ;;; |
| 10 | ;;; This file is part of GNU Guix. | 11 | ;;; This file is part of GNU Guix. |
| 11 | ;;; | 12 | ;;; |
| @@ -107,6 +108,11 @@ | |||
| 107 | (packages '((specification->package "emacs") | 108 | (packages '((specification->package "emacs") |
| 108 | (specification->package "emacs-exwm") | 109 | (specification->package "emacs-exwm") |
| 109 | (specification->package "emacs-desktop-environment")))) | 110 | (specification->package "emacs-desktop-environment")))) |
| 111 | (desktop-environment | ||
| 112 | (name "Sway") | ||
| 113 | (packages (map (lambda (package) | ||
| 114 | `(specification->package ,package)) | ||
| 115 | '("sway" "wmenu" "foot")))) | ||
| 110 | 116 | ||
| 111 | ;; Networking. | 117 | ;; Networking. |
| 112 | (system-service | 118 | (system-service |
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index ab290e16582..1bf7ebcb80c 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #:use-module (gnu packages package-management) | 46 | #:use-module (gnu packages package-management) |
| 47 | #:use-module (gnu packages ratpoison) | 47 | #:use-module (gnu packages ratpoison) |
| 48 | #:use-module (gnu packages suckless) | 48 | #:use-module (gnu packages suckless) |
| 49 | #:use-module (gnu packages terminals) | ||
| 49 | #:use-module (gnu packages virtualization) | 50 | #:use-module (gnu packages virtualization) |
| 50 | #:use-module (gnu packages wm) | 51 | #:use-module (gnu packages wm) |
| 51 | #:use-module (gnu packages xorg) | 52 | #:use-module (gnu packages xorg) |
| @@ -2061,7 +2062,8 @@ build (current-guix) and then store a couple of full system images.") | |||
| 2061 | (packages (append | 2062 | (packages (append |
| 2062 | (list icewm openbox awesome i3-wm i3status | 2063 | (list icewm openbox awesome i3-wm i3status |
| 2063 | dmenu st ratpoison xterm | 2064 | dmenu st ratpoison xterm |
| 2064 | emacs emacs-exwm emacs-desktop-environment) | 2065 | emacs emacs-exwm emacs-desktop-environment |
| 2066 | sway wmenu foot) | ||
| 2065 | %base-packages)) | 2067 | %base-packages)) |
| 2066 | (services | 2068 | (services |
| 2067 | (append | 2069 | (append |
