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 sJSiE0abFWGRKgAAgWs5BA (envelope-from ) for ; Fri, 13 Aug 2021 00:05:58 +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 YOz5DkabFWECZQAAbx9fmQ (envelope-from ) for ; Thu, 12 Aug 2021 22:05:58 +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 BFE422117D for ; Fri, 13 Aug 2021 00:05:57 +0200 (CEST) Received: from localhost ([::1]:44932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mEIpo-0002D0-Dv for larch@yhetil.org; Thu, 12 Aug 2021 18:05:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mEIp1-0000Wl-CF for guix-patches@gnu.org; Thu, 12 Aug 2021 18:05:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56753) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mEIp1-0006AC-3M for guix-patches@gnu.org; Thu, 12 Aug 2021 18:05:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mEIp0-0002wz-T4 for guix-patches@gnu.org; Thu, 12 Aug 2021 18:05:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH v3 06/10] gnu: desktop: Add greetd-service-type Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Aug 2021 22:05:06 +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.162880590411287 (code B ref 49969); Thu, 12 Aug 2021 22:05:06 +0000 Received: (at 49969) by debbugs.gnu.org; 12 Aug 2021 22:05:04 +0000 Received: from localhost ([127.0.0.1]:40058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEIox-0002vn-0d for submit@debbugs.gnu.org; Thu, 12 Aug 2021 18:05:03 -0400 Received: from mail-ej1-f52.google.com ([209.85.218.52]:41616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mEIog-0002tC-Rb for 49969@debbugs.gnu.org; Thu, 12 Aug 2021 18:05:01 -0400 Received: by mail-ej1-f52.google.com with SMTP id d11so14464030eja.8 for <49969@debbugs.gnu.org>; Thu, 12 Aug 2021 15:04:46 -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=2Zn/3A00/43wl0uo5PNfKqQ3QKrkErw0e6iG1A0CZ7w=; b=ZxdxgQYOho5+INrSBZIF31ZjQO+OFsJUCdkcdCS+3tf1anx53LSsNM44pyQEZfVk9x Pzvog2ErPFskFEL2qdowVersnx/rfAmZghGiml8WYT2ZFWkJgNjOJukyPMFML9uWZ2Kb F/Jv7A7SPm3aXAHwETB579YAUnLBn4kKmaxx5k+thPquOuC/th4ZxLwZcXNSZSwakxb2 ZA9PDyW9f5wusMKFV2XA73GEinAAkffDUZYI1VkNnbmocdq0XyA209gl4xtxvV7ldws6 FAMdCnkKKEFYE2p9V6H7oJ5tqgR086cAdTjTpcbxrswWvDl0MrMplMPd2WfB5cAxpKnD aL9w== 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=2Zn/3A00/43wl0uo5PNfKqQ3QKrkErw0e6iG1A0CZ7w=; b=AuwbkkJm3OD0S3mW4l6tUmkcFnVAGbcIU9ZBgl55wsEY6OQl8/hSb9cUiFmMEOtPcT A7PrHoMJ3F+HkuacHwozKeEhsImE0XVVmbl3xThU6Y33n+xB/2wI5yOlCNz/tSPrp/BZ TeM125s8Sm2KPYaggrAF1ViSKaUf1rzed0V7ZgHiUkm+dgrJ8yFrBn+yV8ycv5qP+uXx pLom1sWqT7ePkWBQdBVspEe/3pjngA2IBjYH22nWaI8PXw11na5EHusmYqczjQPDgEW+ mmz02S4QYOhlQhDqaYSkrtPaCTMcj2JxGx6qRyJlLiJoG9zjBLkwh4wZH0Tw9lHhy3lB xmsQ== X-Gm-Message-State: AOAM530qqaY+NpXgveAc4QAPrPOB9YLc0ghycX25Nbkh0vdIRBbt/OQ2 Zz/spmlhfZg222kAmDoI5y/irqYrBn+LIw== X-Google-Smtp-Source: ABdhPJxltSnyafH72NHutIm7KxWkHGS7RAH60U/kAPCRar+VfZ4O17FUcTSj1rj7Qdjbsf8aHq+n/g== X-Received: by 2002:a17:906:3812:: with SMTP id v18mr5696133ejc.399.1628805880976; Thu, 12 Aug 2021 15:04:40 -0700 (PDT) Received: from localhost.localdomain ([5.24.104.153]) by smtp.gmail.com with ESMTPSA id o23sm1750302eds.75.2021.08.12.15.04.39 for <49969@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Aug 2021 15:04:40 -0700 (PDT) From: muradm Date: Fri, 13 Aug 2021 01:04:16 +0300 Message-Id: <20210812220420.24118-7-mail@muradm.net> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210812220022.24025-1-mail@muradm.net> References: <20210812220022.24025-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=1628805957; 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=cjv3V26vn9KRAlwwVNW/5LQaho3VObatlC9oxjNTnRU=; b=XdNUV2O2hz/Uw+6ohP/gOMMl8EN6G1eaK/b52DGciXxxT2dtjrsAhKSfU3pCMUFrgp+Wtm psGmZms8Ip6POjow0IChTUnBXkJ6fwKPrSF2EKw8Aq5nag+wVHUmzrkuC60oAA3MPmBlmt i9Us0ZEtppM1I7BoRC6E4k32Yb/FJP4wkb3x+upxsPqk4E8VvzC62at25oAEKR6CjAIrF0 WNr5Cyw/RvwzXlGmeqkoOJAacC2/67u4fY3/PmosCnLTxqpX+0bqz0UWugKSzXEZomiv49 Wj8RiqoGdSkynhNTMjrjF7zwuqwsVb9olnkulu3YW46X8ky7rsp73RLsZmEyCw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628805957; a=rsa-sha256; cv=none; b=pwZOU7caSYq4iM4Ci8+eOCyGIg+GOhYXMPviEQafFl3BvY/zJrIZXJzKyHTRw2QcfLvKtl 0Pzuh5wT7+PtZl4HhWaQBJ2UdmrWRYh1gCSDcgLqpdS/C4A/3wrwOWvlILyELTegcpyzqX JXii9ds9h1zk3XFxuswsHsEESjpPwnxTim7PDupH+HMiMroLCcCQgh9feXfFQ0p6KZB1/B ghunzYffrIn8irhmOJ947h11I6xObz8YP6lZ4lKhlZeMIaxRfvisPzmceAHN/7u4NEfX/y 6cUkpkUx84YF+aiPqxe2LhiCYHnUZb7DEA+csbHjCexlVKqlvcgl646fDZvh+A== 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=ZxdxgQYO; 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=ZxdxgQYO; 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: BFE422117D X-Spam-Score: 3.59 X-Migadu-Scanner: scn1.migadu.com X-TUID: LVZqnhHiXTws Currently, only agreety configuration is provided. * gnu/services/desktop.scm: Add greetd-service-type --- gnu/services/desktop.scm | 225 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 225 insertions(+) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index a63a2936a7..b7ac08cf20 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) @@ -160,6 +161,12 @@ seatd-configuration seatd-service-type + greetd-configuration + greetd-terminal-configuration + greetd-service-type + greetd-agreety-tty-session + greetd-agreety-tty-xdg-session + %desktop-services)) ;;; Commentary: @@ -1240,6 +1247,224 @@ applications needing access to be root.") (service-extension shepherd-root-service-type 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 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") + (supplementary-groups '("users" "tty" "input" "video" "audio")) + (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 + (documentation "Minimal and flexible login manager daemon") + (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) + (description "Provides necessary infrastructure for logging into the +system including @code{greetd} PAM service, @code{pam-mount} module to +mount/unmount /run/user/ directory for user and @code{greetd} +login manager daemon.") + (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