(deployment systems aisaka): disambiguate system definition

1 files changed, 65 insertions, 55 deletions

diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm
index 230ff32..0ee22fe 100644
--- a/deployment/systems/aisaka.scm
+++ b/deployment/systems/aisaka.scm
@@ -47,6 +47,14 @@
                 #:prefix gnu:system:file-systems:)
   #:use-module ((gnu system keyboard)
                 #:prefix gnu:system:keyboard:)
+  #:use-module ((gnu system linux-initrd)
+                #:prefix gnu:system:linux-initrd:)
+  #:use-module ((gnu system locale)
+                #:prefix gnu:system:locale:)
+  #:use-module ((gnu system nss)
+                #:prefix gnu:system:nss:)
+  #:use-module ((gnu system pam)
+                #:prefix gnu:system:pam:)
   #:use-module ((gnu system shadow)
                 #:prefix gnu:system:shadow:)
   #:use-module ((nongnu packages linux)
@@ -689,62 +697,64 @@
 (define guix-home-service
   (sovereign:systems:guix-home-service home-environments))
 
-(define (modify-essential-services operating-system)
-  (let
-      ((default-essential-services (gnu:system:operating-system-default-essential-services operating-system)))
-    (gnu:services:modify-services default-essential-services
-     (gnu:services:base:hosts-service-type config
-                                           =>
-                                           (list
-                                            (gnu:services:base:host "127.0.0.1"
-                                                                    "marekpasnikowski.pl"
-                                                                    (list "localhost"))
-                                            (gnu:services:base:host "::1"
-                                                                    "localhost"))))))
-
 (define-public system
   (gnu:system:operating-system
-   (bootloader         system-bootloader)
-   (label              (sovereign:systems:operating-system-label* system-name
-                                                                  gnu:system:this-operating-system))
-   (kernel             nongnu:packages:linux:linux)
-   (keyboard-layout    system-keyboard-layout)
-   (initrd             nongnu:system:linux-initrd:microcode-initrd)
-   (firmware           (list nongnu:packages:linux:linux-firmware))
-   (host-name          system-name)
-   (file-systems       (cons* file-system-root
-                              file-system-efi
-                              gnu:system:file-systems:%base-file-systems))
-   (users              (cons* users:id1000:uid1000-account
-                              users:vmail:vmail-account
-                              gnu:system:shadow:%base-user-accounts))
-   (groups             (cons* vmail-group
-                              gnu:system:shadow:%base-groups))
-   (packages           (cons* sovereign:packages:jekyll:custom-jekyll
-                              gnu:packages:tls:openssl
-                              gnu:packages:matrix:synapse
-                              gnu:system:%base-packages))
-   (timezone           "Europe/Warsaw")
-   (locale             sovereign:systems:pl-locale)
-   (locale-definitions sovereign:systems:%sovereign-locale-definitions)
-   (services           (cons* users:id1000:dkim-service
-                              users:id1000:dovecot-service
-                              users:id1000:smtp-service
-                              knot
-                              certbot
-                              cgit
-                              etc
-                              fcgiwrap
-                              gitolite
-                              guix-home-service
-                              nginx
-                              offload-rakan
-                              openssh
-                              radicale
-                              static-networking
-                              iproute2-networking
-                              %sovereign-services*))
-   (essential-services (modify-essential-services gnu:system:this-operating-system))
-   (sudoers-file       sovereign:systems:%sovereign-sudoers-specification)))
+   (kernel                  nongnu:packages:linux:linux)
+   (kernel-loadable-modules (list))
+   (kernel-arguments        gnu:system:%default-kernel-arguments)
+   (hurd                    #f)
+   (bootloader              system-bootloader)
+   (label                   (sovereign:systems:operating-system-label* system-name
+                                                                       gnu:system:this-operating-system))
+   (keyboard-layout         system-keyboard-layout)
+   (initrd                  nongnu:system:linux-initrd:microcode-initrd)
+   (initrd-modules          gnu:system:linux-initrd:%base-initrd-modules)
+   (firmware                (list nongnu:packages:linux:linux-firmware))
+   (host-name               system-name)
+   (hosts-file              #f)
+   (mapped-devices          (list))
+   (file-systems            (cons* file-system-root
+                                   file-system-efi
+                                   gnu:system:file-systems:%base-file-systems))
+   (swap-devices            (list))
+   (users                   (cons* users:id1000:uid1000-account
+                                   users:vmail:vmail-account
+                                   gnu:system:shadow:%base-user-accounts))
+   (groups                  (cons* vmail-group
+                                   gnu:system:shadow:%base-groups))
+   (skeletons               (gnu:system:shadow:default-skeletons))
+   (issue                   (@@ (gnu system) %default-issue))
+   (packages                (cons* sovereign:packages:jekyll:custom-jekyll
+                                   gnu:packages:tls:openssl
+                                   gnu:packages:matrix:synapse
+                                   gnu:system:%base-packages))
+   (timezone                "Europe/Warsaw")
+   (locale                  sovereign:systems:pl-locale)
+   (locale-definitions      sovereign:systems:%sovereign-locale-definitions)
+   (locale-libcs            gnu:system:locale:%default-locale-libcs)
+   (name-service-switch     gnu:system:nss:%default-nss)
+   (essential-services      (gnu:system:operating-system-default-essential-services gnu:system:this-operating-system))
+   (services                (cons* users:id1000:dkim-service
+                                   users:id1000:dovecot-service
+                                   users:id1000:smtp-service
+                                   knot
+                                   certbot
+                                   cgit
+                                   etc
+                                   fcgiwrap
+                                   gitolite
+                                   guix-home-service
+                                   nginx
+                                   offload-rakan
+                                   openssh
+                                   radicale
+                                   static-networking
+                                   iproute2-networking
+                                   %sovereign-services*))
+   (pam-services            (gnu:system:pam:base-pam-services))
+   (privileged-programs     gnu:system:%default-privileged-programs)
+   (setuid-programs         gnu:system:%setuid-programs)
+   (sudoers-file            sovereign:systems:%sovereign-sudoers-specification)
+   (location                gnu:system:operating-system-location)))
 
 (define-public operating-system* system)