(deployment systems rakan): disambiguate definition of system

1 files changed, 48 insertions, 27 deletions

diff --git a/deployment/systems/rakan.scm b/deployment/systems/rakan.scm
index df972e6..d1690b0 100644
--- a/deployment/systems/rakan.scm
+++ b/deployment/systems/rakan.scm
@@ -27,6 +27,12 @@
                  #:prefix gnu:system:file-systems:)
   #: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)
@@ -198,33 +204,48 @@
 
 (define system
   (gnu:system:operating-system
-   (kernel             nongnu:packages:linux:linux)
-   (bootloader         (sovereign:devices:amd64:custom-bootloader-configuration system-name))
-   (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     (cons* "mei_me"
-                              gnu:system:linux-initrd:%base-initrd-modules))
-   (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))
-   (swap-devices       (list swap))
-   (users              (cons* users:id1000:uid1000-account
-                              gnu:system:shadow:%base-user-accounts))
-   (timezone           "Europe/Warsaw")
-   (locale             sovereign:systems:pl-locale)
-   (locale-definitions sovereign:systems:%sovereign-locale-definitions)
-   (services           (cons* guix-home-service
-                              guix-publish-service
-                              offload-auth
-                              openssh-service
-                              sovereign:packages:protonmail:nogui-profile
-                              samba-service
-                              sovereign:systems:%sovereign-services))
-   (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              (sovereign:devices:amd64:custom-bootloader-configuration system-name))
+   (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          (cons* "mei_me"
+                                   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 swap))
+   (users                   (cons* users:id1000:uid1000-account
+                                   gnu:system:shadow:%base-user-accounts))
+   (groups                  gnu:system:shadow:%base-groups)
+   (skeletons               (gnu:system:shadow:default-skeletons))
+   (issue                   (@@ (gnu system) %default-issue))
+   (packages                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* guix-home-service
+                                   guix-publish-service
+                                   offload-auth
+                                   openssh-service
+                                   sovereign:packages:protonmail:nogui-profile
+                                   samba-service
+                                   sovereign:systems:%sovereign-services))
+   (pam-services            (gnu:system:pam:base-pam-services))
+   (privileged-programs     gnu:system:%default-privileged-programs)
+   (sudoers-file            sovereign:systems:%sovereign-sudoers-specification)
+   (location                gnu:system:operating-system-location)))
 
 (define-public operating-system*
   system)