From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gCcoNb0hQmFGDwEAgWs5BA (envelope-from ) for ; Wed, 15 Sep 2021 18:39:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oFK0ML0hQmGqYAAAbx9fmQ (envelope-from ) for ; Wed, 15 Sep 2021 16:39:25 +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 2EB5C11223 for ; Wed, 15 Sep 2021 18:39:25 +0200 (CEST) Received: from localhost ([::1]:54802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQXwS-0001wM-8E for larch@yhetil.org; Wed, 15 Sep 2021 12:39:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQXoP-0003mT-Ck for guix-patches@gnu.org; Wed, 15 Sep 2021 12:31:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQXoP-0004oy-01 for guix-patches@gnu.org; Wed, 15 Sep 2021 12:31:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQXoO-0003EX-S2 for guix-patches@gnu.org; Wed, 15 Sep 2021 12:31:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH v7 6/7] gnu: desktop: Add seatd-service-type. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Sep 2021 16:31: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.163172343912321 (code B ref 49969); Wed, 15 Sep 2021 16:31:04 +0000 Received: (at 49969) by debbugs.gnu.org; 15 Sep 2021 16:30:39 +0000 Received: from localhost ([127.0.0.1]:53078 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQXny-0003Ca-R5 for submit@debbugs.gnu.org; Wed, 15 Sep 2021 12:30:39 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:58062 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQXnb-0003Aa-Vs for 49969@debbugs.gnu.org; Wed, 15 Sep 2021 12:30:29 -0400 Received: from [176.234.10.27] (port=7704 helo=localhost) by nomad-cl1.muradm.net with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mQXnc-0000NW-74 for 49969@debbugs.gnu.org; Wed, 15 Sep 2021 16:30:16 +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=SVPToCUdzrnTMne3D6z3KrTaW/NQRsYSWbp0tL/TUtA=; b=AYFTfgT8Lz5VzuPbzdkQv5VZFV OvGdPnekqgtjL3u9eC8dsUECShhE14PP0zNGGbWm+fAgCriF/eRkKzndaG+yrkIfX/2xsU2U6Hf2H 7bTHccfvOUN4cKkU3zGG7FrV1xWnc1i3BNF4fKgdDkJ59be9EIWwv3RmG9kPr0/B4qe5ySwxb8zgu wecGgDKqBZNvq1s35Kfw3zdcftZ2LXd4zqDMTz7H9o9UOS0Qid0X3nYUa9mIs9egC1nYo60jilJjL gsZVVtCiTbpV2QPMxbMeLmgyFJc6G3S78f9N90EqCge9AKFDWn7FZNhgweaavAXSwWxnGpD3WkKGc /WcxfjuxLr0cD+g5Nj3zSIBOZfPxi2wCd5L8syK2q/M909UkX9WjkGXoOjY7FLO5CrqY1hN9MC6ez wIWQSYchPI8hS/33t50/WYm3zR5rtORV5OOLBAUaXyhPzyBy9PHvtkiIxJ3meiybndjLxWYPY9bXG pUUlnvL9k+aqVp3BFJdYSoh2; Received: from muradm by localhost with local (Exim 4.94.2) (envelope-from ) id 1mQXnZ-0007Og-Mn for 49969@debbugs.gnu.org; Wed, 15 Sep 2021 19:30:13 +0300 From: muradm Date: Wed, 15 Sep 2021 19:29:57 +0300 Message-Id: <20210915162958.28398-7-mail@muradm.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210915162958.28398-1-mail@muradm.net> References: <20210906152641.11020-1-mail@muradm.net> <20210915162958.28398-1-mail@muradm.net> 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" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1631723965; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=/iM/g+Yk7monyLBZeUejiLF5tSIwmdrIrilZIrYjUTI=; b=iSyJp+Vxs1q8kNI8NaMNDUlhQicN9EvdgjXxFNuNYR6iJ/dyR2aZ0yzWURdchEd7A5lIU+ ky/6S3HtxcraOrOdJ0Nlb4jvIbK8xCd//xp9arr1h1grZkcQnHzbtVEHHnjBIYDbYpoSLU HdLDCfKTmG/FrRxYqRNQK6XzOKlNbKJ+JhRlM6UkIfF3kY9yJFqmipamxVPloM8KSoMEQ7 lonTDgi/s+nZLkhRCtQC+BPwqNMLsEur1z9IffzdjHx4PQdgkXlM4984+26mMN6DpZOboq c6UYA7OPvQjvVf4BjP9CN37wfemEPHihWh4HLRqHM3jvo/Dq0ovvM2/59JlFxA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631723965; a=rsa-sha256; cv=none; b=R4ZJNXsqxBgG1Z3soCADz/MAyngk4XWJxZlD8nJXtbFUDdpbose+6UGFq0J7p2UJAfOiQU MimUoDAa0SXu3qKIgk4dUz+RBmYwOX2G6YWOumLT3N67k78U3GHLPnApJV745WojGT+DXB 8xRWdsIbjoajhVNq9oz3V4qbwthBWC4SWwKSLYzNzFL75Ieg0hTdQU30ud7KtDUBA9tm1Z n5w9Z7BT1eQx4sHJg6bdGtRM+LtUIsoxnZ6oNWhMqQ51ANDl1GdLD/VGH+eKNgGZPkC0tu Ye2nJOct1R1SopNQ/WMJegDnUrzClWujIY+rZ9FKx+Vm6GKjZMkeVdE9quDKgg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=muradm.net header.s=mail header.b=AYFTfgT8; 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: -0.40 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=muradm.net header.s=mail header.b=AYFTfgT8; 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: 2EB5C11223 X-Spam-Score: -0.40 X-Migadu-Scanner: scn0.migadu.com X-TUID: U1dbJucLfeXA * gnu/services/desktop.scm (seatd-service-type): New variable * gnu/services/desktop.scm (seatd-configuration): New data type --- doc/guix.texi | 42 ++++++++++++++++++++++++++++ gnu/services/desktop.scm | 60 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index c641ffc453..764355c69f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -20110,6 +20110,48 @@ and ``passwd'' is with the value @code{passwd}. @end table @end deftp +@defvr {Scheme Variable} seatd-service-type +@uref{https://sr.ht/~kennylevinsen/seatd/, seatd} is a minimal seat +management daemon. + +Seat management takes care of mediating access to shared devices (graphics, +input), without requiring the applications needing access to be root. + +@lisp +(append + (list + ;; make sure seatd is running + (service seatd-service-type)) + + ;; normally one would want %base-services + %base-services) + +@end lisp +@end defvr + +@deftp {Data Type} seatd-configuration +Configuration record for the seatd daemon service. + +@table @asis +@item @code{seatd} (default: @code{seatd}) +The seatd package to use. + +@item @code{user} (default: @samp{"root"}) +User to own the seatd socket. + +@item @code{group} (default: @samp{"users"}) +Group to own the seatd socket. + +@item @code{socket} (default: @samp{"/run/seatd.sock"}) +Where to create the seatd socket. + +@item @code{loglevel} (default: @samp{"error"}) +Log level to output logs. Possible values: @samp{"silent"}, @samp{"error"}, +@samp{"info"} and @samp{"debug"}. + +@end table +@end deftp + @node Sound Services @subsection Sound Services diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 64d0e85301..c42db5987e 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Reza Alizadeh Majd ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2021 muradm ;;; ;;; This file is part of GNU Guix. ;;; @@ -39,7 +40,9 @@ #:use-module (gnu services networking) #:use-module (gnu services sound) #:use-module ((gnu system file-systems) - #:select (%elogind-file-systems file-system)) + #:select (%control-groups + %elogind-file-systems + file-system)) #:use-module (gnu system) #:use-module (gnu system setuid) #:use-module (gnu system shadow) @@ -154,6 +157,9 @@ gnome-keyring-configuration? gnome-keyring-service-type + seatd-configuration + seatd-service-type + %desktop-services)) ;;; Commentary: @@ -1182,6 +1188,58 @@ or setting its password with passwd."))) (define polkit-wheel-service (simple-service 'polkit-wheel polkit-service-type (list polkit-wheel))) + +;;; +;;; seatd-service-type -- minimal seat management daemon +;;; + +(define-record-type* seatd-configuration + make-seatd-configuration + seatd-configuration? + (seatd seatd-package (default seatd)) + (user seatd-user (default "root")) + (group seatd-group (default "users")) + (socket seatd-socket (default "/run/seatd.sock")) + (loglevel seatd-loglevel (default "error"))) + +(define (seatd-shepherd-service config) + (list (shepherd-service + (documentation "Minimal seat management daemon") + (requirement '()) + ;; TODO: once cgroups is separate dependency + ;; here we should depend on it rather than elogind + (provision '(seatd elogind)) + (start #~(make-forkexec-constructor + (list #$(file-append (seatd-package config) "/bin/seatd") + "-u" #$(seatd-user config) + "-g" #$(seatd-group config) + "-s" #$(seatd-socket config)) + #:environment-variables + (list (string-append "SEATD_LOGLEVEL=" + #$(seatd-loglevel config))) + #:log-file "/tmp/seatd.log")) + (stop #~(make-kill-destructor))))) + +(define seatd-environment + (match-lambda + (($ _ _ _ socket) + `(("SEATD_SOCK" . ,socket))))) + +(define seatd-service-type + (service-type + (name 'seatd) + (description "Seat management takes care of mediating access +to shared devices (graphics, input), without requiring the +applications needing access to be root.") + (extensions + (list + (service-extension session-environment-service-type seatd-environment) + ;; TODO: once cgroups is separate dependency we should not mount it here + ;; for now it is mounted here, because elogind mounts it + (service-extension file-system-service-type (const %control-groups)) + (service-extension shepherd-root-service-type seatd-shepherd-service))) + (default-value (seatd-configuration)))) + ;;; ;;; The default set of desktop services. -- 2.33.0