Rearrange the literate layout of the code

2 files changed, 43 insertions, 49 deletions

diff --git a/aisaka.org b/aisaka.org
index d6cac55..3b8af7c 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -65,7 +65,8 @@ https://guix.gnu.org/en/manual/en/html_node/System-Configuration.html
         "nss-certs"
         "ntfs-3g"))
      %base-packages))
-   <<system-services>>
+   (services
+    <<system-services>>)
    (bootloader (bootloader-configuration (bootloader grub-bootloader)
                                          (targets '("/dev/sda"))
                                          (keyboard-layout keyboard-layout)))
@@ -87,34 +88,33 @@ https://guix.gnu.org/en/manual/en/html_node/System-Configuration.html
 https://guix.gnu.org/en/manual/en/html_node/Services.html
 
 #+begin_src scheme :noweb-ref system-services
-  (services
-   (append
+  (append
+   (list
+    <<ssh-system-service>>
     <<system-base-services>>
-    (list
-     <<ssh-system-service>>
-     <<trezor-system-packages>>
-     (service
-      cups-service-type
-      (cups-configuration
-       (extensions
-        (list
-         cups-filters
-         epson-inkjet-printer-escpr))
-       (web-interface? #t)))
-     (service git-daemon-service-type)
-     (service gnome-desktop-service-type)
-     (service
-      tor-service-type
-      (tor-configuration
-       (control-socket? #t))))
-    (modify-services
-     %desktop-services
-     (elogind-service-type
-      configuration =>
-      (elogind-configuration
-       (inherit configuration)
-       (handle-lid-switch 'ignore)))
-     (delete guix-service-type))))
+    <<trezor-system-packages>>
+    (service
+     cups-service-type
+     (cups-configuration
+      (extensions
+       (list
+        cups-filters
+        epson-inkjet-printer-escpr))
+      (web-interface? #t)))
+    (service git-daemon-service-type)
+    (service gnome-desktop-service-type)
+    (service
+     tor-service-type
+     (tor-configuration
+      (control-socket? #t))))
+   (modify-services
+    %desktop-services
+    (elogind-service-type
+     configuration =>
+     (elogind-configuration
+      (inherit configuration)
+      (handle-lid-switch 'ignore)))
+    (delete guix-service-type)))
 #+end_src
 
 **** TODO Base Services
@@ -122,16 +122,13 @@ https://guix.gnu.org/en/manual/en/html_node/Services.html
 https://guix.gnu.org/en/manual/en/html_node/Base-Services.html
 
 #+begin_src scheme :noweb-ref system-base-services
-  (append
-   (list
-    <<trezor-udev-rules>>)
-   (list
-    (service
-     guix-service-type
-     (guix-configuration
-      (extra-options
-       (list
-        <<guix-options>>))))))
+  <<trezor-udev-rules>>
+  (service
+   guix-service-type
+   (guix-configuration
+    (extra-options
+     (list
+      <<guix-options>>))))
 #+end_src
 
 ** TODO Home configuration
diff --git a/system-configuration.scm b/system-configuration.scm
index 4dff289..0e29b0d 100644
--- a/system-configuration.scm
+++ b/system-configuration.scm
@@ -41,19 +41,16 @@
    %base-packages))
  (services
   (append
-   (append
-    (list
-     (udev-rules-service 'trezord trezord-udev-rules))
-    (list
-     (service
-      guix-service-type
-      (guix-configuration
-       (extra-options
-        (list
-         "--gc-keep-derivations=yes"
-         "--gc-keep-outputs=yes"))))))
    (list
     (service openssh-service-type)
+    (udev-rules-service 'trezord trezord-udev-rules)
+    (service
+     guix-service-type
+     (guix-configuration
+      (extra-options
+       (list
+        "--gc-keep-derivations=yes"
+        "--gc-keep-outputs=yes"))))
     (service
      (service-type
       (name 'trezor-system-packages)