rakan: reformat system definitionHEADtestmaster

The system definition was jumbled up in a single let* call, with doubled spaces and deep nesting.

This commit reshapes the definition in accordance with my newest formatting standard.

* deployment/systems/rakan.scm (operating-system): do this.

1 files changed, 40 insertions, 37 deletions

diff --git a/deployment/systems/rakan.scm b/deployment/systems/rakan.scm
index a9a0c54..a442c22 100644
--- a/deployment/systems/rakan.scm
+++ b/deployment/systems/rakan.scm
@@ -100,46 +100,49 @@
     samba-configuration))
 
 (define system
-  (let*
-    ( (l-guix-homes         (list users:id1000:name/home-environment))
-      (l-guix-home-service  (sovereign:systems:guix-home-service  l-guix-homes))
-      (l-bootloader         (sovereign:devices:amd64:custom-bootloader-configuration  system-name))
-      (l-file-systems       (cons*  file-system-root
-                                    file-system-efi
-                                    gnu:system:file-systems:%base-file-systems))
-      (l-firmware           (list nongnu:packages:linux:linux-firmware))
-      (l-initrd-modules     (cons*  "mei_me"
-                                    gnu:system:linux-initrd:%base-initrd-modules))
-      (l-services           (cons*  l-guix-home-service
+  (let
+    ( (l-bootloader     (sovereign:devices:amd64:custom-bootloader-configuration system-name))
+      (l-file-systems   (cons* file-system-root
+                               file-system-efi
+                               gnu:system:file-systems:%base-file-systems))
+      (l-firmware       (list nongnu:packages:linux:linux-firmware))
+      (l-guix-homes     (list users:id1000:name/home-environment))
+      (l-initrd-modules (cons* "mei_me"
+                               gnu:system:linux-initrd:%base-initrd-modules))
+      (l-offload-auth   (gnu:services:simple-service 'offload-authorizations
+                                                     gnu:services:base:guix-service-type
+                                                     guix-offload-authorizations))
+      (l-openssh        (gnu:services:service gnu:services:ssh:openssh-service-type))
+      (l-swap-devices   (list swap))
+      (l-users          (cons* users:id1000:uid1000-account
+                               gnu:system:shadow:%base-user-accounts)))
+    (let*
+      ( (l-guix-home-service (sovereign:systems:guix-home-service l-guix-homes))
+        (l-services          (cons* l-guix-home-service
                                     guix-publish-service
-                                    (gnu:services:simple-service 'offload-authorizations
-                                                                 gnu:services:base:guix-service-type
-                                                                 guix-offload-authorizations)
-                                    (gnu:services:service gnu:services:ssh:openssh-service-type)
+                                    l-offload-auth
+                                    l-openssh
                                     sovereign:packages:protonmail:nogui-profile
                                     samba-service
-                                    sovereign:systems:%sovereign-services))
-      (l-swap-devices       (list swap))
-      (l-users              (cons*  users:id1000:uid1000-account
-                                    gnu:system:shadow:%base-user-accounts)))
-    (gnu:system:operating-system
-      (kernel             nongnu:packages:linux:linux)
-      (bootloader         l-bootloader)
-      (label              (sovereign:systems:operating-system-label* system-name
-                                                                     gnu:system:this-operating-system))
-      (keyboard-layout    sovereign:devices:pl-keyboard-layout)
-      (initrd             nongnu:system:linux-initrd:microcode-initrd)
-      (initrd-modules     l-initrd-modules)
-      (firmware           l-firmware)
-      (host-name          system-name)
-      (file-systems       l-file-systems)
-      (swap-devices       l-swap-devices)
-      (users              l-users)
-      (timezone           "Europe/Warsaw")
-      (locale             sovereign:systems:pl-locale)
-      (locale-definitions sovereign:systems:%sovereign-locale-definitions)
-      (services           l-services)
-      (sudoers-file       sovereign:systems:%sovereign-sudoers-specification))))
+                                    sovereign:systems:%sovereign-services)))
+      (gnu:system:operating-system
+        (kernel             nongnu:packages:linux:linux)
+        (bootloader         l-bootloader)
+        (label              (sovereign:systems:operating-system-label* system-name
+                                                                       gnu:system:this-operating-system))
+        (keyboard-layout    sovereign:devices:pl-keyboard-layout)
+        (initrd             nongnu:system:linux-initrd:microcode-initrd)
+        (initrd-modules     l-initrd-modules)
+        (firmware           l-firmware)
+        (host-name          system-name)
+        (file-systems       l-file-systems)
+        (swap-devices       l-swap-devices)
+        (users              l-users)
+        (timezone           "Europe/Warsaw")
+        (locale             sovereign:systems:pl-locale)
+        (locale-definitions sovereign:systems:%sovereign-locale-definitions)
+        (services           l-services)
+        (sudoers-file       sovereign:systems:%sovereign-sudoers-specification)))))
 
 (define-public operating-system*
   system)