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

* gnu/home-services.scm (%guix-home-root-directory): Replace
gnu/home-services.scm with "gnu/home/services.scm".
Rename to gnu/home/services.scm.
* gnu/local.mk
(GNU_SYSTEM_MODULES): Rename gnu/home-services.scm to gnu/home/services.scm.
* doc/he-config-bare-bones.scm:
Replace (gnu home-services) with (gnu home services).
* gnu/home.scm: Same.
* gnu/home/services/fontutils.scm: Same.
* gnu/home/services/mcron.scm: Same.
* gnu/home/services/shells.scm: Same.
* gnu/home/services/shepherd.scm: Same.
* gnu/home/services/symlink-manager.scm: Same.
* gnu/home/services/xdg.scm: Same.
* guix/scripts/home.scm: Same.
* guix/self.scm: Same.

12 files changed, 14 insertions, 14 deletions

diff --git a/doc/he-config-bare-bones.scm b/doc/he-config-bare-bones.scm
index 1faf75b871..d2e4736e29 100644
--- a/doc/he-config-bare-bones.scm
+++ b/doc/he-config-bare-bones.scm
@@ -1,5 +1,5 @@
 (use-modules (gnu home)
-             (gnu home-services)
+             (gnu home services)
              (gnu home services shells)
              (gnu services)
              (gnu packages admin)
diff --git a/gnu/home.scm b/gnu/home.scm
index 5ac382dc5a..d8134693e5 100644
--- a/gnu/home.scm
+++ b/gnu/home.scm
@@ -17,7 +17,7 @@
 ;;; 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)
   #:use-module (gnu home services symlink-manager)
   #:use-module (gnu home services shells)
   #:use-module (gnu home services xdg)
diff --git a/gnu/home-services.scm b/gnu/home/services.scm
index a244a15511..c497b14617 100644
--- a/gnu/home-services.scm
+++ b/gnu/home/services.scm
@@ -17,7 +17,7 @@
 ;;; 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-services)
+(define-module (gnu home services)
   #:use-module (gnu services)
   #:use-module (guix channels)
   #:use-module (guix monads)
@@ -508,7 +508,7 @@ environment, and its configuration file, when available.")))
 
 (define %guix-home-root-directory
   ;; Absolute file name of the module hierarchy.
-  (parent-directory (dirname (search-path %load-path "gnu/home-services.scm"))))
+  (parent-directory (dirname (search-path %load-path "gnu/home/services.scm"))))
 
 (define %service-type-path
   ;; Search path for service types.
@@ -516,7 +516,7 @@ environment, and its configuration file, when available.")))
 
 (define (all-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)
                      #:warn warn-about-load-error)))
 
diff --git a/gnu/home/services/fontutils.scm b/gnu/home/services/fontutils.scm
index 72a84fdecd..772904367d 100644
--- a/gnu/home/services/fontutils.scm
+++ b/gnu/home/services/fontutils.scm
@@ -18,7 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu home services fontutils)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
   #:use-module (gnu packages fontutils)
   #:use-module (guix gexp)
 
diff --git a/gnu/home/services/mcron.scm b/gnu/home/services/mcron.scm
index cc6faac47f..0b3dbb810b 100644
--- a/gnu/home/services/mcron.scm
+++ b/gnu/home/services/mcron.scm
@@ -19,7 +19,7 @@
 
 (define-module (gnu home services mcron)
   #:use-module (gnu packages guile-xyz)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
   #:use-module (gnu services shepherd)
   #:use-module (gnu home services shepherd)
   #:use-module (guix records)
diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm
index 2308371dd0..21b250f35d 100644
--- a/gnu/home/services/shells.scm
+++ b/gnu/home/services/shells.scm
@@ -21,7 +21,7 @@
   #:use-module (gnu services configuration)
   #:use-module (gnu home services configuration)
   #: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 bash)
   #:use-module (guix gexp)
diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm
index 1a3e849bb2..7a9cc064bb 100644
--- a/gnu/home/services/shepherd.scm
+++ b/gnu/home/services/shepherd.scm
@@ -18,7 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu home services shepherd)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
   #:use-module (gnu packages admin)
   #:use-module (gnu services shepherd)
   #:use-module (guix sets)
diff --git a/gnu/home/services/symlink-manager.scm b/gnu/home/services/symlink-manager.scm
index d53e8f5046..f4251e1e6a 100644
--- a/gnu/home/services/symlink-manager.scm
+++ b/gnu/home/services/symlink-manager.scm
@@ -18,7 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu home services symlink-manager)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
   #:use-module (guix gexp)
 
   #:export (home-symlink-manager-service-type))
diff --git a/gnu/home/services/xdg.scm b/gnu/home/services/xdg.scm
index 4aed9a5803..453c05ddbf 100644
--- a/gnu/home/services/xdg.scm
+++ b/gnu/home/services/xdg.scm
@@ -20,7 +20,7 @@
 (define-module (gnu home services xdg)
   #:use-module (gnu 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 home services utils)
   #:use-module (guix gexp)
diff --git a/gnu/local.mk b/gnu/local.mk
index bb3063c4ac..ff51c500d4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -74,7 +74,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/bootloader/depthcharge.scm                \
   %D%/ci.scm					\
   %D%/home.scm					\
-  %D%/home-services.scm			\
+  %D%/home/services.scm			\
   %D%/home/services/symlink-manager.scm		\
   %D%/home/services/fontutils.scm		\
   %D%/home/services/configuration.scm		\
diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm
index a4d4aaa562..8656db22c9 100644
--- a/guix/scripts/home.scm
+++ b/guix/scripts/home.scm
@@ -23,7 +23,7 @@
   #:use-module ((gnu services) #:hide (delete))
   #:use-module (gnu packages)
   #:use-module (gnu home)
-  #:use-module (gnu home-services)
+  #:use-module (gnu home services)
   #:use-module (guix channels)
   #:use-module (guix derivations)
   #:use-module (guix ui)
diff --git a/guix/self.scm b/guix/self.scm
index 7bf6003261..61ff423086 100644
--- a/guix/self.scm
+++ b/guix/self.scm
@@ -961,7 +961,7 @@ itself."
   (define *home-modules*
     (scheme-node "guix-home"
                  `((gnu home)
-                   (gnu home-services)
+                   (gnu home services)
                    ,@(scheme-modules* source "gnu/home/services"))
                  (list *core-package-modules* *package-modules*
                        *extra-modules* *core-modules* *system-modules*)