From patchwork Wed Jan 8 17:47:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 36767 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C64B327BBEA; Wed, 8 Jan 2025 17:48:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F218E27BBE2 for ; Wed, 8 Jan 2025 17:48:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVaAB-0007qH-VD; Wed, 08 Jan 2025 12:48:16 -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 1tVa9z-0007pT-LI for guix-patches@gnu.org; Wed, 08 Jan 2025 12:48: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 1tVa9y-0004Dk-UJ; Wed, 08 Jan 2025 12:48:02 -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=Q0GMR7FJ0W65aRfyUYg/IAX6WzEgHOQxH0HmJ0475gk=; b=QtJOGHsAolgSWE8nOaGfRp0qGIRjPEaq+DOcq9fsk7mFowUc31PWocqn2QUV71+AGEEAYIAokApFQcI100KcxPIjk4jLJxsof1m8atWD2SMu2nyLCjSSPJyomau/m5NqJWEvrihShA8EGmKoexlFO1gnu16ylP5kqpe2wSNfN9mQVDlXUky0pHtmaVckwMigipqdkHUgxGtB+Vk627pk2Zhs8y+axWy1zN0GwhJgGDoRbVhsssgwWW6fx8kjqM+HrmOA7o3s3x5r1zHueSEx0+AMpZ1ksCOdnoTiFrRFVTwnCGJkf8oqjOAMbw8Uh+p8tyRhUX0IXMmNxVirHJOQuA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVa9y-0008SB-GA; Wed, 08 Jan 2025 12:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75270] [PATCH v3 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: Wed, 08 Jan 2025 17:48:02 +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.173635848232487 (code B ref 75270); Wed, 08 Jan 2025 17:48:02 +0000 Received: (at 75270) by debbugs.gnu.org; 8 Jan 2025 17:48:02 +0000 Received: from localhost ([127.0.0.1]:48868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVa9w-0008Rh-41 for submit@debbugs.gnu.org; Wed, 08 Jan 2025 12:48:01 -0500 Received: from nomad-cl1.muradm.net ([139.162.159.157]:52338) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tVa9p-0008Qy-MA for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 12:47:58 -0500 Received: from localhost ([127.0.0.1]:35460) 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 1tVa5w-0004PZ-1p for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 17:43:52 +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=Q0GMR7FJ0W65aRfyUYg/IAX6WzEgHOQxH0HmJ0475gk=; b=XSsOsMsRyFUegz99Row0LO6gfd XaEQ/1aMzyaYSJRYFVsRzs9cBREpyUPQg8EQsnY44diAGL55muaJApHcBMBqs6K3ommvj9DvM9OxR cTW1FOwWUorvcWkpA59eaLphHNrjhlDjoKFbVOUnvTU9REIrt6UZ7N+J1F/872+nZVUxjMKkVZeST gUzpV3+uq90lmclz1IvdaPnsN2T1qP/Hhwj7pn+TBsEVC3UKf0umtTOXCvxVYQ+rTN4BABA43EiEv 4MbVn7CZ1A6/9HkxGKRCQg7wSD6WW20d90as5bvKCz+d86qVke6YdC/QlVxCSaxJLDIoe6ZIK4Gs8 CxcrKTKL+shFQnrMZRELj5iYMY7hRIky/esABg/qqGlJGno1yTuA6IrCwjYFCNA+Nwv9HSp40Sa8U jhaYfzwL0DzLHmP6WZyMrxiZoT+Zv9GjSMwe2gxmIi8thu7B04AGq8E29+5o1PKbcv+1gtf6fQBiE rJo7HArOaGsaB5kFWA+kvGeS; Received: from muradm by localhost with local (Exim 4.98) (envelope-from ) id 1tVa9j-000000001m6-00BE for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 20:47:47 +0300 From: muradm Date: Wed, 8 Jan 2025 20:47:41 +0300 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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: I823b5075a5a7b2db49add1128b6e6e4eb64fcfd8 --- doc/guix.texi | 115 +++++++++++------ gnu/services/base.scm | 278 +++++++++++++++++++++++------------------- gnu/tests/desktop.scm | 14 ++- 3 files changed, 242 insertions(+), 165 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index caebe3b03c..ba7b1761c3 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..b6d5e104a2 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,182 @@ (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" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + + (let* ((username (getenv "USER")) + (user (getpwnam username)) + (useruid (passwd:uid user)) + (usergid (passwd:gid user)) + (useruid-s (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-home-dir "/" log-file))) + (for-each (lambda (d) (mkdir-p d) (chown d useruid usergid) (chmod d #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 +3636,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 +3687,9 @@ (define (greetd-pam-service config) (list optional-pam-mount)))) pam)))))) +(define (greetd-run-user-activation config) + #~(let ((d "/run/user")) (mkdir d #o755) (chmod d #o755))) + (define (greetd-shepherd-services config) (map (lambda (tc) @@ -3694,6 +3721,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") From patchwork Wed Jan 8 17:47:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 36768 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5147C27BBE2; Wed, 8 Jan 2025 17:49:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F3D227BBE9 for ; Wed, 8 Jan 2025 17:49:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVaAy-0007zs-SW; Wed, 08 Jan 2025 12:49:04 -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 1tVaAw-0007zR-Hu for guix-patches@gnu.org; Wed, 08 Jan 2025 12:49:03 -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 1tVaAw-0004LE-9P for guix-patches@gnu.org; Wed, 08 Jan 2025 12:49:02 -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=c3oE+5l1lqAHoaGW0VMm2imjKlEQkhq9te5Ukm/h4n4=; b=vAg1xAs1rMqCiTgiHYu2nO27BRBrBHgP+mE/AWdfP0rajc7bu6TLi6ROhIsNx6c3YNcXG/VHFK9NdEOlzRFbRKFDy6v9KQS5ISndyE+xmFvuX/4rYGx77V54czO4yld7+s0pm0+MY4nmkVrBLzoxWCix0O1yRm58eDhEH+WivztvE+J9uAUdgEOg3LDZALg3d8NiBfMWrV5HGv0txN8hB3sVB0MYO283dkgKVQtcyQ/pEz58gXWZaR8WiWJ4hRwj1mFjo2qJsqAvLxk+iFiY1NPlphelK/NYRCUkCAU/izrxYV7kdPnLWewdClvFJyHxBBkTMHipSkTf6yzkR4GgkQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVaAw-0008U4-2q; Wed, 08 Jan 2025 12:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75270] [PATCH v3 2/3] gnu: Add gtkgreet. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 08 Jan 2025 17:49:02 +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: Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 75270-submit@debbugs.gnu.org id=B75270.173635848632526 (code B ref 75270); Wed, 08 Jan 2025 17:49:02 +0000 Received: (at 75270) by debbugs.gnu.org; 8 Jan 2025 17:48:06 +0000 Received: from localhost ([127.0.0.1]:48874 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVaA1-0008SW-VS for submit@debbugs.gnu.org; Wed, 08 Jan 2025 12:48:06 -0500 Received: from nomad-cl1.muradm.net ([139.162.159.157]:52342) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tVa9q-0008Qz-DO for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 12:47:59 -0500 Received: from localhost ([127.0.0.1]:35472) 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 1tVa5x-0004Pc-1u for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 17:43:53 +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=c3oE+5l1lqAHoaGW0VMm2imjKlEQkhq9te5Ukm/h4n4=; b=ScViH3A6tX3neFOJJqvfaTeXYC tgGWdPNg5TWmd3UBfRYNM5OK06NRFJaG4wqEFcqtnZ4S7q4M4w7j/53TAJTNJ+aIPI6pF7O1m9idy 3IY0Hww/RtgYWeABVPGbsaZYfF9tmgzcV4JLQ05v8098zAX44L0lAOmUc7KG9mcBUUO4lgX2V90rk MK6g2Yzj7v0TyGigmJOtyGDvEY88B9oNsvP/rPs6ppyE9Hj9sw9mt9XGZ6Ie3HevQ3hSRMUkEV/eL n8rdJAdMy8Ou0EqloWZrNSpXE0qsVQsWCHwMDrErY8h8RrwfAE7109oh+whuuJLWQ8To5vRgtGEF1 jLuFM18Ct2sWvN/sy0nrTwVKlJiTTqjes3FQrSkRL47C617S7afA5qAzBuyzYfysSS6eLGspLZlME dSx/Dn1i2tTC1bOdqgfvuSVlwoPfdWizphl2jFZORDMqotlSpo+DqdIeaiytQfO66mOsyXP2ML5QE TLCs3uDBoEpBAtFukbCEtFyr; Received: from muradm by localhost with local (Exim 4.98) (envelope-from ) id 1tVa9k-000000001mU-03Ni for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 20:47:48 +0300 From: muradm Date: Wed, 8 Jan 2025 20:47:42 +0300 Message-ID: <695487839ec4cb22a445379c109ee1682deea9ad.1736358380.git.mail@muradm.net> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/admin.scm (gtkgreet): New variable. (gtkgreet-adwaita-dark): New variable. Change-Id: Ib0159b4a993113560f641b4877b826ff337e5c93 --- gnu/packages/admin.scm | 43 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 466df65dd9..42efdb1562 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2021 WinterHound ;;; Copyright © 2021 Brice Waegeneire ;;; Copyright © 2021 Maxime Devos -;;; Copyright © 2021 muradm +;;; Copyright © 2021, 2025 muradm ;;; Copyright © 2021 pineapples ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021-2024 Artyom V. Poptsov @@ -5831,6 +5831,47 @@ (define-public wlgreet on a GUI toolkit.") (license license:gpl3)))) +(define-public gtkgreet + (package + (name "gtkgreet") + (version "0.8") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://git.sr.ht/~kennylevinsen/gtkgreet") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bqxz39lc8vh6bkirvrbn2lgf1qz5b04lfwgp5xa1ki1bnm5i80q")))) + (build-system meson-build-system) + (native-inputs (list pkg-config scdoc)) + (inputs (list gtk+ gtk-layer-shell json-c)) + (synopsis "GTK based greeter for greetd") + (description + "GTK based greeter for greetd, to be run under cage or similar.") + (home-page "https://git.sr.ht/~kennylevinsen/gtkgreet") + (license license:gpl3+))) + +(define-public gtkgreet-adwaita-dark + (package + (inherit gtkgreet) + (name "gtkgreet-adwaita-dark") + (arguments + (list + #:phases + #~(modify-phases + %standard-phases + (add-after 'install 'wrap-gtkgreet-for-theme + (lambda _ + (wrap-program + (string-append #$output "/bin/gtkgreet") + '("GTK_THEME" "" = ("Adwaita:dark")))))))) + (inputs (modify-inputs + (package-inputs gtkgreet) + (prepend gnome-themes-extra))))) + (define-public libseat (package (name "libseat") From patchwork Wed Jan 8 17:47:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: muradm X-Patchwork-Id: 36769 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F3F727BBEA; Wed, 8 Jan 2025 17:49:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 712B127BBE2 for ; Wed, 8 Jan 2025 17:49:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tVaB1-00080D-Ab; Wed, 08 Jan 2025 12:49:08 -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 1tVaAw-0007zS-VW for guix-patches@gnu.org; Wed, 08 Jan 2025 12:49:03 -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 1tVaAw-0004LL-My; Wed, 08 Jan 2025 12:49:02 -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=R9px4pc3nM/7AAyoepLQ+R+E1pygKu0wNzqjHEzT+s8=; b=hpZlWYRXeRebrYJkzESIhP6PpejZjUfX58Oe4ayjV66QBlJWmyg0wlm1l96wAbhG+sptz2tKnyInwhufYuGGg4yk9p871kk7TGbPKbmtimgzKUPlH8f/KJZMSL/K1xiKHDpPT6QntsK4+YkUU1vgtqMVYut+5GPL1CHa1oQl8gcEKj4Yv4Gv66AbLCulJakBPzYLabWg/F6pTuWYQapDDFFcEtaEBJ1exmpajR35hAZmzEzvDyeH8P0mFvTRwi5FUu9OV7SasNcEdoI7WdeLEhIKs/WNM7eDxNgAEAR87LhS1TCgogmakNjnweh/nHRoufHU21tQzQsLeqOVeiO64w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tVaAw-0008UD-Hw; Wed, 08 Jan 2025 12:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75270] [PATCH v3 3/3] services: greetd: Add new gtkgreet greeter. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 08 Jan 2025 17:49:02 +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.173635848732532 (code B ref 75270); Wed, 08 Jan 2025 17:49:02 +0000 Received: (at 75270) by debbugs.gnu.org; 8 Jan 2025 17:48:07 +0000 Received: from localhost ([127.0.0.1]:48876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tVaA2-0008SZ-MU for submit@debbugs.gnu.org; Wed, 08 Jan 2025 12:48:07 -0500 Received: from nomad-cl1.muradm.net ([139.162.159.157]:52354) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tVa9r-0008R1-1v for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 12:48:00 -0500 Received: from localhost ([127.0.0.1]:35482) 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 1tVa5y-0004Pf-10 for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 17:43:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=muradm.net; s=mail; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: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=R9px4pc3nM/7AAyoepLQ+R+E1pygKu0wNzqjHEzT+s8=; b=FyHPeavoNgpBRr6BMweZhAHhkV CBeeyWc/PHVH0yExooBhk2Yhr1nkV7H/D60PQdNKJ0ICq9Jf4RJVdzEUVsMDVIDxqM11wXSQcIE03 WArxYJuMi2nCSVN8oovudaY43AXYm4vq7D3dCA1Cw4/P/eRyb0kBJrPhvk74ThiiC0z8RAF/cs6nd Z2Wu7RxXc+Y6C0i0OAMZ7MMMoGaeashBkCNUW58KDVt26DrIZfjwaS3DbW9z5SuUWZIwJM167nAjB +iDYspSDcH21hOwdh+klMqOtfyEMJ/90tFz/OeZx5CzF3O3jamVVWXqf5FuzZ8iMystLWZROaN9wV /cUatrOnmFQ+dULdDf9PUdIKxb9MPTaFqmYOTNzMSkofxipauG2s5VWU8/HGGRn8z7mkSQ2H6GhWr 7WbSezDr9DXCO3lXLBnKyu2t9Y1DDeV56OWYTaxHvWHYD4hWq/GhhtQpWPmusLgOiuHNveV3FJb12 Tgx0pHVf4CRzoq9fRW/TQFhj; Received: from muradm by localhost with local (Exim 4.98) (envelope-from ) id 1tVa9k-000000001mn-38Ty for 75270@debbugs.gnu.org; Wed, 08 Jan 2025 20:47:48 +0300 From: muradm Date: Wed, 8 Jan 2025 20:47:43 +0300 Message-ID: <07537fc2b7e7c5c2c9220d88ace006e4ca140962.1736358380.git.mail@muradm.net> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/services/base.scm (): New record, represents `gtkgreet` greeter session configuration. * doc/guix.texi (Base Services): Document new `gtkgreet` greeter. Change-Id: Idb226862bb0fc57404ebb8bd46e2192d7d4e57c6 --- doc/guix.texi | 48 +++++++++++++++++++++++++++++++++++++++++-- gnu/services/base.scm | 33 +++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ba7b1761c3..28f94901ab 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20592,8 +20592,9 @@ Base Services The user to use for running the greeter. @item @code{default-session-command} (default: @code{(greetd-agreety-session)}) -Can be either @code{greetd-agreety-session}, @code{greetd-wlgreet-sway-session} or -@code{gexp->script} like object to use as greeter. +Can be either @code{greetd-agreety-session}, @code{greetd-wlgreet-sway-session}, +@code{greetd-gtkgreet-sway-session} or @code{gexp->script} like object to use +as greeter. @end table @end deftp @@ -20730,6 +20731,49 @@ Base Services @end lisp @end deftp +@deftp {Data Type} greetd-gtkgreet-sway-session +Configuration record for the gtkgreet greetd greeter. Can be used as +following: + +@lisp + (greetd-configuration + ;; Graphical greeter require additional group membership. + (greeter-supplementary-groups (list "video" "input" "seat")) + (terminals + (list (greetd-terminal-configuration + (terminal-vt "1") + (terminal-switch #t) + (default-session-command + (greetd-gtkgreet-sway-session + ;; optionally use Adwaita:dark configured version + (gtkgreet gtkgreet-adwaita-dark) + (command + (greetd-user-session + ;; signal to our .bashrc that we want wayland compositor + (xdg-session-type "wayland"))))))))) +@end lisp + +@table @asis +@item @code{sway} (default: @code{sway}) +The package with @command{/bin/sway} and @command{/bin/swaymsg} commands. + +@item @code{sway-config} (default: @code{(plain-file "greetd-gtkgreet-sway-config" "")}) +Extra configuration for sway to be included before executing greeter. + +@item @code{gtkgreet} (default: @code{gtkgreet}) +The package with @command{/bin/gtkgreet} command. + +@item @code{gtkgreet-style} (default: @code{(plain-file "greetd-gtkgreet-sway-gtkgreet-style.css" "")}) +Extra CSS stylesheet to customize GTK look. + +@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 +@end deftp + @node Scheduled Job Execution @subsection Scheduled Job Execution diff --git a/gnu/services/base.scm b/gnu/services/base.scm index b6d5e104a2..58f233770e 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -279,6 +279,7 @@ (define-module (gnu services base) greetd-wlgreet-color greetd-wlgreet-configuration greetd-wlgreet-sway-session + greetd-gtkgreet-sway-session %base-services)) @@ -3560,6 +3561,38 @@ (define-gexp-compiler (greetd-wlgreet-sway-session-compiler sway (make-greetd-wlgreet-sway-session-sway-config session))))) +(define-record-type* + greetd-gtkgreet-sway-session make-greetd-gtkgreet-sway-session + greetd-gtkgreet-sway-session? + (sway greetd-gtkgreet-sway-session-sway (default sway)) + (sway-config greetd-wlgreet-sway-session-sway-config + (default (plain-file "greetd-gtkgreet-sway-config" ""))) + (gtkgreet greetd-gtkgreet-sway-session-gtkgreet (default gtkgreet)) + (gtkgreet-style greetd-gtkgreet-sway-session-gtkgreet-style + (default (plain-file "greetd-gtkgreet-sway-gtkgreet-style.css" ""))) + (command greetd-gtkgreet-sway-session-command (default (greetd-user-session)))) + +(define make-greetd-gtkgreet-sway-session-sway-config + (match-lambda + (($ sway sway-config gtkgreet gtkgreet-style command) + (let ((gtkgreet-bin (file-append gtkgreet "/bin/gtkgreet")) + (swaymsg-bin (file-append sway "/bin/swaymsg"))) + (mixed-text-file + "gtkgreet-sway-config" + "include " sway-config "\n" + "xwayland disable\n" + "exec \"" gtkgreet-bin " -l -s " gtkgreet-style " -c " command "; " swaymsg-bin " exit\"\n"))))) + +(define-gexp-compiler (greetd-gtkgreet-sway-session-compiler + (session ) + system target) + (match-record session + (sway) + (lower-object + (make-greetd-sway-greeter-command + sway + (make-greetd-gtkgreet-sway-session-sway-config session))))) + (define-record-type* greetd-terminal-configuration make-greetd-terminal-configuration greetd-terminal-configuration?