fix(ayase): modernize operating-system* definition

1 files changed, 19 insertions, 19 deletions

diff --git a/systems/ayase.scm b/systems/ayase.scm
index bc10886..36c1343 100644
--- a/systems/ayase.scm
+++ b/systems/ayase.scm
@@ -1,6 +1,16 @@
 (define-module (systems ayase)
+  #:use-module ((gnu system)
+                #:prefix gnu:system:)
+  #:use-module ((nongnu packages linux)
+                #:prefix nongnu:packages:linux:)
+  #:use-module ((nongnu system linux-initrd)
+                #:prefix nongnu:system:linux-initrd:)
+  #:use-module ((suweren commons sudoers)
+                #:prefix suweren:commons:sudoers:)
   #:use-module ((suweren services)
                 #:prefix suweren-services:)
+  #:use-module ((suweren system)
+                #:prefix suweren:system:)
   #:use-module (users id1000))
 
 (define efi-filesystem-uuid
@@ -41,7 +51,7 @@
                     profile-service-type
                     (list grub
                           ibus
-                          ibus-doc
+                          ;; ibus-doc
                           python-pip
                           ruby))))
 
@@ -138,30 +148,20 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(define (operating-system*)
-  (use-modules (nongnu packages linux)
-               (nongnu system linux-initrd)
-               (gnu system keyboard)
-               (suweren commons sudoers)
-               (suweren system))
-  ((@ (gnu system) operating-system)
-   (kernel linux)
+(define-public operating-system*
+  (gnu:system:operating-system
+   (kernel nongnu:packages:linux:linux)
    (bootloader (bootloader))
    (keyboard-layout keyboard-layout)
-   (initrd microcode-initrd)
-   (firmware (list linux-firmware))
+   (initrd nongnu:system:linux-initrd:microcode-initrd)
+   (firmware (list nongnu:packages:linux:linux-firmware))
    (host-name host-name)
    (file-systems (file-systems))
    (swap-devices (list swap-device-1
                        swap-device-2))
    (users (users))
    (timezone "Europe/Warsaw")
-   (locale polish-locale-string)
-   (locale-definitions %suweren-locale-definitions)
+   (locale suweren:system:polish-locale-string)
+   (locale-definitions suweren:system:%suweren-locale-definitions)
    (services services)
-   (sudoers-file %sudoers-specification*)))
-
-(define-public operating-system*
-  (operating-system*))
-
-operating-system*
+   (sudoers-file suweren:commons:sudoers:%sudoers-specification*)))