From patchwork Sun Oct 2 13:15:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Taiju HIGASHI X-Patchwork-Id: 43112 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7EDDB27BBE9; Sun, 2 Oct 2022 14:16:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DE83427BBEA for ; Sun, 2 Oct 2022 14:16:17 +0100 (BST) Received: from localhost ([::1]:37496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oeypM-0000NQ-Px for patchwork@mira.cbaines.net; Sun, 02 Oct 2022 09:16:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oeyp8-0000KO-IF for guix-patches@gnu.org; Sun, 02 Oct 2022 09:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oeyp8-00038n-8s for guix-patches@gnu.org; Sun, 02 Oct 2022 09:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oeyp8-0008Cl-3K for guix-patches@gnu.org; Sun, 02 Oct 2022 09:16: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:16: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.166471655831512 (code B ref 57963); Sun, 02 Oct 2022 13:16:02 +0000 Received: (at 57963) by debbugs.gnu.org; 2 Oct 2022 13:15:58 +0000 Received: from localhost ([127.0.0.1]:46499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oeyp3-0008CA-Rg for submit@debbugs.gnu.org; Sun, 02 Oct 2022 09:15:58 -0400 Received: from mail-pg1-f178.google.com ([209.85.215.178]:41982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oeyp2-0008Bv-3o for 57963@debbugs.gnu.org; Sun, 02 Oct 2022 09:15:56 -0400 Received: by mail-pg1-f178.google.com with SMTP id q9so7709563pgq.8 for <57963@debbugs.gnu.org>; Sun, 02 Oct 2022 06:15:56 -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=+6T7914hVvfpGjp1pduX+yD/C3m+igLeJJvl6eRfgA8=; b=aaSJ8RleC+6MTAasxntMD18Igs12pSGhAT89alUhgbjSiHWWrMrn7FNKEDtj5w2lRS Kq5IilUUvEd1hXDvas0UYjIm9420UYa5W2gCGrXHuDAhM/5lMjoS3N92usAd3cZxJvEm e/KGDOYCd0t3bvFXBDEfPmDwgCvskJnMlWc1D6vK+leP9MH+tbiF4w+VmBy5Bqg9HEjv If3gRTScNYptv8ZT+Q4piLVPcjHQM3YtEuQ+pJtG8WLAjjvWUDjkYBCrRf4lqpZsHrVJ QPLsAUF+QELMU0t+bGVzw0zG9NuV4qle9ClgWNPxcR1goducK8jn2CE/h2Jj21e2jOFa Jmjg== 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=+6T7914hVvfpGjp1pduX+yD/C3m+igLeJJvl6eRfgA8=; b=pCowHH7TfAK1Fv2QzZA35qVH9idY9axgZl6IIuJWyvB5Vn8zVuScsMDACZr963+Hr5 bh6C0+4QP0DGC82LWZyc4ySgzLsfzXVyQsmmo2dS9DhoTFm+0PU/Vbpg/tSQP/O6fW1t bJD+zIK03l6sGDa2kcK5PkFrvfHpOvQ26HSvU2dBFKPjDOql7vmi7taK/XxfGK9fR3IH zAsa8krVy6oHgsx00Rb5kDNJFTW/knSVDeC/etUP76daBbNRBhribgf8ZytIA7dHgYT5 SjP+6qydFGTjnaUaa+NiHUjZX75JFDjnUCshhHm3u/rK1aVzMRuPd6WSpkXEMD5opu2P Idtw== X-Gm-Message-State: ACrzQf0UuGcMGS7NND0Qah6zHWeNe1b2XesX7cNrZ3+eMnLTwyrV2DGu Q27BvOv1mu2e1nnwao/oG5hyBm0ahnXP653p X-Google-Smtp-Source: AMsMyM7wxeAsu1pgEmNSIvdV4AQRgz2uxUcfwpzc9VGLZR0Gb0V9aW3GA/pgBeA6bW0mo6WG/ENBYg== X-Received: by 2002:a63:ea4a:0:b0:439:4695:c0f8 with SMTP id l10-20020a63ea4a000000b004394695c0f8mr14893985pgk.440.1664716550258; Sun, 02 Oct 2022 06:15:50 -0700 (PDT) Received: from Taix.flets-west.jp ([240b:253:ec40:2400:b7d1:436e:2d61:e925]) by smtp.gmail.com with ESMTPSA id i2-20020a17090332c200b00176c89243fcsm5342906plr.179.2022.10.02.06.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Oct 2022 06:15:49 -0700 (PDT) From: Taiju HIGASHI Date: Sun, 2 Oct 2022 22:15:34 +0900 Message-Id: <20221002131535.9972-1-higashi@taiju.info> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/home/services/base.scm: New file. * gnu/home.scm (home-environment): Move home-fontconfig-service-type from home-environment-default-essential-services to %home-base-services of it. * 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 -- 2.37.3 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 \