(deployment systems akashi): disambiguate definition of system

1 files changed, 49 insertions, 18 deletions

diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm
index 31297cf..9f490c6 100644
--- a/deployment/systems/akashi.scm
+++ b/deployment/systems/akashi.scm
@@ -18,6 +18,16 @@
                 #:prefix gnu:system:)
   #:use-module ((gnu system file-systems)
                 #: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 ((machines thinkpad-x200)
                 #:prefix machines:thinkpad-x200:)
   #:use-module ((sovereign systems)
@@ -77,22 +87,43 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define-public operating-system*
+(define-public system
   (gnu:system:operating-system
-   (kernel             gnu:packages:linux:linux-libre)
-   (kernel-arguments   (cons* "thinkpad_acpi.fan_control=1"
-                              "thinkpad_acpi.fan='level 7'"
-                              gnu:system:%default-kernel-arguments))
-   (bootloader         (machines:thinkpad-x200:bootloader-configuration* keyboard-layout*))
-   (label              (sovereign:systems:operating-system-label* host-name*
-                                                                  gnu:system:this-operating-system))
-   (keyboard-layout    keyboard-layout*)
-   (host-name          host-name*)
-   (file-systems       (file-systems))
-   (swap-devices       (machines:thinkpad-x200:swap-devices* host-name*))
-   (users              users)
-   (timezone           "Europe/Warsaw")
-   (locale             sovereign:systems:pl-locale)
-   (locale-definitions sovereign:systems:%sovereign-locale-definitions)
-   (services           (services))
-   (sudoers-file       sovereign:systems:%sovereign-sudoers-specification)))
+   (kernel                  gnu:packages:linux:linux-libre)
+   (kernel-loadable-modules (list))
+   (kernel-arguments        (cons* "thinkpad_acpi.fan_control=1"
+                                   "thinkpad_acpi.fan='level 7'"
+                                   gnu:system:%default-kernel-arguments))
+   (hurd                    #f)
+   (bootloader              (machines:thinkpad-x200:bootloader-configuration* keyboard-layout*))
+   (label                   (sovereign:systems:operating-system-label* host-name*
+                                                                       gnu:system:this-operating-system))
+   (keyboard-layout         keyboard-layout*)
+   (initrd                  gnu:system:linux-initrd:base-initrd)
+   (initrd-modules          gnu:system:linux-initrd:%base-initrd-modules)
+   (firmware                (list))
+   (host-name               host-name*)
+   (hosts-file              #f)
+   (mapped-devices          (list))
+   (file-systems            (file-systems))
+   (swap-devices            (machines:thinkpad-x200:swap-devices* host-name*))
+   (users                   users)
+   (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                (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)