X-Loop: help-debbugs@HIDDEN
Subject: [bug#75279] [PATCH] system: examples: Add wlgreet-sway.tmpl
Resent-From: Homo <gay@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 02 Jan 2025 06:51:02 +0000
Resent-Message-ID: <handler.75279.B.173580065930981 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 75279
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 75279 <at> debbugs.gnu.org, leo@HIDDEN
Cc: Homo <gay@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN, leo@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.173580065930981
(code B ref -1); Thu, 02 Jan 2025 06:51:02 +0000
Received: (at submit) by debbugs.gnu.org; 2 Jan 2025 06:50:59 +0000
Received: from localhost ([127.0.0.1]:42502 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tTF2o-00083d-Rg
for submit <at> debbugs.gnu.org; Thu, 02 Jan 2025 01:50:59 -0500
Received: from lists.gnu.org ([2001:470:142::17]:44348)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <gay@HIDDEN>) id 1tTF2m-00083K-52
for submit <at> debbugs.gnu.org; Thu, 02 Jan 2025 01:50:57 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <gay@HIDDEN>) id 1tTF2g-0001Ce-K7
for guix-patches@HIDDEN; Thu, 02 Jan 2025 01:50:50 -0500
Received: from layka.disroot.org ([178.21.23.139])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <gay@HIDDEN>) id 1tTF2e-0005Sw-DC
for guix-patches@HIDDEN; Thu, 02 Jan 2025 01:50:50 -0500
Received: from mail01.disroot.lan (localhost [127.0.0.1])
by disroot.org (Postfix) with ESMTP id 4F8B825C00;
Thu, 2 Jan 2025 07:50:44 +0100 (CET)
X-Virus-Scanned: SPAM Filter at disroot.org
Received: from layka.disroot.org ([127.0.0.1])
by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP
id bNhG_ek7sdSI; Thu, 2 Jan 2025 07:50:40 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail;
t=1735800640; bh=wOMu8WpgjZjm7wVRn87p2UQik9GWY3aHRmKRylDdpaA=;
h=From:To:Cc:Subject:Date;
b=VthQqYalFqf9Cy05H5wpN+8W716XtorxyK0NvT/tDXWNeM+HOMymveEkWpwanVM1L
Gej8YcR0hXbmXgpGfArGO8mNLiYl6rC3JA7TUybHjFiyaDDu++kRCk3CQt+AH6yZS2
AbRwsRn+MlWx7z0dMOgTCSqCzFPalaf1w+jeUovgT1sQDaBPEBu/DFCMeGQmdo1jvE
/I4Y3+EjI0Vk+k3X6qpzLWvBT/fyJDddXXZs+fDWKveyGuYxChMVpmYDx3jqmks3eo
zKue3tqNuWWwrsLOvx9WV5JEIEfN2NPCPI74rs/xOsL/YZ6xy4kwL3+7aG6H2XiLty
eOqbTiIvhp1QA==
From: Homo <gay@HIDDEN>
Date: Thu, 2 Jan 2025 08:47:33 +0200
Message-ID: <20250102064732.3882-2-gay@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=178.21.23.139; envelope-from=gay@HIDDEN;
helo=layka.disroot.org
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
This provides proper testing for Wayland both on x86_64
and non-x86_64 hardware.
* gnu/system/examples/wlgreet-sway.tmpl: New file.
* Makefile.am (EXAMPLES): Add it.
Change-Id: I87c50ec17cf67b0cc1e741247151b3e67db8de97
---
Hi, this is slightly modified version of my /etc/config.scm
Looking at those examples again, desktop.tmpl provides
Wayland only on x86_64 in desktop.tmpl.
Makefile.am | 3 +-
gnu/system/examples/wlgreet-sway.tmpl | 97 +++++++++++++++++++++++++++
2 files changed, 99 insertions(+), 1 deletion(-)
create mode 100644 gnu/system/examples/wlgreet-sway.tmpl
diff --git a/Makefile.am b/Makefile.am
index 908c48b4ef..485a92f172 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,7 +489,8 @@ EXAMPLES = \
gnu/system/examples/plasma.tmpl \
gnu/system/examples/raspberry-pi-64.tmpl \
gnu/system/examples/raspberry-pi-64-nfs-root.tmpl \
- gnu/system/examples/vm-image.tmpl
+ gnu/system/examples/vm-image.tmpl \
+ gnu/system/examples/wlgreet-sway.tmpl
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go $(dist_noinst_DATA:%.scm=%.go)
diff --git a/gnu/system/examples/wlgreet-sway.tmpl b/gnu/system/examples/wlgreet-sway.tmpl
new file mode 100644
index 0000000000..f226bf3f5a
--- /dev/null
+++ b/gnu/system/examples/wlgreet-sway.tmpl
@@ -0,0 +1,97 @@
+;; -*- mode: scheme; -*-
+;; This is an operating system configuration template
+;; for a "desktop" setup with wlgreet and Sway where the
+;; root partition is encrypted with LUKS.
+
+;; For better experience you should edit home config
+;; and add (service home-sway-service-type).
+
+;; Indicate which modules to import to access the variables
+;; used in this configuration.
+(use-modules (gnu) (srfi srfi-1))
+(use-package-modules terminals wm)
+(use-service-modules base desktop networking sddm sound xorg)
+
+(operating-system
+ (locale "fi_FI.utf8")
+ (timezone "Europe/Helsinki")
+ (keyboard-layout (keyboard-layout "fi"))
+ (host-name "giksi")
+ (kernel-arguments
+ (cons*
+ "modprobe.blacklist=amdgpu,hci,i915,iwlwifi,nouveau,radeon,xe"
+ %default-kernel-arguments))
+
+ ;; The list of user accounts ('root' is implicit).
+ (users (cons* (user-account
+ (name "homo")
+ (comment "Homo")
+ (group "users")
+ (home-directory "/home/homo")
+ (supplementary-groups '("wheel")))
+ %base-user-accounts))
+
+ ;; Add some packages for default Sway configuration.
+ ;; Press Super+Enter to get default terminal foot.
+ (packages (cons* foot
+ swaybg
+ swayidle
+ swaylock
+ %base-packages))
+
+ ;; Below is the list of system services. To search for available
+ ;; services, run 'guix system search KEYWORD' in a terminal.
+ (services
+ (cons*
+ (service greetd-service-type
+ (greetd-configuration
+ (greeter-supplementary-groups '("video"))
+ (terminals
+ (list
+ (greetd-terminal-configuration
+ (default-session-command
+ (greetd-wlgreet-sway-session
+ (wlgreet-session
+ (greetd-wlgreet-session
+ (extra-env '(("XKB_DEFAULT_LAYOUT" . "fi")))))))
+ (terminal-switch #t)
+ (terminal-vt "1"))))))
+ (service screen-locker-service-type
+ (screen-locker-configuration
+ (name "swaylock")
+ (program (file-append swaylock "/bin/swaylock"))
+ (using-pam? #t)
+ (using-setuid? #f)))
+ (remove (lambda (service)
+ (let ((type (service-kind service)))
+ (or (memq type
+ (list console-font-service-type
+ gdm-service-type
+ sddm-service-type
+ login-service-type
+ mingetty-service-type
+ screen-locker-service-type)))))
+ %desktop-services)))
+ (bootloader (bootloader-configuration
+ (bootloader grub-efi-bootloader)
+ (targets (list "/boot/efi"))
+ (keyboard-layout keyboard-layout)))
+ (mapped-devices (list (mapped-device
+ (source (uuid
+ "18178f67-2e23-4dbb-b05f-57108075a66d"))
+ (target "cryptroot")
+ (type luks-device-mapping))))
+
+ ;; The list of file systems that get "mounted". The unique
+ ;; file system identifiers there ("UUIDs") can be obtained
+ ;; by running 'blkid' in a terminal.
+ (file-systems (cons* (file-system
+ (mount-point "/boot/efi")
+ (device (uuid "8A19-4286"
+ 'fat32))
+ (type "vfat"))
+ (file-system
+ (mount-point "/")
+ (device "/dev/mapper/cryptroot")
+ (type "ext4")
+ (dependencies mapped-devices)) %base-file-systems)))
--
2.47.1
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Homo <gay@HIDDEN> Subject: bug#75279: Acknowledgement ([PATCH] system: examples: Add wlgreet-sway.tmpl) Message-ID: <handler.75279.B.173580065930981.ack <at> debbugs.gnu.org> References: <20250102064732.3882-2-gay@HIDDEN> X-Gnu-PR-Message: ack 75279 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75279 <at> debbugs.gnu.org Date: Thu, 02 Jan 2025 06:51:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 75279 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 75279: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75279 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.