From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 KNXEC/xoeWcnqAAA62LTzQ:P1 (envelope-from ) for ; Sat, 04 Jan 2025 16:59:40 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id KNXEC/xoeWcnqAAA62LTzQ (envelope-from ) for ; Sat, 04 Jan 2025 17:59:40 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g6HNeTNk; dkim=fail ("headers rsa verify failed") header.d=muradm.net header.s=mail header.b=Dp42CnRx; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=muradm.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1736009979; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=3lUi2ynPu5QXQ3s4H1qRhTvl6Kc7fHfP4eHI+Ira3EI=; b=sqAbPu2D/xiV2X7ESaGJKVW65JG5klT6nBbpOEuw18EihMgxKi/JuaonSETWRml1sFMeCC fTopuDa+fzlCjbwjFdOB3k6Trd2hIuHpDNDrsWvBNafK3psYi70vjDY8oqlgVDu7d+lTWZ yyA3t/NhAjrqLeKVLU0NztNGoqDW98P1mTVdF7CvPXGGhSkjR/LFoMKPvauC+fK67+NYL6 di3eozpoCtoX3VNdyBGT5aCvQ1Ak2qYwrSsF4/g69DuIWmn/sxab+VqcKkRj+XY1IKWJEu ASwBwU34nzCHdf+RDXBi2vWjPQ+8+0X3WHAIib5SY4pUA3n8qf3gAaQlHjbLQw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=g6HNeTNk; dkim=fail ("headers rsa verify failed") header.d=muradm.net header.s=mail header.b=Dp42CnRx; 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=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=muradm.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1736009979; a=rsa-sha256; cv=none; b=mpWUgknK4gcdIHNbJtU8slGAY/CwaXsbuQxt2s3N/CLXJbPvWNTjinYsCXYynZqUTyqUnt hSmwIVathVfqLGQHPN+xMcRLoEh1NeVzS2o5hoQyvJ9MKUX/EKLLF9E7YsCmkEbGNFmCOz 2vuTV57Hgc+4DHgwquBDFtMMfprwkfo5jSyM+RLrl/ZJDLTmWIYwVKsO9M9kMx6uo8tNf7 AdLRJpWTS0HVmN248Ln01YaCZf5DVPw726T3H63t2PIyeth+81tW1QhcROk5WpYm6SFboL Q1X1gY3A0OyqzYUoB85ur//SewNJis2fXo7vv+ypcXKcXzrcffgubmHTLUlEww== 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 F26C0180DC for ; Sat, 04 Jan 2025 17:59:38 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tU7UQ-0001dj-4p; Sat, 04 Jan 2025 11:59:06 -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 1tU7UO-0001dG-HV for guix-patches@gnu.org; Sat, 04 Jan 2025 11:59: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 1tU7UO-0006N5-8o; Sat, 04 Jan 2025 11:59:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=3lUi2ynPu5QXQ3s4H1qRhTvl6Kc7fHfP4eHI+Ira3EI=; b=g6HNeTNkuP/W0rOXILW6gCTa3pHDa6nX6VWxZFF5nj44xCNdIUlfvSqXjaL/2OoUYvYSZ90LJ2OhWISUw5oAF7O0Z7lpVbi/OfCqDSUi/fSoZrp8vSayeieVWhlJUAEp+OmSf7BzEf2QTaDDIjQoDzgHCkmIfH+JZ+jV7ONWPH+5pUTMpPA7HcG+ezDhoaQmXQzFoqVl94C4F9+KdfEivs9zrePQsNgpVcWxGak6GfErr/VptEl6dx7GNX89+BvCHJYiKvlpyJ9bPIRahA8tu3x1vopqCMuNduVJHoLQW7c0oHKxBEy+1ylB98G+EM4wIY9doXYfrMcvBWhGwVkaNA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tU7UO-00021Y-2Q; Sat, 04 Jan 2025 11:59:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75270] [PATCH v2 1/3] services: greetd: Improve greeter configurations. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 04 Jan 2025 16:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75270 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75270@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 75270-submit@debbugs.gnu.org id=B75270.17360099407745 (code B ref 75270); Sat, 04 Jan 2025 16:59:04 +0000 Received: (at 75270) by debbugs.gnu.org; 4 Jan 2025 16:59:00 +0000 Received: from localhost ([127.0.0.1]:56929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tU7UI-00020p-Lj for submit@debbugs.gnu.org; Sat, 04 Jan 2025 11:59:00 -0500 Received: from nomad-cl1.muradm.net ([139.162.159.157]:52320) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tU7UC-0001zt-Eh for 75270@debbugs.gnu.org; Sat, 04 Jan 2025 11:58:56 -0500 Received: from localhost ([127.0.0.1]:54834) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.1) (envelope-from ) id 1tU7QO-0001uo-1G for 75270@debbugs.gnu.org; Sat, 04 Jan 2025 16:54:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=3lUi2ynPu5QXQ3s4H1qRhTvl6Kc7fHfP4eHI+Ira3EI=; b=Dp42CnRx3vrDw19zGkDSvgndeB 4y+p8NBZ8JkEIC/wR0PNjakytQDl6RPRIfSZX9xX0IlN7G1repZ2SGfluZgIHWGSOG1tQho7i97Xf S/+SNngtIr92ltdpaqNUpBK9lm+A7EMA6QjLSHlbUsXBBslGFhccOTH0aEMppKzalDcltFcisMcFV Q/w80IJP+nL3SJY32ihBD61qJR+LyAZKdUISdyGRwXWBSaZ9oa0PKn2uWivM5EIqJpBn4ENBSUvtK ok5ZbBiKkDEwjp+RMUc3KlMu/pL5i+CRfsHeyFfjVoV2oz3Hf3iJeRKJt+IDnhdn9gQZw4/HCw+ap pljhA20A7pKL+FLapPItrhlaGihf8r31YJUKet6h/7fb4+wiWWxsW95nuYU6owHDdk8vC0C5IzBAU unxTKGw7DBmFb52JJzBpZhf0I363BYxhpL9b3DJdFXwc+i+mL2Y8SpUhXFL+gdpbc3o2dGxes1PQ4 Wok6vlno1R8WqcjLcpaHlPhd; Received: from muradm by localhost with local (Exim 4.98) (envelope-from ) id 1tU7U6-000000003Uv-00r0 for 75270@debbugs.gnu.org; Sat, 04 Jan 2025 19:58:46 +0300 From: muradm Date: Sat, 4 Jan 2025 19:58:41 +0300 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , 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.85 X-Spam-Score: -0.85 X-Migadu-Queue-Id: F26C0180DC X-TUID: zxqlWkOGQdRI This improvement focuses on providing common user session scripts for use by multiple greeters. Now user session entry point is factored out into ``, which can be reused as is with different greeters. By default it uses `bash` as first user process. Then user normally starts additional programs with `.profile` or `.bashrc`. Using `command`, `command-args` and `extra-env` one can specify something else, which could be `dbus-session` wrapped process, some desktop environment or else. While its above is possible, one is still encouraged to use `.bashrc`, `.profile` or similar. It also fixes incorrect use of `XDG_RUNTIME_DIR` for `wlgreet`. `wlgreet` requires compositor to run. We provide common sway based greeter script, which can be shared by other graphical greeters. * gnu/services/base.scm (): Common user session factored-out, for shared use by multiple greeters. (): Switch to common user session. (): New record, `wlgreet` color holder. (): Refactor `wlgreet` configuration. (): Switch to common user session. * gnu/tests/desktop.scm (%minimal-services): Reflect configuration changes. * doc/guix.texi (Base Services): Document refactoring changes. Change-Id: Id957801bd67d24281bea6b3c554a8853f7cb55e3 --- doc/guix.texi | 115 ++++++++++++------ gnu/services/base.scm | 276 +++++++++++++++++++++++------------------- gnu/tests/desktop.scm | 14 ++- 3 files changed, 240 insertions(+), 165 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 924f13f0f6..6d0c349b1a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20510,13 +20510,21 @@ Base Services (terminal-vt "2") (default-session-command (greetd-agreety-session - (extra-env '(("MY_VAR" . "1"))) - (xdg-env? #f)))) + (command + (greetd-user-session + (extra-env '(("MY_VAR" . "1"))) + (xdg-env? #f)))))) ;; we can use different shell instead of default bash (greetd-terminal-configuration (terminal-vt "3") (default-session-command - (greetd-agreety-session (command (file-append zsh "/bin/zsh"))))) + (greetd-agreety-session + (command + (greetd-user-session + (command (file-append zsh "/bin/zsh")) + (command-args '()) + (extra-env '(("MY_VAR" . "1"))) + (xdg-env? #f)))))) ;; we can use any other executable command as greeter (greetd-terminal-configuration (terminal-vt "4") @@ -20584,19 +20592,20 @@ Base Services The user to use for running the greeter. @item @code{default-session-command} (default: @code{(greetd-agreety-session)}) -Can be either instance of @code{greetd-agreety-session} configuration or +Can be either @code{greetd-agreety-session}, @code{greetd-wlgreet-sway-session} or @code{gexp->script} like object to use as greeter. @end table @end deftp -@deftp {Data Type} greetd-agreety-session -Configuration record for the agreety greetd greeter. +@deftp {Data Type} greetd-user-session +Configuration record for the user session command. Greeters require user command +to be specified in some or another way. @code{greetd-user-session} provides a +common command for that. User should prefer stable shell command like @code{bash}, +which can start actual user terminal shell, window manager or desktop environment +with its own mechanism, which would be @code{~/.bashrc} in case of @code{bash}. @table @asis -@item @code{agreety} (default: @code{greetd}) -The package with @command{/bin/agreety} command. - @item @code{command} (default: @code{(file-append bash "/bin/bash")}) Command to be started by @command{/bin/agreety} on successful login. @@ -20606,6 +20615,10 @@ Base Services @item @code{extra-env} (default: @code{'()}) Extra environment variables to set on login. +@item @code{xdg-session-type} (default: @code{"tty"}) +Specify the value of @code{XDG_SESSION_TYPE}. User environment may +adapt depending on its value (normaly by @code{.bashrc} or similar). + @item @code{xdg-env?} (default: @code{#t}) If true @code{XDG_RUNTIME_DIR} and @code{XDG_SESSION_TYPE} will be set before starting command. One should note that, @code{extra-env} variables @@ -20614,60 +20627,86 @@ Base Services @end table @end deftp -@deftp {Data Type} greetd-wlgreet-session -Generic configuration record for the wlgreet greetd greeter. +@deftp {Data Type} greetd-agreety-session +Configuration record for the agreety greetd greeter. @table @asis -@item @code{wlgreet} (default: @code{wlgreet}) -The package with the @command{/bin/wlgreet} command. +@item @code{agreety} (default: @code{greetd}) +The package with @command{/bin/agreety} command. -@item @code{command} (default: @code{(file-append sway "/bin/sway")}) -Command to be started by @command{/bin/wlgreet} on successful login. +@item @code{command} (default: @code{(greetd-user-session)}) +Command to be started by @command{/bin/agreety} on successful login. +Normally should be a variation of @code{greetd-user-session}, but could +be any @code{gexp->script} like object. -@item @code{command-args} (default: @code{'()}) -Command arguments to pass to command. +@end table +@end deftp + +@deftp {Data Type} greetd-wlgreet-color + +@table @asis +@item @code{red} +Value of red. + +@item @code{green} +Value of green. + +@item @code{blue} +Value of blue. + +@item @code{opacity} +Value of opacity. + +@end table +@end deftp + +@deftp {Data Type} greetd-wlgreet-configuration +@table @asis @item @code{output-mode} (default: @code{"all"}) Option to use for @code{outputMode} in the TOML configuration file. @item @code{scale} (default: @code{1}) Option to use for @code{scale} in the TOML configuration file. -@item @code{background} (default: @code{'(0 0 0 0.9)}) +@item @code{background} (default: @code{(greetd-wlgreet-color (red 0) (green 0) (blue 0) (opacity 0.9))}) RGBA list to use as the background colour of the login prompt. -@item @code{headline} (default: @code{'(1 1 1 1)}) +@item @code{headline} (default: @code{(greetd-wlgreet-color (red 1) (green 1) (blue 1) (opacity 1))}) RGBA list to use as the headline colour of the UI popup. -@item @code{prompt} (default: @code{'(1 1 1 1)}) +@item @code{prompt} (default: @code{(greetd-wlgreet-color (red 1) (green 1) (blue 1) (opacity 1))}) RGBA list to use as the prompt colour of the UI popup. -@item @code{prompt-error} (default: @code{'(1 1 1 1)}) +@item @code{prompt-error} (default: @code{(greetd-wlgreet-color (red 1) (green 1) (blue 1) (opacity 1))}) RGBA list to use as the error colour of the UI popup. -@item @code{border} (default: @code{'(1 1 1 1)}) +@item @code{border} (default: @code{(greetd-wlgreet-color (red 1) (green 1) (blue 1) (opacity 1))}) RGBA list to use as the border colour of the UI popup. -@item @code{extra-env} (default: @code{'()}) -Extra environment variables to set on login. - @end table @end deftp @deftp {Data Type} greetd-wlgreet-sway-session -Sway-specific configuration record for the wlgreet greetd greeter. +Configuration record for the in sway wlgreet greetd greeter. @table @asis -@item @code{wlgreet-session} (default: @code{(greetd-wlgreet-session)}) -A @code{greetd-wlgreet-session} record for generic wlgreet configuration, -on top of the Sway-specific @code{greetd-wlgreet-sway-session}. - @item @code{sway} (default: @code{sway}) -The package providing the @command{/bin/sway} command. +The package with @command{/bin/sway} and @command{/bin/swaymsg} commands. -@item @code{sway-configuration} (default: #f) -File-like object providing an additional Sway configuration file to be -prepended to the mandatory part of the configuration. +@item @code{sway-config} (default: @code{(plain-file "greetd-wlgreet-sway-config" "")}) +Extra configuration for sway to be included before executing greeter. + +@item @code{wlgreet} (default: @code{wlgreet}) +The package with the @command{/bin/wlgreet} command. + +@item @code{wlgreet-config} (default: @code{(greetd-wlgreet-configuration)}) +Configuration of @code{wlgreet} represented by @code{greetd-wlgreet-configuration}. + +@item @code{command} (default: @code{(greetd-user-session)}) +Command to be started by @command{/bin/agreety} on successful login. +Normally should be a variation of @code{greetd-user-session}, but could +be any @code{gexp->script} like object. @end table @@ -20675,8 +20714,7 @@ Base Services @lisp (greetd-configuration - ;; We need to give the greeter user these permissions, otherwise - ;; Sway will crash on launch. + ;; Graphical greeter require additional group membership. (greeter-supplementary-groups (list "video" "input" "seat")) (terminals (list (greetd-terminal-configuration @@ -20685,7 +20723,10 @@ Base Services (default-session-command (greetd-wlgreet-sway-session (sway-configuration - (local-file "sway-greetd.conf")))))))) + (local-file "sway-greetd.conf")) ;; optional extra sway configuration + (command + (greetd-user-session + (xdg-session-type "wayland"))))))))) @end lisp @end deftp diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 75ce4e8fe5..4105da6c05 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Hui Lu ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer -;;; Copyright © 2021 muradm +;;; Copyright © 2021, 2025 muradm ;;; Copyright © 2022 Guillaume Le Vaillant ;;; Copyright © 2022 Justin Veilleux ;;; Copyright © 2022 ( @@ -274,8 +274,10 @@ (define-module (gnu services base) greetd-service-type greetd-configuration greetd-terminal-configuration + greetd-user-session greetd-agreety-session - greetd-wlgreet-session + greetd-wlgreet-color + greetd-wlgreet-configuration greetd-wlgreet-sway-session %base-services)) @@ -3381,161 +3383,177 @@ (define %qemu-static-networking ;;; greetd-service-type -- minimal and flexible login manager daemon ;;; -(define-record-type* - greetd-agreety-session make-greetd-agreety-session - greetd-agreety-session? - (agreety greetd-agreety (default greetd)) - (command greetd-agreety-command (default (file-append bash "/bin/bash"))) - (command-args greetd-agreety-command-args (default '("-l"))) - (extra-env greetd-agreety-extra-env (default '())) - (xdg-env? greetd-agreety-xdg-env? (default #t))) - -(define (greetd-agreety-tty-session-command config) - (match-record config +(define-record-type* + greetd-user-session make-greetd-user-session + greetd-user-session? + (command greetd-user-session-command (default (file-append bash "/bin/bash"))) + (command-args greetd-user-session-command-args (default '("-l"))) + (extra-env greetd-user-session-extra-env (default '())) + (xdg-session-type greetd-user-session-xdg-session-type (default "tty")) + (xdg-env? greetd-user-session-xdg-env? (default #t))) + +(define (make-greetd-user-session-command config) + (match-record config (command command-args extra-env) (program-file - "agreety-tty-session-command" + "greetd-user-session-command" #~(begin (use-modules (ice-9 match)) (for-each (match-lambda ((var . val) (setenv var val))) (quote (#$@extra-env))) (apply execl #$command #$command (list #$@command-args)))))) -(define (greetd-agreety-tty-xdg-session-command config) - (match-record config - (command command-args extra-env) +(define (make-greetd-xdg-user-session-command config) + (match-record config + (command command-args extra-env xdg-session-type) (program-file - "agreety-tty-xdg-session-command" + "greetd-xdg-user-session-command" #~(begin (use-modules (ice-9 match)) (let* ((username (getenv "USER")) (useruid (passwd:uid (getpwuid username))) (useruid (number->string useruid))) - (setenv "XDG_SESSION_TYPE" "tty") + (setenv "XDG_SESSION_TYPE" #$xdg-session-type) (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid))) (for-each (match-lambda ((var . val) (setenv var val))) (quote (#$@extra-env))) (apply execl #$command #$command (list #$@command-args)))))) +(define-gexp-compiler (greetd-user-session-compiler + (session ) + system target) + (lower-object + ((if (greetd-user-session-xdg-env? session) + make-greetd-xdg-user-session-command + make-greetd-user-session-command) session))) + +(define-record-type* + greetd-agreety-session make-greetd-agreety-session + greetd-agreety-session? + (agreety greetd-agreety (default greetd)) + (command greetd-agreety-command (default (greetd-user-session)))) + (define-gexp-compiler (greetd-agreety-session-compiler (session ) system target) - (let ((agreety (file-append (greetd-agreety session) - "/bin/agreety")) - (command ((if (greetd-agreety-xdg-env? session) - greetd-agreety-tty-xdg-session-command - greetd-agreety-tty-session-command) - session))) + (let ((agreety (file-append (greetd-agreety session) "/bin/agreety")) + (command (greetd-agreety-command session))) (lower-object - (program-file "agreety-command" - #~(execl #$agreety #$agreety "-c" #$command))))) - -(define-record-type* - greetd-wlgreet-session make-greetd-wlgreet-session - greetd-wlgreet-session? - (wlgreet greetd-wlgreet (default wlgreet)) - (command greetd-wlgreet-command - (default (file-append sway "/bin/sway"))) - (command-args greetd-wlgreet-command-args (default '())) - (output-mode greetd-wlgreet-output-mode (default "all")) - (scale greetd-wlgreet-scale (default 1)) - (background greetd-wlgreet-background (default '(0 0 0 0.9))) - (headline greetd-wlgreet-headline (default '(1 1 1 1))) - (prompt greetd-wlgreet-prompt (default '(1 1 1 1))) - (prompt-error greetd-wlgreet-prompt-error (default '(1 1 1 1))) - (border greetd-wlgreet-border (default '(1 1 1 1))) - (extra-env greetd-wlgreet-extra-env (default '()))) - -(define (greetd-wlgreet-wayland-session-command session) - (program-file "wlgreet-session-command" - #~(let* ((username (getenv "USER")) - (useruid (number->string - (passwd:uid (getpwuid username)))) - (command #$(greetd-wlgreet-command session))) - (use-modules (ice-9 match)) - (setenv "XDG_SESSION_TYPE" "wayland") - (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) - (for-each (lambda (env) (setenv (car env) (cdr env))) - '(#$@(greetd-wlgreet-extra-env session))) - (apply execl command command - (list #$@(greetd-wlgreet-command-args session)))))) - -(define (make-wlgreet-config-color section-name color) - (match color - ((red green blue opacity) - (string-append - "[" section-name "]\n" - "red = " (number->string red) "\n" - "green = " (number->string green) "\n" - "blue = " (number->string blue) "\n" - "opacity = " (number->string opacity) "\n")))) - -(define (make-wlgreet-configuration-file session) - (let ((command (greetd-wlgreet-wayland-session-command session)) - (output-mode (greetd-wlgreet-output-mode session)) - (scale (greetd-wlgreet-scale session)) - (background (greetd-wlgreet-background session)) - (headline (greetd-wlgreet-headline session)) - (prompt (greetd-wlgreet-prompt session)) - (prompt-error (greetd-wlgreet-prompt-error session)) - (border (greetd-wlgreet-border session))) - (mixed-text-file "wlgreet.toml" - "command = \"" command "\"\n" - "outputMode = \"" output-mode "\"\n" - "scale = " (number->string scale) "\n" - (apply string-append - (map (match-lambda - ((section-name . color) - (make-wlgreet-config-color section-name color))) - `(("background" . ,background) - ("headline" . ,headline) - ("prompt" . ,prompt) - ("prompt-error" . ,prompt-error) - ("border" . ,border))))))) + (program-file "agreety-wrapper" #~(execl #$agreety #$agreety "-c" #$command))))) + +(define (make-greetd-sway-greeter-command sway sway-config) + (let ((sway-bin (file-append sway "/bin/sway"))) + (program-file + "greeter-sway-command" + #~(begin + (let* ((username (getenv "USER")) + (useruid (passwd:uid (getpwuid username))) + (useruid (number->string useruid)) + ;; /run/user/ won't exist yet + ;; this will contain WAYLAND_DISPLAY socket file + ;; and log-file below + (user-home-dir "/tmp/.greeter-home") + (user-xdg-runtime-dir (string-append user-home-dir "/run")) + (user-xdg-cache-dir (string-append user-home-dir "/cache")) + (log-file (string-append (number->string (getpid)) ".log")) + (log-file (string-append user-xdg-runtime-dir "/" log-file))) + (for-each (lambda (dir) (mkdir dir #o700)) + (list user-home-dir + user-xdg-runtime-dir + user-xdg-cache-dir)) + (setenv "HOME" user-home-dir) + (setenv "XDG_CACHE_DIR" user-xdg-cache-dir) + (setenv "XDG_RUNTIME_DIR" user-xdg-runtime-dir) + (sleep 1) ;; give time to elogind or seatd + (dup2 (open-fdes log-file (logior O_CREAT O_WRONLY O_APPEND) #o640) 1) + (dup2 1 2) + (execl #$sway-bin #$sway-bin "-d" "-c" #$sway-config)))))) + +(define-record-type* + greetd-wlgreet-color make-greetd-wlgreet-color greetd-wlgreet-color? + (red greetd-wlgreet-color-red) + (green greetd-wlgreet-color-green) + (blue greetd-wlgreet-color-blue) + (opacity greetd-wlgreet-color-opacity)) + +(define (greetd-wlgreet-color-for-section section-name color) + (match-record color + (red green blue opacity) + (string-append + "[" section-name "]\n" + "red = " (number->string red) "\n" + "green = " (number->string green) "\n" + "blue = " (number->string blue) "\n" + "opacity = " (number->string opacity) "\n"))) + +(define-record-type* + greetd-wlgreet-configuration make-greetd-wlgreet-configuration + greetd-wlgreet-configuration? + (output-mode greetd-wlgreet-configuration-output-mode (default "all")) + (scale greetd-wlgreet-configuration-scale (default 1)) + (background greetd-wlgreet-configuration-background + (default (greetd-wlgreet-color (red 0) (green 0) (blue 0) (opacity 0.9)))) + (headline greetd-wlgreet-configuration-headline + (default (greetd-wlgreet-color (red 1) (green 1) (blue 1) (opacity 1)))) + (prompt greetd-wlgreet-configuration-prompt + (default (greetd-wlgreet-color (red 1) (green 1) (blue 1) (opacity 1)))) + (prompt-error greetd-wlgreet-configuration-prompt-error + (default (greetd-wlgreet-color (red 1) (green 1) (blue 1) (opacity 1)))) + (border greetd-wlgreet-configuration-border + (default (greetd-wlgreet-color (red 1) (green 1) (blue 1) (opacity 1))))) + +(define (make-greetd-wlgreet-config command color) + (match-record color + (output-mode scale background headline prompt prompt-error border) + (mixed-text-file + "wlgreet.toml" + "command = \"" command "\"\n" + "outputMode = \"" output-mode "\"\n" + "scale = " (number->string scale) "\n" + (apply string-append + (map (match-lambda + ((section-name . color) + (greetd-wlgreet-color-for-section section-name color))) + `(("background" . ,background) + ("headline" . ,headline) + ("prompt" . ,prompt) + ("prompt-error" . ,prompt-error) + ("border" . ,border))))))) (define-record-type* greetd-wlgreet-sway-session make-greetd-wlgreet-sway-session greetd-wlgreet-sway-session? - (wlgreet-session greetd-wlgreet-sway-session-wlgreet-session ; - (default (greetd-wlgreet-session))) - (sway greetd-wlgreet-sway-session-sway (default sway)) ; - (sway-configuration greetd-wlgreet-sway-session-sway-configuration ;file-like - (default (plain-file "wlgreet-sway-config" "")))) - -(define (make-wlgreet-sway-configuration-file session) - (let* ((wlgreet-session (greetd-wlgreet-sway-session-wlgreet-session session)) - (wlgreet-config (make-wlgreet-configuration-file wlgreet-session)) - (wlgreet (file-append (greetd-wlgreet wlgreet-session) "/bin/wlgreet")) - (sway-config (greetd-wlgreet-sway-session-sway-configuration session)) - (swaymsg (file-append (greetd-wlgreet-sway-session-sway session) - "/bin/swaymsg"))) - (mixed-text-file "wlgreet-sway.conf" - "include " sway-config "\n" - "xwayland disable\n" - "exec \"" wlgreet " --config " wlgreet-config "; " - swaymsg " exit\"\n"))) + (sway greetd-wlgreet-sway-session-sway (default sway)) + (sway-config greetd-wlgreet-sway-session-sway-config + (default (plain-file "greetd-wlgreet-sway-config" ""))) + (wlgreet greetd-wlgreet-sway-session-wlgreet (default wlgreet)) + (wlgreet-config greetd-wlgreet-sway-session-wlgreet-config + (default (greetd-wlgreet-configuration))) + (command greetd-wlgreet-sway-session-command (default (greetd-user-session)))) + +(define make-greetd-wlgreet-sway-session-sway-config + (match-lambda + (($ sway sway-config wlgreet wlgreet-config command) + (let ((wlgreet-bin (file-append wlgreet "/bin/wlgreet")) + (wlgreet-config-file + (make-greetd-wlgreet-config command wlgreet-config)) + (swaymsg-bin (file-append sway "/bin/swaymsg"))) + (mixed-text-file + "wlgreet-sway-config" + "include " sway-config "\n" + "xwayland disable\n" + "exec \"" wlgreet-bin " --config " wlgreet-config-file "; " swaymsg-bin " exit\"\n"))))) (define-gexp-compiler (greetd-wlgreet-sway-session-compiler (session ) system target) - (let ((sway (file-append (greetd-wlgreet-sway-session-sway session) - "/bin/sway")) - (config (make-wlgreet-sway-configuration-file session))) + (match-record session + (sway) (lower-object - (program-file "wlgreet-sway-session-command" - #~(let* ((log-file (open-output-file - (string-append "/tmp/sway-greeter." - (number->string (getpid)) - ".log"))) - (username (getenv "USER")) - (useruid (number->string (passwd:uid (getpwuid username))))) - ;; redirect stdout/err to log-file - (dup2 (fileno log-file) 1) - (dup2 1 2) - (sleep 1) ;give seatd/logind some time to start up - (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) - (execl #$sway #$sway "-d" "-c" #$config)))))) + (make-greetd-sway-greeter-command + sway + (make-greetd-wlgreet-sway-session-sway-config session))))) (define-record-type* greetd-terminal-configuration make-greetd-terminal-configuration @@ -3613,7 +3631,8 @@ (define (greetd-accounts config) (name "greeter") (group "greeter") (supplementary-groups (greetd-greeter-supplementary-groups config)) - (system? #t)))) + (system? #t) + (create-home-directory? #f)))) (define (make-greetd-pam-mount-conf-file config) (computed-file @@ -3663,6 +3682,12 @@ (define (greetd-pam-service config) (list optional-pam-mount)))) pam)))))) +(define (greetd-run-user-activation config) + #~(begin + (let ((directory "/run/user")) + (mkdir directory #o755) + (chmod directory #o755)))) + (define (greetd-shepherd-services config) (map (lambda (tc) @@ -3694,6 +3719,7 @@ (define greetd-service-type (list (service-extension account-service-type greetd-accounts) (service-extension file-system-service-type (const %greetd-file-systems)) + (service-extension activation-service-type greetd-run-user-activation) (service-extension etc-service-type greetd-etc-service) (service-extension pam-root-service-type greetd-pam-service) (service-extension shepherd-root-service-type greetd-shepherd-services))) diff --git a/gnu/tests/desktop.scm b/gnu/tests/desktop.scm index ef30442886..1693bbcebf 100644 --- a/gnu/tests/desktop.scm +++ b/gnu/tests/desktop.scm @@ -141,13 +141,21 @@ (define %minimal-services (terminal-vt "2") (default-session-command (greetd-agreety-session - (extra-env '(("MY_VAR" . "1"))) - (xdg-env? #f)))) + (command + (greetd-user-session + (extra-env '(("MY_VAR" . "1"))) + (xdg-env? #f)))))) ;; we can use different shell instead of default bash (greetd-terminal-configuration (terminal-vt "3") (default-session-command - (greetd-agreety-session (command (file-append zsh "/bin/zsh"))))) + (greetd-agreety-session + (command + (greetd-user-session + (command (file-append zsh "/bin/zsh")) + (command-args '()) + (extra-env '(("MY_VAR" . "1"))) + (xdg-env? #f)))))) ;; we can use any other executable command as greeter (greetd-terminal-configuration (terminal-vt "4") -- 2.47.1