From unknown Sun Jun 22 11:48:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40453] [PATCH] services: add perpipherals Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 05 Apr 2020 19:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 40453 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 40453@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.158611613610323 (code B ref -1); Sun, 05 Apr 2020 19:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 5 Apr 2020 19:48:56 +0000 Received: from localhost ([127.0.0.1]:46631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLBGK-0002gR-09 for submit@debbugs.gnu.org; Sun, 05 Apr 2020 15:48:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:57999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLBGI-0002gF-J6 for submit@debbugs.gnu.org; Sun, 05 Apr 2020 15:48:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44256) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jLBGH-0006R8-8j for guix-patches@gnu.org; Sun, 05 Apr 2020 15:48:54 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jLBGF-0005Yk-PW for guix-patches@gnu.org; Sun, 05 Apr 2020 15:48:52 -0400 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:45847) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jLBGF-0005VV-H4 for guix-patches@gnu.org; Sun, 05 Apr 2020 15:48:51 -0400 X-Originating-IP: 78.237.113.178 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 1E4681C0007 for ; Sun, 5 Apr 2020 19:48:47 +0000 (UTC) From: Brice Waegeneire Date: Sun, 5 Apr 2020 21:48:32 +0200 Message-Id: <20200405194832.20198-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.183.197 X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- Makefile | 1 + modules/config/base.scm | 4 +--- modules/config/workstation.scm | 4 ++-- modules/services/peripherals.scm | 30 ++++++++++++++++++++++++++++++ 4 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 modules/services/peripherals.scm diff --git a/Makefile b/Makefile index 9242659..9941cf6 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ MODULES = \ $(MODULES_DIR)/config/base.scm \ $(MODULES_DIR)/config/workstation.scm \ $(MODULES_DIR)/services/kernel-modules.scm \ + $(MODULES_DIR)/services/peripherals.scm \ $(MODULES_DIR)/utils.scm SCM_FILES = $(MODULES) $(MISC_SCM_FILES) diff --git a/modules/config/base.scm b/modules/config/base.scm index acc76e9..ef80130 100644 --- a/modules/config/base.scm +++ b/modules/config/base.scm @@ -75,16 +75,14 @@ (supplementary-groups '("wheel" "netdev" "audio" "video" "lp" ; for bluetooth tether - "plugdev" ; TODO extract it to u2f service + "plugdev" ; u2f "input" ; for brightness control through brightnessctl "adbusers" "kvm" "libvirt" ))) %base-user-accounts)) - ;; TODO extract it to u2f service (groups (append (list - (user-group (name "plugdev") (system? #t)) (user-group (name "adbusers") (system? #t))) %base-groups)) diff --git a/modules/config/workstation.scm b/modules/config/workstation.scm index 2ce09df..a965fbd 100644 --- a/modules/config/workstation.scm +++ b/modules/config/workstation.scm @@ -20,6 +20,7 @@ #:use-module (config base) #:use-module (utils) #:use-module (services kernel-modules) + #:use-module (services peripherals) #:use-module (srfi srfi-1) #:export (workstation-os workstation-packages @@ -48,8 +49,7 @@ (service gpm-service-type) ; Mouse on console (service pcscd-service-type) (load-kernel-modules-service '("ddcci" "ddcci_backlight")) - ;; TODO replace the following line with (service u2f-service-type) - (simple-service 'u2f-udev udev-service-type (list libu2f-host)) + (service u2f-service-type) (simple-service 'android-udev udev-service-type (list android-udev-rules)) (simple-service 'backlight-udev udev-service-type (list brightnessctl)))) diff --git a/modules/services/peripherals.scm b/modules/services/peripherals.scm new file mode 100644 index 0000000..6d2d484 --- /dev/null +++ b/modules/services/peripherals.scm @@ -0,0 +1,30 @@ +(define-module (services peripherals) + #:use-module (gnu services) + #:use-module (gnu services base) + #:use-module (gnu services configuration) + #:use-module (gnu system accounts) + #:use-module (gnu system shadow) + #:use-module (gnu packages security-token) + #:use-module (guix packages) + #:export (u2f-service-type)) + +(define-configuration u2f-configuration + (u2f (package libu2f-host) + "The u2f package")) + +(define (u2f-udev-service config) + (list (u2f-configuration-u2f config))) + +(define u2f-accounts + (const (list (user-group (name "plugdev") (system? #t))))) + +(define u2f-service-type + (service-type (name 'u2f) + (extensions + (list (service-extension udev-service-type + u2f-udev-service) + (service-extension account-service-type + u2f-accounts))) + (default-value (u2f-configuration)) + (description + "Give access to u2f tokens for plugdev members."))) -- 2.26.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 05 15:51:37 2020 Received: (at control) by debbugs.gnu.org; 5 Apr 2020 19:51:37 +0000 Received: from localhost ([127.0.0.1]:46640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLBIv-0002rd-Me for submit@debbugs.gnu.org; Sun, 05 Apr 2020 15:51:37 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:59575) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLBIt-0002r7-Iu for control@debbugs.gnu.org; Sun, 05 Apr 2020 15:51:36 -0400 Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: brice@waegenei.re) by relay4-d.mail.gandi.net (Postfix) with ESMTPA id 072C1E0003 for ; Sun, 5 Apr 2020 19:51:28 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sun, 05 Apr 2020 19:51:28 +0000 From: Brice Waegeneire To: control@debbugs.gnu.org Subject: close 40453 Message-ID: <9af6c6a2332bd0974be21510479a83fb@waegenei.re> X-Sender: brice@waegenei.re User-Agent: Roundcube Webmail/1.3.8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) # That's embarrassing; wrong repo... close 40453 quit From unknown Sun Jun 22 11:48:53 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#40453] [PATCH] services: add perpipherals Resent-From: Jack Hill Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Apr 2020 14:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40453 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Brice Waegeneire Cc: 40453@debbugs.gnu.org Received: via spool by 40453-submit@debbugs.gnu.org id=B40453.15861847349112 (code B ref 40453); Mon, 06 Apr 2020 14:53:01 +0000 Received: (at 40453) by debbugs.gnu.org; 6 Apr 2020 14:52:14 +0000 Received: from localhost ([127.0.0.1]:49036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLT6i-0002Mo-DQ for submit@debbugs.gnu.org; Mon, 06 Apr 2020 10:52:13 -0400 Received: from minsky.hcoop.net ([104.248.1.95]:52834) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jLT6c-0002Lw-8N for 40453@debbugs.gnu.org; Mon, 06 Apr 2020 10:52:07 -0400 Received: from marsh.hcoop.net ([45.55.52.66]) by minsky.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1jLT6W-0008R6-Od; Mon, 06 Apr 2020 10:52:00 -0400 Date: Mon, 6 Apr 2020 10:52:00 -0400 (EDT) From: Jack Hill X-X-Sender: jackhill@marsh.hcoop.net In-Reply-To: <20200405194832.20198-1-brice@waegenei.re> Message-ID: References: <20200405194832.20198-1-brice@waegenei.re> User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Sun, 5 Apr 2020, Brice Waegeneire wrote: > --- > Makefile | 1 + > modules/config/base.scm | 4 +--- > modules/config/workstation.scm | 4 ++-- > modules/services/peripherals.scm | 30 ++++++++++++++++++++++++++++++ > 4 files changed, 34 insertions(+), 5 deletions(-) > create mode 100644 modules/services/peripherals.scm I don't have any comments on the contents of the patch, but wanted to ask that this change be mentioned in etc/news.scm so that folks can update their operating system definitions. Thanks! Jack