dotfiles/guixsd/pc0.scm

@@ -196,7 +196,9 @@
   ;; Add services to the baseline: a DHCP client and an SSH
   ;; server.  You may wish to add an NTP service here.
   (services (append (list (service avahi-service-type)
-                          (service dhcp-client-service-type)
+                          (service dhcp-client-service-type
+                                   (dhcp-client-configuration
+                                    (interfaces '("eth0"))))
                           (service openssh-service-type
                                    (openssh-configuration
                                     (openssh openssh-sans-x)
@@ -358,33 +360,29 @@ cgroup_device_acl = [
                                            (respawn? #f)
                                            (stop #~(make-kill-destructor))))))
                     (modify-services
-                        (modify-services
-                            (filter (lambda (service)
-                                      (let ((value (service-value service)))
-                                        (not (and (mingetty-configuration? value)
-                                                  (string= (mingetty-configuration-tty value)
-                                                           "tty2")))))
-                                    (modify-services %base-services
-                                      (guix-service-type config =>
-                                                         (guix-configuration
-                                                          (authorized-keys (append (list (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/guix.wugi.info.pub")
-                                                                                         (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/vm1.wugi.info.pub")
-                                                                                         (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/vm2.wugi.info.pub")
-                                                                                         (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/mirror.brielmaier.net.pub")
-                                                                                         (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/substitutes.nonguix.org.pub")
-                                                                                         (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/bordeaux.guix.gnu.org.pub"))
-                                                                                   %default-authorized-guix-keys))
-                                                          (substitute-urls '("https://guix.wugi.info"
-                                                                             "https://bordeaux.guix.gnu.org"
-                                                                             "https://substitutes.nonguix.org"))))
-                                      ;; (sysctl-service-type _ =>
-                                      ;;                      (sysctl-configuration
-                                      ;;                       (settings (append '(("net.ipv4.ip_forward" . "1")
-                                      ;;                                           ("net.ipv4.conf.all.rp_filter" . "0")
-                                      ;;                                           ("net.ipv4.conf.default.rp_filter" . "0"))
-                                      ;;                                         %default-sysctl-settings))))
-                                      ))
-                          (delete console-font-service-type))
-                      (dhcp-client-service-type config =>
-                                                (dhcp-client-configuration
-                                                 (interfaces '("eth0"))))))))
+                        (filter (lambda (service)
+                                (let ((value (service-value service)))
+                                  (not (and (mingetty-configuration? value)
+                                            (string= (mingetty-configuration-tty value)
+                                                     "tty2")))))
+                              (modify-services %base-services
+                                (guix-service-type config =>
+                                                   (guix-configuration
+                                                    (authorized-keys (append (list (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/guix.wugi.info.pub")
+                                                                                   (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/vm1.wugi.info.pub")
+                                                                                   (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/vm2.wugi.info.pub")
+                                                                                   (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/mirror.brielmaier.net.pub")
+                                                                                   (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/substitutes.nonguix.org.pub")
+                                                                                   (local-file "/home/oleg/.local/share/chezmoi/dotfiles/guixsd/etc/substitutes/bordeaux.guix.gnu.org.pub"))
+                                                                             %default-authorized-guix-keys))
+                                                    (substitute-urls '("https://guix.wugi.info"
+                                                                       "https://bordeaux.guix.gnu.org"
+                                                                       "https://substitutes.nonguix.org"))))
+                                ;; (sysctl-service-type _ =>
+                                ;;                      (sysctl-configuration
+                                ;;                       (settings (append '(("net.ipv4.ip_forward" . "1")
+                                ;;                                           ("net.ipv4.conf.all.rp_filter" . "0")
+                                ;;                                           ("net.ipv4.conf.default.rp_filter" . "0"))
+                                ;;                                         %default-sysctl-settings))))
+                                ))
+                      (delete console-font-service-type)))))