From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UM/HHWuOOWMmLgAAbAwnHQ (envelope-from ) for ; Sun, 02 Oct 2022 15:13:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iE+/HWuOOWOqZQAA9RJhRA (envelope-from ) for ; Sun, 02 Oct 2022 15:13:15 +0200 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 020893FE71 for ; Sun, 2 Oct 2022 15:13:15 +0200 (CEST) Received: from localhost ([::1]:33348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeymQ-0007fy-4P for larch@yhetil.org; Sun, 02 Oct 2022 09:13:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeymF-0007fc-Rf for guix-patches@gnu.org; Sun, 02 Oct 2022 09:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oeymF-0002JW-EK for guix-patches@gnu.org; Sun, 02 Oct 2022 09:13:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oeymE-00087O-HR for guix-patches@gnu.org; Sun, 02 Oct 2022 09:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57963] [PATCH v5 1/2] home: services: Add base. References: <20220921002721.23511-1-higashi@taiju.info> In-Reply-To: <20220921002721.23511-1-higashi@taiju.info> Resent-From: Taiju HIGASHI Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Oct 2022 13:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57963 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57963@debbugs.gnu.org Cc: ludo@gnu.org, Taiju HIGASHI , liliana.prikler@gmail.com, andrew@trop.in Received: via spool by 57963-submit@debbugs.gnu.org id=B57963.166471636931185 (code B ref 57963); Sun, 02 Oct 2022 13:13:02 +0000 Received: (at 57963) by debbugs.gnu.org; 2 Oct 2022 13:12:49 +0000 Received: from localhost ([127.0.0.1]:46490 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oeym0-00086v-TO for submit@debbugs.gnu.org; Sun, 02 Oct 2022 09:12:49 -0400 Received: from mail-pf1-f176.google.com ([209.85.210.176]:35787) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oeyly-00086i-E5 for 57963@debbugs.gnu.org; Sun, 02 Oct 2022 09:12:47 -0400 Received: by mail-pf1-f176.google.com with SMTP id i6so8109084pfb.2 for <57963@debbugs.gnu.org>; Sun, 02 Oct 2022 06:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=taiju-info.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=87vD6Zl+90LTKJAKG2Oq9CaKHKW2oliUjXYGtfEuKZs=; b=oPBmHaGAwZAtqwDnQi5MI0ZZSCdUtg/KzEkWvR1lJZbdCYLe8/Zi/R/sYXbigRte/C 0rVl6pdU9mz/OB1eCoDns6ZKKFM54taacx4ALn4UwZo0o+raKU3QpBehbTzbMNwZmQ8D 7ftVqBM8kJmAKPvRgbvEoEH/dAEvincEmVhpCVo228g+CvUwlBrhhiqTMMYx1Cbx1uhx k1TpgF/XIjkt8nNTuXsEjM3XcflZyipzXvcle5KodJUemEbff13oBvHCJoZqP+lbNAHV LpVbs06DeJx2Hjs0Upyu8aNhf1JlGFFV5eI3oayg1dnqLhoR4aQJ349vP2XUgfj85hc9 yVgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=87vD6Zl+90LTKJAKG2Oq9CaKHKW2oliUjXYGtfEuKZs=; b=4r+MzheawXY2RR17/u2ppP16xJ4gLfEshjBh02SjDKBCs4VURTDhwxgBAZkYrG5t9r YHg3plyVP9ZYP3VHIogrRnrLMzwNBo0G2ooykAkfrxT2pgaitfMi8MPhBjTpgOpinEGp PxHMomsbyv77D94ngg59TXfx4kVhEcYfoVl6BVqHQDh4x1ZhzabUDj2Rapbkpn7V2CSK 2frlV0b24yqyhPn/jFfh5CEYn/VU102jdGJ72Ip6aqq18SKMSwsxU1pyzZH1bfJK1EWv EA6IP73nMHLLP6JRJvDh8AVoTiAvrCmcQJpcDZ8jKiykLnTjD2lrovGTSQOvfsMtkoZ6 Pu2g== X-Gm-Message-State: ACrzQf0qVOWZ9Z5fbn4fpPNkQKP71EJU56ey2Js1YFfYGbdL6unsqFvK R6j73MtS5HcwHJ1FOi6DDC64VvtCp+jBr08c X-Google-Smtp-Source: AMsMyM41xbL5JqHOh2OZMewDcWbw3Iz1cXpyi2hSlKg89G7wpBEl+6jWAV4iXYl7eXdioZVqw899Fg== X-Received: by 2002:a63:c142:0:b0:43c:9fcc:c9f2 with SMTP id p2-20020a63c142000000b0043c9fccc9f2mr15061421pgi.44.1664716360422; Sun, 02 Oct 2022 06:12:40 -0700 (PDT) Received: from Taix.flets-west.jp ([240b:253:ec40:2400:b7d1:436e:2d61:e925]) by smtp.gmail.com with ESMTPSA id 22-20020a621516000000b0053e669cc845sm5350141pfv.190.2022.10.02.06.12.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 06:12:39 -0700 (PDT) From: Taiju HIGASHI Date: Sun, 2 Oct 2022 22:12:31 +0900 Message-Id: <20221002131232.9063-1-higashi@taiju.info> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Type: text/plain; charset=__emacs_complete_pre_command; echo -n "=?UTF-8?Q?=1B=1Bpwd=3D${PWD}=1B=1B?="; compgen -b -c -a -A function -- n 2>/dev/null 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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1664716395; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=LF3noAGZqtNkD9fMS2r3QYzsPgGBd87DG15RLzgkzvU=; b=I+fAS0ZymJy7vze3rdFWvzSWaSJuhtS6iRwMW2cMrZUBzzlZ0QWe8sBzGIc8WB4rqsDqHD fKnlP7awDpoMYjgNg8Ez0/2w3AIPAjtcC/oC241B+yjH69ik03uBZakrFZxBnCZvLGngQv 8hbo/rhVwyGzSJF6pxVHQs3tt3bl1akrA8YXdCoIh3SgrIiwFl34LesaC61Zm79DltUqtO 0WADXQyrX5JgjJCAid1HVtMEVRx2vrztE8aDa6PZM8CQR2LoF0Do4g6hXQqdL3ye6gRrbw ITJvYwjyy06Pzw7+0FLpQrkWSeHFzMk5ZLcyfV6w3Q2y9I0Do95yb3of+ZOw5g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1664716395; a=rsa-sha256; cv=none; b=V+ayMsr02Vy1b2n4G+fwaiPjawQ6UsIoIF//p+BvkZkgHd7KgdF44LXTTO4AeyHjYRinHx 2UPkoI85Xbtc95oI2sJ1Vy9+e4To84aGCaCeFIcFQBLUwIS6ZUc9LvaRQPcFZw+Ua95C+D GBNWM+r72tubTwHaDz63aEEPmR3X6ofV5V5UpW94zJqzWGpg9dGgzOaleAYyho7pa0g87H 1u4DOdxb/l3FZmRmyU7ff8Jx8TGYym1RRkirfXGPbBFxFYzKG5BBKnfojYItJKp9qzo0L1 quaGghG8SK7ovj7+sYB0p74fIRjaSNoiQk8ILaYSqPw6AFunt1QmugDGa9Foxw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=taiju-info.20210112.gappssmtp.com header.s=20210112 header.b=oPBmHaGA; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 4.36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=taiju-info.20210112.gappssmtp.com header.s=20210112 header.b=oPBmHaGA; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 020893FE71 X-Spam-Score: 4.36 X-Migadu-Scanner: scn0.migadu.com X-TUID: +T/Q5qhI7pE7 * gnu/home/services/base.scm: New file. * gnu/home.scm (): Move home-fontconfig-service-type from home-environment-default-essential-services to its %home-base-services. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. --- gnu/home.scm | 5 ++--- gnu/home/services/base.scm | 35 +++++++++++++++++++++++++++++++++++ gnu/local.mk | 2 ++ 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 gnu/home/services/base.scm diff --git a/gnu/home.scm b/gnu/home.scm index c95d1e0818..c79db87018 100644 --- a/gnu/home.scm +++ b/gnu/home.scm @@ -19,10 +19,10 @@ (define-module (gnu home) #:use-module (gnu home services) + #:use-module (gnu home services base) #:use-module (gnu home services symlink-manager) #:use-module (gnu home services shells) #:use-module (gnu home services xdg) - #:use-module (gnu home services fontutils) #:use-module (gnu services) #:use-module (guix records) #:use-module (guix diagnostics) @@ -66,7 +66,7 @@ (define-record-type* home-environment this-home-environment))) (services home-environment-user-services - (default '())) + (default %home-base-services)) (location home-environment-location ; (default (and=> (current-source-location) @@ -82,7 +82,6 @@ (define (home-environment-default-essential-services he) (service home-symlink-manager-service-type) - (service home-fontconfig-service-type) (service home-xdg-base-directories-service-type) (service home-shell-profile-service-type) diff --git a/gnu/home/services/base.scm b/gnu/home/services/base.scm new file mode 100644 index 0000000000..fbf92ba213 --- /dev/null +++ b/gnu/home/services/base.scm @@ -0,0 +1,35 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Taiju HIGASHI +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu home services base) + #:use-module (gnu home services) + #:use-module (gnu home services fontutils) + #:export (%home-base-services)) + +;;; Commentary: +;; +;; Base home services---i,e., services that 99% of the users will want to use. +;; +;;; Code: + + +(define %home-base-services + ;; Convenience variable holding the basic services. + (list (service home-fontconfig-service-type))) + +;;; base.scm ends here diff --git a/gnu/local.mk b/gnu/local.mk index 26fdfe7ca9..c0fceafd3f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -54,6 +54,7 @@ # Copyright © 2022 muradm # Copyright © 2022 Hilton Chain # Copyright © 2022 Alex Griffin +# Copyright © 2022 Taiju HIGASHI # # This file is part of GNU Guix. # @@ -85,6 +86,7 @@ GNU_SYSTEM_MODULES = \ %D%/compression.scm \ %D%/home.scm \ %D%/home/services.scm \ + %D%/home/services/base.scm \ %D%/home/services/desktop.scm \ %D%/home/services/symlink-manager.scm \ %D%/home/services/fontutils.scm \ -- 2.37.3