From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SOUcBrifQ2F22wAAgWs5BA (envelope-from ) for ; Thu, 16 Sep 2021 21:49:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id oKbGAbifQ2GsFwAA1q6Kng (envelope-from ) for ; Thu, 16 Sep 2021 19:49:12 +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 9219958AC for ; Thu, 16 Sep 2021 21:49:11 +0200 (CEST) Received: from localhost ([::1]:34734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mQxNe-0004Ss-O7 for larch@yhetil.org; Thu, 16 Sep 2021 15:49:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mQxMa-0003Y4-MI for guix-patches@gnu.org; Thu, 16 Sep 2021 15:48:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45113) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mQxMa-0001l2-FU for guix-patches@gnu.org; Thu, 16 Sep 2021 15:48:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mQxMa-0005AR-CZ for guix-patches@gnu.org; Thu, 16 Sep 2021 15:48:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49969] [PATCH v8 6/7] gnu: desktop: Add seatd-service-type. Resent-From: muradm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Sep 2021 19:48: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.163182167819800 (code B ref 49969); Thu, 16 Sep 2021 19:48:04 +0000 Received: (at 49969) by debbugs.gnu.org; 16 Sep 2021 19:47:58 +0000 Received: from localhost ([127.0.0.1]:56650 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQxMT-00059H-M0 for submit@debbugs.gnu.org; Thu, 16 Sep 2021 15:47:58 -0400 Received: from nomad-cl1.staging.muradm.net ([139.162.159.157]:58082 helo=nomad-cl1.muradm.net) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mQxME-00057n-1M for 49969@debbugs.gnu.org; Thu, 16 Sep 2021 15:47:43 -0400 Received: from [176.234.10.27] (port=7474 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 1mQxME-0000YT-E6 for 49969@debbugs.gnu.org; Thu, 16 Sep 2021 19:47:42 +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=ZFuEV4g+esE25D4cLA11X5uHwd Z5qavz8aO81Qu+qE4mRw6ggJadfQc6PkQPvuSFqBdawZCgD+7yKIdynFk0Fm73kg2lWmqra6lJwCh 0DFKXl9X0+cq0ckbAuX/kMjJHu4COTEkvQA18ZeVrNemHPLHNrk8mY9LZ4xH+WLxc6+bHfRKlZ1R8 UCPvXVdmyxUXuSYe+Od/Ptnoy14zmnQUdj5xtwjQvWcGp4dlNkNs+PqBO0H4ak9ML4T7Ozao91Hv6 Btb0dQ7JomoPJhQTbV/zS16A6YOb/9YX4Nz5tMvJZqd2LJSWqL68rltwUSYOfdeKv2FgezCNge2go 2SX6pGG91Dhy+Tl5AhMTpBDFOCTmxxEyg0GXVCsFCplhWkJVs4qqAnQI3J6kn27HNGTI28pY55HfR cIzIED9x5zGlUvMoPXDeHNln/141lNaW83USpTBW0bmAsjhaeB0xvJD/WiiGExsUc0FVKUCnYI5DO lACIZsqgb/cPOqDcKo9pcZRS; Received: from muradm by localhost with local (Exim 4.94.2) (envelope-from ) id 1mQxMB-00005v-HD for 49969@debbugs.gnu.org; Thu, 16 Sep 2021 22:47:39 +0300 From: muradm Date: Thu, 16 Sep 2021 22:47:27 +0300 Message-Id: <20210916194728.324-7-mail@muradm.net> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916194728.324-1-mail@muradm.net> References: <20210915162958.28398-1-mail@muradm.net> <20210916194728.324-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=1631821751; 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=qV8mXsV0O8/QNpxoYF+Je0Fyzd/yKPrixHnsUhW9eHQqNdynec6v9MXpbwV+eK367/gwHf /hUSZYYRtEvXz3bQCFKJYs4E3Uf+bVu0P4ZmY3ZzfLCUNMxHOP6RWiqZR00hVGGBn3iQrt nWP5xIu/yqDiVpedyCwQAMUKFv1aeN18X30rb8dcUWJTb2Lw5oq5jcz3+fgzd8jqZdpWVS 6ArohvRVZ/PleeMywUoR5uqfaWJKftRPWpznUh3ljwTu9patn87LYVe7SxNENBMIW8cg1/ Id+1oELhLKJuzkww4GAybAIEypv5y5OSCtDH1Cj63gVinbkZeuCoozhCpgYQ3w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1631821751; a=rsa-sha256; cv=none; b=p5cp9gBplCJuPnjRJJQqHW72opI+2XO+RE8ivvv5DrwNRlwJTfsm/NUqV80RcR/bBdW6U2 EaE2Izi5Ib7t2bGDGdjov8TeXVBkDzgPu0XvLLYNRF73Vk0+Snh3PH5ma1qoXfsdsyyjQY S94aIilhUh90SdGo9DxSVYEGln+FzcdJV5yIQ21PNcFVPp9lsCa3du3yefF/CGstKpAZtJ ZYlkRO1z/Hd8Xs/JDQ+vxZlEX0689dqLOhmfLkLWD1mq5vSBHH5ubWSozv4MiOHloa/VL4 GXs2vl7UZHm3TF8+XGWgBrGYhENGGhDR+cG3LQZm7ame64+9uiU3VZQeT0k7Fw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=muradm.net header.s=mail header.b=ZFuEV4g+; 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-Spam-Score: 1.10 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=muradm.net header.s=mail header.b=ZFuEV4g+; 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: 9219958AC X-Spam-Score: 1.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: t5Zy/2QZ1vK8 * 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