ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-12 06:06:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Move (gnu home-services) to (gnu home services).

Browse source 
* gnu/home-services/configuration.scm: Move the content ...
* gnu/home/services/configuration.scm: ... here.
* doc/guix.texi:
Replace (gnu home-services mcron) with (gnu home services mcron).
Replace (gnu home-services) with (gnu home services).
* gnu/home.scm:
Replace (gnu home-services fontutils) with (gnu services fontutils).
Replace (gnu home-services shells) with (gnu home services shells).
Replace (gnu home-services symlink-manager) with
(gnu home services symlink-manager).
Replace (gnu home-services xdg) with (gnu home services xdg).
* gnu/home-services/fontutils.scm: Rename to gnu/services/fontutils.scm.
* gnu/home-services/mcron.scm: Move to gnu/home/services/mcron.scm.
Replace (gnu home-services shepherd) with (gnu home services shepherd).
* gnu/home-services.scm (%service-type-path):
Search home services in "gnu/services".
* gnu/home-services/shells.scm: Replace (gnu home-services configuration) with
(gnu home services configuration).
Rename to gnu/home/services/shells.scm.
Replace (gnu home-services utils) with (gnu home services utils).
* gnu/home-services/shepherd.scm: Move to gnu/home/services/shepherd.scm.
* gnu/home-services/symlink-manager.scm:
Rename to gnu/home/services/symlink-manager.scm.
* gnu/home-services/utils.scm: Rename to gnu/home/services/utils.scm.
* gnu/home-services/xdg.scm: Rename to gnu/home/services/xdg.scm.
* guix/scripts/home/import.scm:
Replace (gnu home-services bash) with (gnu home services bash).
* gnu/home-services.scm: Update documentation string.
* doc/he-config-bare-bones.scm:
Apply new (gnu home-services ...) modules location.
* gnu/local.mk (GNU_SYSTEM_MODULES): Same.
This commit is contained in:
Oleg Pykhalov 2021-10-05 02:09:41 +03:00
parent 2e74616446
commit ba8ddb3480
No known key found for this signature in database
GPG key ID: 167F8EA5001AFA9C
14 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/guix.texi
View file

@ -35553,9 +35553,9 @@ services)}.
@node Essential Home Services @node Essential Home Services
@subsection Essential Home Services @subsection Essential Home Services
There are a few essential services defined in @code{(gnu There are a few essential home services defined in
home-services)}, they are mostly for internal use and are required to @code{(gnu services)}, they are mostly for internal use and are required
build a home environment, but some of them will be useful for the end to build a home environment, but some of them will be useful for the end
user. user.
@cindex environment variables @cindex environment variables
@ -35808,7 +35808,7 @@ for example).
@cindex mcron @cindex mcron
@cindex scheduling jobs @cindex scheduling jobs
The @code{(gnu home-services mcron)} module provides an interface to The @code{(gnu home services mcron)} module provides an interface to
GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,,
mcron, GNU@tie{}mcron}). The information about system's mcron is mcron, GNU@tie{}mcron}). The information about system's mcron is
applicable here (@pxref{Scheduled Job Execution}), the only difference applicable here (@pxref{Scheduled Job Execution}), the only difference

2
doc/he-config-bare-bones.scm
View file

@ -1,6 +1,6 @@
(use-modules (gnu home) (use-modules (gnu home)
(gnu home-services) (gnu home-services)
(gnu home-services shells) (gnu home services shells)
(gnu services) (gnu services)
(gnu packages admin) (gnu packages admin)
(guix gexp)) (guix gexp))

4
gnu/home-services.scm
View file

@ -512,10 +512,10 @@ (define %guix-home-root-directory
(define %service-type-path (define %service-type-path
;; Search path for service types. ;; Search path for service types.
(make-parameter `((,%guix-home-root-directory . "gnu/home-services")))) (make-parameter `((,%guix-home-root-directory . "gnu/home/services"))))
(define (all-home-service-modules) (define (all-home-service-modules)
"Return the default set of home-service modules." "Return the default set of `home service' modules."
(cons (resolve-interface '(gnu home-services)) (cons (resolve-interface '(gnu home-services))
(all-modules (%service-type-path) (all-modules (%service-type-path)
#:warn warn-about-load-error))) #:warn warn-about-load-error)))

8
gnu/home.scm
View file

@ -18,10 +18,10 @@
(define-module (gnu home) (define-module (gnu home)
#:use-module (gnu home-services) #:use-module (gnu home-services)
#:use-module (gnu home-services symlink-manager) #:use-module (gnu home services symlink-manager)
#:use-module (gnu home-services shells) #:use-module (gnu home services shells)
#:use-module (gnu home-services xdg) #:use-module (gnu home services xdg)
#:use-module (gnu home-services fontutils) #:use-module (gnu home services fontutils)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix diagnostics) #:use-module (guix diagnostics)

2
gnu/home-services/configuration.scm → gnu/home/services/configuration.scm
View file

@ -17,7 +17,7 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu home-services configuration) (define-module (gnu home services configuration)
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)

2
gnu/home-services/fontutils.scm → gnu/home/services/fontutils.scm
View file

@ -17,7 +17,7 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu home-services fontutils) (define-module (gnu home services fontutils)
#:use-module (gnu home-services) #:use-module (gnu home-services)
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (guix gexp) #:use-module (guix gexp)

4
gnu/home-services/mcron.scm → gnu/home/services/mcron.scm
View file

@ -17,11 +17,11 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu home-services mcron) (define-module (gnu home services mcron)
#:use-module (gnu packages guile-xyz) #:use-module (gnu packages guile-xyz)
#:use-module (gnu home-services) #:use-module (gnu home-services)
#:use-module (gnu home-services shepherd)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)
#:use-module (gnu home services shepherd)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)

6
gnu/home-services/shells.scm → gnu/home/services/shells.scm
View file

@ -17,10 +17,10 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu home-services shells) (define-module (gnu home services shells)
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
#:use-module (gnu home-services configuration) #:use-module (gnu home services configuration)
#:use-module (gnu home-services utils) #:use-module (gnu home services utils)
#:use-module (gnu home-services) #:use-module (gnu home-services)
#:use-module (gnu packages shells) #:use-module (gnu packages shells)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)

2
gnu/home-services/shepherd.scm → gnu/home/services/shepherd.scm
View file

@ -17,7 +17,7 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu home-services shepherd) (define-module (gnu home services shepherd)
#:use-module (gnu home-services) #:use-module (gnu home-services)
#:use-module (gnu packages admin) #:use-module (gnu packages admin)
#:use-module (gnu services shepherd) #:use-module (gnu services shepherd)

2
gnu/home-services/symlink-manager.scm → gnu/home/services/symlink-manager.scm
View file

@ -17,7 +17,7 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu home-services symlink-manager) (define-module (gnu home services symlink-manager)
#:use-module (gnu home-services) #:use-module (gnu home-services)
#:use-module (guix gexp) #:use-module (guix gexp)

2
gnu/home-services/utils.scm → gnu/home/services/utils.scm
View file

@ -17,7 +17,7 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu home-services utils) (define-module (gnu home services utils)
#:use-module (ice-9 string-fun) #:use-module (ice-9 string-fun)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-26) #:use-module (srfi srfi-26)

6
gnu/home-services/xdg.scm → gnu/home/services/xdg.scm
View file

@ -17,12 +17,12 @@
;;; You should have received a copy of the GNU General Public License ;;; You should have received a copy of the GNU General Public License
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu home-services xdg) (define-module (gnu home services xdg)
#:use-module (gnu services configuration) #:use-module (gnu services configuration)
#:use-module (gnu home-services configuration) #:use-module (gnu home services configuration)
#:use-module (gnu home-services) #:use-module (gnu home-services)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu home-services utils) #:use-module (gnu home services utils)
#:use-module (guix gexp) #:use-module (guix gexp)
#:use-module (guix records) #:use-module (guix records)
#:use-module (guix i18n) #:use-module (guix i18n)

16
gnu/local.mk
View file

@ -75,14 +75,14 @@ GNU_SYSTEM_MODULES = \
%D%/ci.scm \ %D%/ci.scm \
%D%/home.scm \ %D%/home.scm \
%D%/home-services.scm \ %D%/home-services.scm \
%D%/home-services/symlink-manager.scm \ %D%/home/services/symlink-manager.scm \
%D%/home-services/fontutils.scm \ %D%/home/services/fontutils.scm \
%D%/home-services/configuration.scm \ %D%/home/services/configuration.scm \
%D%/home-services/shells.scm \ %D%/home/services/shells.scm \
%D%/home-services/shepherd.scm \ %D%/home/services/shepherd.scm \
%D%/home-services/mcron.scm \ %D%/home/services/mcron.scm \
%D%/home-services/utils.scm \ %D%/home/services/utils.scm \
%D%/home-services/xdg.scm \ %D%/home/services/xdg.scm \
%D%/image.scm \ %D%/image.scm \
%D%/packages.scm \ %D%/packages.scm \
%D%/packages/abduco.scm \ %D%/packages/abduco.scm \

2
guix/scripts/home/import.scm
View file

@ -41,7 +41,7 @@ (define (generate-bash-module+configuration)
(let ((rc (string-append (getenv "HOME") "/.bashrc")) (let ((rc (string-append (getenv "HOME") "/.bashrc"))
(profile (string-append (getenv "HOME") "/.bash_profile")) (profile (string-append (getenv "HOME") "/.bash_profile"))
(logout (string-append (getenv "HOME") "/.bash_logout"))) (logout (string-append (getenv "HOME") "/.bash_logout")))
`((gnu home-services bash) `((gnu home services bash)
(service home-bash-service-type (service home-bash-service-type
(home-bash-configuration (home-bash-configuration
,@(if (file-exists? rc) ,@(if (file-exists? rc)