Split away the system services

2 files changed, 60 insertions, 50 deletions

diff --git a/aisaka.org b/aisaka.org
index 838884a..806e1a0 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -5,11 +5,11 @@
 
 * TODO Guix
 
-https://guix.gnu.org/en/manual/devel/en/html_node/
+https://guix.gnu.org/en/manual/en/html_node/
 
 ** TODO System configuration
 
-https://guix.gnu.org/en/manual/devel/en/html_node/System-Configuration.html
+https://guix.gnu.org/en/manual/en/html_node/System-Configuration.html
 
 #+begin_src scheme :noweb-ref system-dump :tangle system-configuration.scm
   (add-to-load-path "./services")
@@ -52,24 +52,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/System-Configuration.html
         "nss-certs"
         "ntfs-3g"))
      %base-packages))
-   (services (cons*
-              <<ssh-system-service>>
-              <<trezor-system-packages>>
-              (service cups-service-type
-                       (cups-configuration (extensions `(,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)))
-              <<trezor-udev-rules>>
-              (modify-services %desktop-services
-                               (elogind-service-type
-                                configuration =>
-                                (elogind-configuration
-                                 (inherit configuration)
-                                 (handle-lid-switch 'ignore))))))
+   <<system-services>>
    (bootloader (bootloader-configuration (bootloader grub-bootloader)
                                          (targets '("/dev/sda"))
                                          (keyboard-layout keyboard-layout)))
@@ -86,6 +69,32 @@ https://guix.gnu.org/en/manual/devel/en/html_node/System-Configuration.html
              <<bootfs>>))))
 #+end_src
 
+*** TODO Services
+
+https://guix.gnu.org/en/manual/en/html_node/Services.html
+
+#+begin_src scheme :noweb-ref system-services
+  (services
+   (cons*
+    <<ssh-system-service>>
+    <<trezor-system-packages>>
+    (service cups-service-type
+             (cups-configuration (extensions `(,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)))
+    <<trezor-udev-rules>>
+    (modify-services %desktop-services
+                     (elogind-service-type
+                      configuration =>
+                      (elogind-configuration
+                       (inherit configuration)
+                       (handle-lid-switch 'ignore))))))
+#+end_src
+
 ** TODO Home configuration
 
 https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
diff --git a/system-configuration.scm b/system-configuration.scm
index 8108132..f29ac61 100644
--- a/system-configuration.scm
+++ b/system-configuration.scm
@@ -39,36 +39,37 @@
       "nss-certs"
       "ntfs-3g"))
    %base-packages))
- (services (cons*
-            (service openssh-service-type)
-            (service
-             (service-type
-              (name 'trezor-system-packages)
-              (extensions
-               (list
-                (service-extension profile-service-type
-                                   (lambda (_)
-                                     (map specification->package
-                                          (list
-                                           "trezord"
-                                           "trezord-udev-rules"))))))
-              (description "TrezorD packages needed by the system.")
-              (default-value #f)))
-            (service cups-service-type
-                     (cups-configuration (extensions `(,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)))
-            (udev-rules-service 'trezord trezord-udev-rules)
-            (modify-services %desktop-services
-                             (elogind-service-type
-                              configuration =>
-                              (elogind-configuration
-                               (inherit configuration)
-                               (handle-lid-switch 'ignore))))))
+ (services
+  (cons*
+   (service openssh-service-type)
+   (service
+    (service-type
+     (name 'trezor-system-packages)
+     (extensions
+      (list
+       (service-extension profile-service-type
+                          (lambda (_)
+                            (map specification->package
+                                 (list
+                                  "trezord"
+                                  "trezord-udev-rules"))))))
+     (description "TrezorD packages needed by the system.")
+     (default-value #f)))
+   (service cups-service-type
+            (cups-configuration (extensions `(,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)))
+   (udev-rules-service 'trezord trezord-udev-rules)
+   (modify-services %desktop-services
+                    (elogind-service-type
+                     configuration =>
+                     (elogind-configuration
+                      (inherit configuration)
+                      (handle-lid-switch 'ignore))))))
  (bootloader (bootloader-configuration (bootloader grub-bootloader)
                                        (targets '("/dev/sda"))
                                        (keyboard-layout keyboard-layout)))