[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/14: home: Add home-environment.
From: |
guix-commits |
Subject: |
14/14: home: Add home-environment. |
Date: |
Fri, 27 Aug 2021 15:08:32 -0400 (EDT) |
wigust pushed a commit to branch wip-guix-home
in repository guix.
commit f82a0ac982a7f17659c6f32ef464ec2d82385426
Author: Andrew Tropin <andrew@trop.in>
AuthorDate: Fri Aug 27 10:07:35 2021 +0300
home: Add home-environment.
* gnu/home.scm
(home-environment, home-environment?, this-home-environment)
(home-environment-derivation, home-environment-user-services)
(home-environment-essential-services, home-environment-services)
(home-environment-location, home-environment-with-provenance): New
variables.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add home.scm.
Signed-off-by: Oleg Pykhalov <go.wigust@gmail.com>
---
gnu/home.scm | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
gnu/local.mk | 1 +
2 files changed, 99 insertions(+)
diff --git a/gnu/home.scm b/gnu/home.scm
new file mode 100644
index 0000000..a53d271
--- /dev/null
+++ b/gnu/home.scm
@@ -0,0 +1,98 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2021 Andrew Tropin <andrew@trop.in>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(define-module (gnu home)
+ #:use-module (gnu home-services)
+ #: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)
+
+ #:export (home-environment
+ home-environment?
+ this-home-environment
+
+ home-environment-derivation
+ home-environment-user-services
+ home-environment-essential-services
+ home-environment-services
+ home-environment-location
+
+ home-environment-with-provenance))
+
+(define-record-type* <home-environment> home-environment
+ make-home-environment
+ home-environment?
+ this-home-environment
+
+ (packages home-environment-packages ; list of (PACKAGE
OUTPUT...)
+ (default '()))
+
+ (essential-services home-environment-essential-services ; list of services
+ (thunked)
+ (default (home-environment-default-essential-services
+ this-home-environment)))
+
+ (services home-environment-user-services
+ (default '()))
+
+ (location home-environment-location ; <location>
+ (default (and=> (current-source-location)
+ source-properties->location))
+ (innate)))
+
+(define (home-environment-default-essential-services he)
+ "Return the list of essential services for home environment."
+ (list
+ (service home-run-on-first-login-service-type)
+ (service home-activation-service-type)
+ (service home-environment-variables-service-type)
+
+ (service home-symlink-manager-service-type)
+
+ (service home-fontconfig-service-type)
+ (service home-xdg-base-directories-service-type)
+ (service home-shell-profile-service-type)
+
+ (service home-service-type)
+ (service home-profile-service-type (home-environment-packages he))))
+
+(define* (home-environment-services he)
+ "Return all the services of home environment."
+ (instantiate-missing-services
+ (append (home-environment-user-services he)
+ (home-environment-essential-services he))))
+
+(define* (home-environment-derivation he)
+ "Return a derivation that builds OS."
+ (let* ((services (home-environment-services he))
+ (home (fold-services services
+ #:target-type home-service-type)))
+ (service-value home)))
+
+(define* (home-environment-with-provenance he config-file)
+ "Return a variant of HE that stores its own provenance information,
+including CONFIG-FILE, if available. This is achieved by adding an instance
+of HOME-PROVENANCE-SERVICE-TYPE to its services."
+ (home-environment
+ (inherit he)
+ (services (cons (service home-provenance-service-type config-file)
+ (home-environment-user-services he)))))
diff --git a/gnu/local.mk b/gnu/local.mk
index de0af79..80348c8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -73,6 +73,7 @@ GNU_SYSTEM_MODULES = \
%D%/bootloader/u-boot.scm \
%D%/bootloader/depthcharge.scm \
%D%/ci.scm \
+ %D%/home.scm \
%D%/home-services.scm \
%D%/home-services/symlink-manager.scm \
%D%/home-services/fontutils.scm \
- 04/14: gnu: emacs-elfeed-score: Update to 0.8.4., (continued)
- 04/14: gnu: emacs-elfeed-score: Update to 0.8.4., guix-commits, 2021/08/27
- 08/14: home-services: Add fold-home-service-types function., guix-commits, 2021/08/27
- 10/14: home-services: Add fontutils., guix-commits, 2021/08/27
- 05/14: home-services: Add most essential home services., guix-commits, 2021/08/27
- 07/14: home-services: Add home-provenance-service-type., guix-commits, 2021/08/27
- 11/14: home-services: Add helper functions for service configurations., guix-commits, 2021/08/27
- 12/14: home-services: Add shells., guix-commits, 2021/08/27
- 13/14: home-services: Add xdg., guix-commits, 2021/08/27
- 02/14: ci: Add jobs history support., guix-commits, 2021/08/27
- 09/14: home-services: Add symlink-manager., guix-commits, 2021/08/27
- 14/14: home: Add home-environment.,
guix-commits <=