id1000: prefix the (gnu services) module

1 files changed, 21 insertions, 23 deletions

diff --git a/users/id1000.scm b/users/id1000.scm
index a0b718e..30a2a5c 100644
--- a/users/id1000.scm
+++ b/users/id1000.scm
@@ -5,9 +5,7 @@
   #:use-module ((gnu packages disk)             #:prefix gnu:packages:disk:)
   #:use-module ((gnu packages kde)              #:prefix gnu:packages:kde:)
   #:use-module ((gnu packages version-control)  #:prefix gnu:packages:version-control:)
-
-  ;; simple-service
-  #:use-module (gnu services)
+  #:use-module ((gnu services)                  #:prefix gnu:services:)
 
   ;; user-account
   #:use-module ((gnu system accounts)
@@ -227,15 +225,15 @@
                               "/sbin/nologin")))))
 
 (define dkimproxy-out-service-type
-  (service-type
+  (gnu:services:service-type
    (name 'dkimproxy-out)
    (description "stub")
    (extensions
     (list
-     (service-extension
+     (gnu:services:service-extension
       (@ (gnu system shadow) account-service-type)
       (const %dkimproxy-accounts))
-     (service-extension
+     (gnu:services:service-extension
       (@ (gnu services shepherd) shepherd-root-service-type)
       dkimproxy-out-shepherd-service)))))
 
@@ -462,11 +460,11 @@
 ;;;
 
 (define bash
-  (simple-service 'bash-tab-completion
-                  gnu:home:services:shells:home-bash-service-type
-                  (gnu:home:services:shells:home-bash-extension
-                    (bashrc (list (plain-file "tab-completion"
-                                              "bind 'set disable-completion on'"))))))
+  (gnu:services:simple-service 'bash-tab-completion
+                               gnu:home:services:shells:home-bash-service-type
+                               (gnu:home:services:shells:home-bash-extension
+                               (bashrc (list (plain-file "tab-completion"
+                                                         "bind 'set disable-completion on'"))))))
 
 (define dkimproxy-out-configuration*
   (dkimproxy-out-configuration
@@ -507,15 +505,15 @@
 ;;;
 
 (define-public dkim-service
-  (service dkimproxy-out-service-type
+  (gnu:services:service dkimproxy-out-service-type
 	   dkimproxy-out-configuration*))
 
 (define-public dovecot-service
-  (service (@ (gnu services mail) dovecot-service-type)
+  (gnu:services:service (@ (gnu services mail) dovecot-service-type)
 	   dovecot-configuration*))
 
 (define-public smtp-service
-  (service (@ (gnu services mail) opensmtpd-service-type)
+  (gnu:services:service (@ (gnu services mail) opensmtpd-service-type)
 	   opensmtpd-configuration*))
 
 (define-public uid1000-name
@@ -544,15 +542,15 @@
         (git-packages (list gnu:packages:version-control:git))
         (packages (list gnu:packages:disk:gparted
                         gnu:packages:kde:okular))
-        (git-configuration (simple-service 'git-configuration
-                                           gnu:home:services:home-xdg-configuration-files-service-type
-                                           git-configuration-files))
-        (git-software (simple-service 'git-packages
-                                      gnu:home:services:home-profile-service-type
-                                      git-packages))
-        (profile (simple-service 'user-packages
-                                 gnu:home:services:home-profile-service-type
-                                 packages))
+        (git-configuration (gnu:services:simple-service 'git-configuration
+                                                        gnu:home:services:home-xdg-configuration-files-service-type
+                                                        git-configuration-files))
+        (git-software (gnu:services:simple-service 'git-packages
+                                                   gnu:home:services:home-profile-service-type
+                                                   git-packages))
+        (profile (gnu:services:simple-service 'user-packages
+                                              gnu:home:services:home-profile-service-type
+                                              packages))
         (%suweren-home-services* (%suweren-home-services host-name*))
         (user-services (list bash
                              git-configuration