From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id +M/gH283dmcK1QAAqHPOHw:P1 (envelope-from ) for ; Thu, 02 Jan 2025 06:51:27 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id +M/gH283dmcK1QAAqHPOHw (envelope-from ) for ; Thu, 02 Jan 2025 07:51:27 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=q2NOAfKg; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=VthQqYal; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1735800687; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=CbkLRZjyJdx0kwp1KUvLlYUOds03/6Cw6iFQKJ2OhUM=; b=hJnJTwmuaJHaeCLyHOKjA8phGg0sEOI0zZeVwdVAGckyCGuinun/lWWJ3tRBCTnj0X7P0b bq05sfnHf+3zij6JTy7JIaEv3kZnRQcNKoSs+TyPcvXvXQUGNo6QZkRfnOYQvRR/2AOOEX 4PMLUBpUgSuHd40G+FuNvZl0jmyFlEiFvs4zkmC4ECZB+1m+vgS18ZsYgFAItA9yLAwvXS ziNVMRzcm8yR5d/fdkgOmKwX9seGl26g2v0s3rOL67EPIl5OiiUIefRk2kMoE0gdPOCiDj pDL40Bf2oJ/DhlYj6KRd7nn+dkFPl7tKQKE/GDkSBNeTxjUMktBQ+j0/WWWptg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=q2NOAfKg; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=VthQqYal; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1735800687; a=rsa-sha256; cv=none; b=pG/lfOMyzPcUFVQ3QchZznkWqkfE15/0PWr4dOhnqtb49md9gnGO/Q2hZcp61JO40CC28O gaqZ6kZuiknhPvn5GLOQ5qBzo70fFt0Pi/c73A51kPBXCx7AaXl/jUkHDlWvfYKIT9/8m3 Xklur4dqac/fqJWFOVHqR5rokcnJWqNtcqmu4LIgcfrGeiz2GyOXqmfs0sJqvLLrTDpCC+ xqH6TQIKh6DP3J1dLGdnH5zASgsI+JhFYGGA3+u1BMMzr8lhSzJe1AL3Dg1f2OUX0edOD4 OXenU6VHWpTlFQXCPX3Iy3blQtJ4urGUYIgjapJrJECgXViQ5kfGLI0T6tnoNg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EE2F51D681 for ; Thu, 02 Jan 2025 07:51:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTF2y-0001Di-NO; Thu, 02 Jan 2025 01:51:09 -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 ) id 1tTF2u-0001DP-5U for guix-patches@gnu.org; Thu, 02 Jan 2025 01:51:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tTF2s-0005Vp-B7 for guix-patches@gnu.org; Thu, 02 Jan 2025 01:51:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=CbkLRZjyJdx0kwp1KUvLlYUOds03/6Cw6iFQKJ2OhUM=; b=q2NOAfKgZM3mSHWk2jJiMZyf1vOixA55H/iMII8zqLD62mTu0AFIuRLbvpM9HDTMIKdEqno1ADbxOobNrYeOOfnI2LrIAyZA9Wzs4AhTeg/+sxUMr8NXBdUwUrQLRTO7DhMU5qGq9Tw3CsZ7gYWNZ5MBQYp8DRQH+NIfBR2PIq5oZDDcfv92Xr0H6BqU4bxCfJTEY1MmCHt2Q6+/R56rIxrcoWHsYH7q3SWXeROJpO0IEDFRNCAFy1uCr/iHvPZgDWY2hRwyczyhnKXjG9jE0RLvlPKF0TDHbD8bd7S5mW8VW2Gq3U/5QDer8dgGjbROSt1XY4J2mjBvEvsQflgbyw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tTF2s-00083w-6o for guix-patches@gnu.org; Thu, 02 Jan 2025 01:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75279] [PATCH] system: examples: Add wlgreet-sway.tmpl Resent-From: Homo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 02 Jan 2025 06:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75279 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75279@debbugs.gnu.org, leo@famulari.name Cc: Homo X-Debbugs-Original-To: guix-patches@gnu.org, leo@famulari.name Received: via spool by submit@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 ) id 1tTF2o-00083d-Rg for submit@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 ) id 1tTF2m-00083K-52 for submit@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 ) id 1tTF2g-0001Ce-K7 for guix-patches@gnu.org; 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 ) id 1tTF2e-0005Sw-DC for guix-patches@gnu.org; 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== Date: Thu, 2 Jan 2025 08:47:33 +0200 Message-ID: <20250102064732.3882-2-gay@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=gay@disroot.org; 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Homo X-ACL-Warn: , Homo via Guix-patches From: Homo via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -0.20 X-Spam-Score: -0.20 X-Migadu-Queue-Id: EE2F51D681 X-TUID: iD2pMH9p47oH 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