From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WDtpOv/cEmFtHgEAgWs5BA (envelope-from ) for ; Tue, 10 Aug 2021 22:09:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 6I0cNv/cEmHtJAAAbx9fmQ (envelope-from ) for ; Tue, 10 Aug 2021 20:09:35 +0000 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 A9140E43C for ; Tue, 10 Aug 2021 22:09:35 +0200 (CEST) Received: from localhost ([::1]:53084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDY46-0001Oy-Oi for larch@yhetil.org; Tue, 10 Aug 2021 16:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42542) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDY3d-0000uH-Mc for guix-patches@gnu.org; Tue, 10 Aug 2021 16:09:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mDY3d-0007EV-Fd for guix-patches@gnu.org; Tue, 10 Aug 2021 16:09:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mDY3c-0007CR-GV for guix-patches@gnu.org; Tue, 10 Aug 2021 16:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH v2 6/7] gnu: desktop: Add greetd-service-type Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 10 Aug 2021 20:09:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49969 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49969@debbugs.gnu.org Received: via spool by 49969-submit@debbugs.gnu.org id=B49969.162862612227607 (code B ref 49969); Tue, 10 Aug 2021 20:09:04 +0000 Received: (at 49969) by debbugs.gnu.org; 10 Aug 2021 20:08:42 +0000 Received: from localhost ([127.0.0.1]:60890 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDY3C-0007B5-5j for submit@debbugs.gnu.org; Tue, 10 Aug 2021 16:08:42 -0400 Received: from mail-ed1-f48.google.com ([209.85.208.48]:35341) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mDY2t-00079W-QH for 49969@debbugs.gnu.org; Tue, 10 Aug 2021 16:08:23 -0400 Received: by mail-ed1-f48.google.com with SMTP id cf5so32002032edb.2 for <49969@debbugs.gnu.org>; Tue, 10 Aug 2021 13:08:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=muradm-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=cAWqjx1luy/LK+TvIV8A4Hm5Au/ElAxpxaRdBE/u1pc=; b=0TqpGzujv8FQmG0s003Zq+1rDbGzcqnBbJmMAwR7+goeK93QJsfBNrrhYPvV9v7Gk+ aD+G/yJY3761/yaB5HtAI6SYVawaOYazv6wk39TEEV2YtlieAVFlXtzBQ7RB/CpLaK+I XuF0FJ0Tg5XQ4WSnori7FxAaA+u8Of5YFcgEXWQCTMrH7aPOREuj4PcAeVJtFBQARo7r Cb3qsA+oAZIz1C7WVakpU6vxx99TnafeW7pgn9+FFRD+TfpCkikUu6/TB0HTIKVenv2p hLE84RG8DnHsLXdL/ijTuuFQkDKCJuuCXEETmXbcepHkJDD+jgKv+TBfFSP0mP3lid9R 4bYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cAWqjx1luy/LK+TvIV8A4Hm5Au/ElAxpxaRdBE/u1pc=; b=RRoS3StvQHUiBSzdtotuL1wXp4BRdEwoqChY+V9Yk8DOr31B6z5aPukji5fGjWCbqT 6fRRutzat6B/qmHImxMvX/++j5dW2W9jRgHQyRZrP/o4DIVNOiGNQvqVWEuxbszP8tg+ lc9Zhe+pQMGFV7u7ig1wSzaCIcfrbhe/JtkDd41Tn3zkyVpNodif+Scf7OiILdZmKEo0 LpgKVMPMuwUVyTY+1KRUZFQTTelSgaZiJ6g+C1Y1N0OdABVPZazpi8AE76NgiBBliGoi e3VNSPs2PR/dPtGzEsVUuQQ6xzRZ/GMjcJ5c3WKLQwaEFIO3/5WWkWVshRvpf89ymxgf 8sag== X-Gm-Message-State: AOAM531HPEUNXilRl6F+0fwRxiOcPOaKJU7KnhrFYc28TJWSGbKep69q CrcLfER8bTcGkqPwS9rl08BGIgmggHx1eQ== X-Google-Smtp-Source: ABdhPJz42R/qinbZemqQUC1kxn0L9ZI92y6MqWOkqfeRyyT4+LcZscaCiG5Ey0W6ztSwlc7B+vnEow== X-Received: by 2002:a05:6402:39a:: with SMTP id o26mr4695884edv.64.1628626093759; Tue, 10 Aug 2021 13:08:13 -0700 (PDT) Received: from localhost.localdomain ([31.142.54.188]) by smtp.gmail.com with ESMTPSA id qa34sm7247582ejc.120.2021.08.10.13.08.12 for <49969@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 13:08:13 -0700 (PDT) From: muradm Date: Tue, 10 Aug 2021 23:07:55 +0300 Message-Id: <20210810200756.9581-6-mail@muradm.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810193626.9186-1-mail@muradm.net> References: <20210810193626.9186-1-mail@muradm.net> MIME-Version: 1.0 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628626175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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=bq/1Ayp/ULtlHgnufXRbv7WSX5ONiohERaNcRFYBBfA=; b=sbX3hCZEuxfVC7gDTDwVpth9hguwgn7sX2DrvcPSFEsyq9uVSFEf3W3mqxUBkQvReNVNpt FexdsK4sLfx5h8CDkCQuIKoloUu+epG4jfrMMySkiFdEAp+T6lZbqe8Sg4nkax9/0t5aFQ JfS8rpfQoGO5lsp8u97XSBAMH0AL7PXRmnIxVPdEhxyixvTtZSdxdfkNm7WezOuDpRExGv hZmYmo78rnhWAonTPZd7UXNrFhizhuOX6RwCdaXMrcI9p/+4Lhd48imn35XVOkY2pI17Nm jO0acgObPnrKJYKGz2AHZwqOfG+XovCWiR2AzsvSlciv62mConO2eJkABW5Nrg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628626175; a=rsa-sha256; cv=none; b=hFKXWJlGUp5RkXkJzI12MQSa0eGHtSq1UTaHhAf2cfnk0/EqacQdstzEKzA3SyAHOpnJvG IK4W3SpyXWaZU/GgbetZZAjT9LBvz9iVx+c0DcWzYSsP8KLkfpR+xh9gEhr7T5P5+rPYju kM3jPE6xoYmeuiGGd4kcDd+13C0cH1HkXaJreLXjTjrSlEJcn0KmZHJvJCPGGaH95nk8Mk VfSLLlyAGt9tRL4Ot8OHSlCKNPpvVmxacy9ozbqHykC3sG1G2h7Qxv83LRriMuSULst4K9 67rpbkusX5i5qFmJvG5GY0SyZLKJ+4ZrVJamc49PGN/8soyWgc3DqBNgg3oyOg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=muradm-net.20150623.gappssmtp.com header.s=20150623 header.b=0TqpGzuj; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.59 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=muradm-net.20150623.gappssmtp.com header.s=20150623 header.b=0TqpGzuj; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: A9140E43C X-Spam-Score: 3.59 X-Migadu-Scanner: scn1.migadu.com X-TUID: 6x7PNm9bmaIn greetd is a minimal and flexible login manager daemon that makes no assumptions about what you want to launch. Currently, only agreety configuration is provided. * gnu/services/desktop.scm: Add greetd-service-type --- gnu/services/desktop.scm | 210 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 210 insertions(+) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index bfba9bccec..be6bb0a86f 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -49,6 +49,7 @@ #:use-module (gnu system pam) #:use-module (gnu packages glib) #:use-module (gnu packages admin) + #:use-module (gnu packages bash) #:use-module (gnu packages cups) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gnome) @@ -1239,6 +1240,215 @@ or setting its password with passwd."))) seatd-shepherd-service))) (default-value (seatd-configuration)))) + +;;; +;;; greetd-service-type -- minimal and flexible login manager daemon +;;; + +(define-record-type* + greetd-agreety-session make-greetd-agreety-session + greetd-agreety-session? + (package greetd-agreety-command-package (default bash)) + (command-bin greetd-agreety-command-bin (default "/bin/bash")) + (command-args greetd-agreety-command-args (default '("-l"))) + (extra-env greetd-agreety-extra-env (default '())) + (command-generator greetd-agreety-command-generator)) + +(define greetd-agreety-tty-session-command + (match-lambda + (($ pkg command-bin command-args extra-env) + (program-file + "agreety-tty-session-command" + #~(begin + (use-modules (ice-9 match)) + (let* ((abs-cmd-bin #$(file-append pkg command-bin))) + (for-each + (match-lambda ((var . val) (setenv var val))) + (quote (#$@extra-env))) + (apply execl abs-cmd-bin abs-cmd-bin + (list #$@command-args)))))))) + +(define greetd-agreety-tty-xdg-session-command + (match-lambda + (($ package command-bin command-args extra-env) + (program-file + "agreety-tty-xdg-session-command" + #~(begin + (use-modules (ice-9 popen) (ice-9 rdelim) (ice-9 match)) + (let* + ((username (getenv "USER")) + (useruid (passwd:uid (getpwuid username))) + (useruid (number->string useruid)) + (abs-cmd-bin #$(file-append package command-bin))) + (setenv "XDG_SESSION_TYPE" "tty") + (setenv "XDG_RUNTIME_DIR" (string-append "/run/user/" useruid)) + (for-each + (match-lambda ((var . val) (setenv var val))) + (quote (#$@extra-env))) + (apply execl abs-cmd-bin abs-cmd-bin + (list #$@command-args)))))))) + +(define greetd-agreety-tty-session + (greetd-agreety-session + (command-generator greetd-agreety-tty-session-command))) + +(define greetd-agreety-tty-xdg-session + (greetd-agreety-session + (command-generator greetd-agreety-tty-xdg-session-command))) + +(define-record-type* + greetd-terminal-configuration make-greetd-terminal-configuration + greetd-terminal-configuration? + (greetd greetd-package (default greetd)) + (config-file-name greetd-config-file-name (thunked) + (default (default-config-file-name this-record))) + (terminal-vt greetd-terminal-vt (default "7")) + (default-session-user greetd-default-session-user (default "greeter")) + (default-session-command greetd-default-session-command + (default greetd-agreety-tty-xdg-session))) + +(define (default-config-file-name config) + (string-join (list "config-" (greetd-terminal-vt config) ".toml") "")) + +(define make-greetd-terminal-default-session-command + (match-lambda + (($ greetd _ _ _ default-session-command) + (cond ((greetd-agreety-session? default-session-command) + (let* + ((generator (greetd-agreety-command-generator + default-session-command)) + (command (apply generator (list default-session-command))) + (agreety-bin (file-append greetd "/bin/agreety"))) + (program-file + "agreety-command" + #~(execl #$agreety-bin #$agreety-bin "-c" #$command)))) + (else (program-file "agreety-command-exit" #~(exit #f))))))) + +(define (make-greetd-terminal-configuration-file config) + (let* + ((config-file-name (greetd-config-file-name config)) + (terminal-vt (greetd-terminal-vt config)) + (default-session-user (greetd-default-session-user config)) + (default-session-command (make-greetd-terminal-default-session-command config))) + (mixed-text-file + config-file-name + "[terminal]\n" + "vt = " terminal-vt "\n" + "[default_session]\n" + "user = " default-session-user "\n" + "command = " default-session-command "\n"))) + +(define %default-motd + (plain-file "motd" "This is the GNU operating system, welcome!\n\n")) + +(define %greetd-accounts + (list (user-account (name "greeter") (group "wheel") (system? #t)))) + +(define %greetd-file-systems + (list (file-system + (device "none") + (mount-point "/run/greetd/pam_mount") + (type "tmpfs") + (check? #f) + (flags '(no-suid no-dev no-exec)) + (options "mode=0755") + (create-mount-point? #t)))) + +(define %greetd-pam-mount-rules + `((debug (@ (enable "0"))) + (volume (@ (sgrp "users") + (fstype "tmpfs") + (mountpoint "/run/user/%(USERUID)") + (options "noexec,nosuid,nodev,size=1g,mode=0700,uid=%(USERUID),gid=%(USERGID)"))) + (logout (@ (wait "0") + (hup "0") + (term "yes") + (kill "no"))) + (mkmountpoint (@ (enable "1") (remove "true"))))) + +(define-record-type* + greetd-configuration make-greetd-configuration + greetd-configuration? + (motd greetd-motd (default %default-motd)) + (allow-empty-passwords? greetd-allow-empty-passwords? (default #t)) + (terminals greetd-terminals (default '()))) + +(define (make-greetd-pam-mount-conf-file config) + (computed-file + "greetd_pam_mount.conf.xml" + #~(begin + (use-modules (sxml simple)) + (call-with-output-file #$output + (lambda (port) + (sxml->xml + '(*TOP* + (*PI* xml "version='1.0' encoding='utf-8'") + (pam_mount + #$@%greetd-pam-mount-rules + (pmvarrun + #$(file-append greetd-pam-mount + "/sbin/pmvarrun -u '%(USER)' -o '%(OPERATION)'")))) + port)))))) + +(define (greetd-etc-service config) + `(("security/greetd_pam_mount.conf.xml" + ,(make-greetd-pam-mount-conf-file config)))) + +(define (greetd-pam-service config) + (define optional-pam-mount + (pam-entry + (control "optional") + (module #~(string-append #$greetd-pam-mount "/lib/security/pam_mount.so")))) + + (list + (unix-pam-service "greetd" + #:login-uid? #t + #:allow-empty-passwords? + (greetd-allow-empty-passwords? config) + #:motd + (greetd-motd config)) + (lambda (pam) + (if (member (pam-service-name pam) + '("login" "greetd" "su" "slim" "gdm-password")) + (pam-service + (inherit pam) + (auth (append (pam-service-auth pam) + (list optional-pam-mount))) + (session (append (pam-service-session pam) + (list optional-pam-mount)))) + pam)))) + +(define (greetd-shepherd-services config) + (map + (lambda (tc) + (let* + ((greetd-bin (file-append (greetd-package tc) "/sbin/greetd")) + (greetd-conf (make-greetd-terminal-configuration-file tc)) + (greetd-vt (greetd-terminal-vt tc))) + (shepherd-service + (requirement '(user-processes host-name udev virtual-terminal)) + (provision (list (symbol-append + 'term-tty + (string->symbol (greetd-terminal-vt tc))))) + (start #~(make-forkexec-constructor + (list #$greetd-bin "-c" #$greetd-conf) + #:log-file + (string-append "/tmp/greetd." #$greetd-vt ".log"))) + (stop #~(make-kill-destructor))))) + (greetd-terminals config))) + +(define greetd-service-type + (service-type + (name 'greetd) + (extensions + (list + (service-extension account-service-type (const %greetd-accounts)) + (service-extension file-system-service-type (const %greetd-file-systems)) + (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))) + (default-value (greetd-configuration)))) + ;;; ;;; The default set of desktop services. -- 2.32.0