config/guix/system/desktop-bababa: Use use-service-modules and use-package-modules.

.config/guix/system/desktop-bababa.scm

@@ -3,17 +3,21 @@
 (define-module (desktop-bababa)
   #:use-module (default)
   #:use-module (nongnu packages linux)
+  #:use-module (gnu)
   #:use-module (gnu system)
-  #:use-module (gnu bootloader)
-  #:use-module (gnu bootloader grub)
-  #:use-module (gnu packages linux)
-  #:use-module (gnu packages package-management) ; For `nix'.
-  #:use-module (gnu services)
-  #:use-module (gnu services nix)
-  #:use-module (gnu services docker)    ; REVIEW: Needs 'modprobe overlay'?
-  #:use-module (gnu system file-systems)
-  ;; For libvirt
-  #:use-module (gnu services virtualization))
+  #:use-module (gnu services))
+
+(use-service-modules
+ nix
+ docker                                 ; REVIEW: Needs 'modprobe overlay'?
+ databases                              ; PostgreSQL
+ ;; libvirt:
+ virtualization)
+
+(use-package-modules
+ linux
+ ;; nix:
+ package-management)
 
 (define %bababa/services
   (cons*
@@ -66,5 +70,7 @@
              (service libvirt-service-type
                       (libvirt-configuration
                        (unix-sock-group "kvm")))
+             ;; TODO: Might need 9.6 for Iroha.
+             (postgresql-service)
              (service docker-service-type)
              %bababa/services)))