rewrite: apply guix-reference formatting; cleanup some module imports

1 files changed, 63 insertions, 60 deletions

diff --git a/px/system/config.scm b/px/system/config.scm
index 6ec4f4c..ee27e77 100644
--- a/px/system/config.scm
+++ b/px/system/config.scm
@@ -26,49 +26,50 @@
             px-desktop-os
             px-desktop-ee-os
             px-new-desktop
-            
+
             px-server-os
             px-server-ee-os
 
             px-core-arm-os
             px-gui-arm-os
             px-desktop-arm-os
-            
+
             %px-server-open-ports-common)
 
-;; Re-export for convenience
-#:re-export (%px-core-services
+  ;; Re-export for convenience
+  #:re-export (%px-core-services
 
-              px-desktop-service-type
+                px-desktop-service-type
 
-              %px-desktop-services
-              %px-desktop-ee-services
+                %px-desktop-services
+                %px-desktop-ee-services
 
-              %px-server-services
-              %px-server-ee-services
-              
-              %px-core-arm-services
-              %px-gui-arm-services
-              %px-desktop-arm-services
+                %px-server-services
+                %px-server-ee-services
 
-              %px-core-packages
+                %px-core-arm-services
+                %px-gui-arm-services
+                %px-desktop-arm-services
 
-              %px-desktop-packages-gtk
-              %px-desktop-packages-qt
-              %px-desktop-packages
-              %px-desktop-ee-packages
+                %px-core-packages
 
-              %px-server-packages
-              %px-server-ee-packages
-              %px-core-arm-packages
-              %px-gui-arm-packages))
+                %px-desktop-packages-gtk
+                %px-desktop-packages-qt
+                %px-desktop-packages
+                %px-desktop-ee-packages
+
+                %px-server-packages
+                %px-server-ee-packages
+                %px-core-arm-packages
+                %px-gui-arm-packages))
 
 ;;;
 ;;; PantherX Desktop OS defintions
 ;;;
 
 (define %px-desktop-swap-devices
-  (list (swap-space (target "/swapfile"))))
+  (list (swap-space
+          (target "/swapfile"))))
 
 (define %px-server-open-ports-common
   '(("tcp" "ssh" "http" "https")))
@@ -77,8 +78,8 @@
 ;;; CORE
 ;;;
 
-(define* (px-core-os os-config #:key
-                     (kernel 'libre)
+(define* (px-core-os os-config
+                     #:key (kernel 'libre)
                      (templates '())
                      (open-ports #f)
                      (authorized-keys '()))
@@ -95,15 +96,15 @@
 ;;; DESKTOP
 ;;;
 
-(define* (px-desktop-os os-config #:key
-                        (kernel 'nonlibre)
+(define* (px-desktop-os os-config
+                        #:key (kernel 'nonlibre)
                         (templates '())
                         (open-ports #f)
                         (authorized-keys '()))
   (make-os (operating-system
-            (inherit os-config)
-            (swap-devices
-              (prepare-swap-devices os-config %px-desktop-swap-devices)))
+             (inherit os-config)
+             (swap-devices (prepare-swap-devices os-config
+                                                 %px-desktop-swap-devices)))
            #:kernel kernel
            #:open-ports open-ports
            #:authorized-keys authorized-keys
@@ -111,15 +112,15 @@
            #:default-packages %px-desktop-packages
            #:default-services %px-desktop-services))
 
-(define* (px-desktop-ee-os os-config #:key
-                           (kernel 'nonlibre)
+(define* (px-desktop-ee-os os-config
+                           #:key (kernel 'nonlibre)
                            (templates '())
                            (open-ports #f)
                            (authorized-keys '()))
   (make-os (operating-system
-            (inherit os-config)
-            (swap-devices 
-              (prepare-swap-devices os-config %px-desktop-swap-devices)))
+             (inherit os-config)
+             (swap-devices (prepare-swap-devices os-config
+                                                 %px-desktop-swap-devices)))
            #:kernel kernel
            #:open-ports open-ports
            #:authorized-keys authorized-keys
@@ -127,8 +128,8 @@
            #:default-packages %px-desktop-ee-packages
            #:default-services %px-desktop-ee-services))
 
-(define* (px-new-desktop os-config #:key
-                         (kernel 'nonlibre)
+(define* (px-new-desktop os-config
+                         #:key (kernel 'nonlibre)
                          (open-ports #f)
                          (authorized-keys '())
                          (templates '()))
@@ -144,8 +145,8 @@
 ;;; SERVER
 ;;;
 
-(define* (px-server-os os-config #:key
-                       (kernel 'libre)
+(define* (px-server-os os-config
+                       #:key (kernel 'libre)
                        (templates '())
                        (open-ports %px-server-open-ports-common)
                        (authorized-keys '()))
@@ -157,8 +158,8 @@
            #:default-packages %px-server-packages
            #:default-services %px-server-services))
 
-(define* (px-server-ee-os os-config #:key
-                          (kernel 'libre)
+(define* (px-server-ee-os os-config
+                          #:key (kernel 'libre)
                           (templates '())
                           (open-ports %px-server-open-ports-common)
                           (authorized-keys '()))
@@ -170,7 +171,6 @@
            #:default-packages %px-server-ee-packages
            #:default-services %px-server-ee-services))
 
-
 ;;;
 ;;; ARM
 ;;;
@@ -180,28 +180,27 @@
     (host-name "pantherx")
     (timezone "Europe/Berlin")
     (locale "en_US.utf8")
-    
+
     (bootloader (bootloader-configuration
-	                (bootloader  u-boot-bootloader)
-		              (targets '("/dev/vda"))))
-    
+                  (bootloader u-boot-bootloader)
+                  (targets '("/dev/vda"))))
+
     (file-systems (cons (file-system
                           (device "/dev/sda1")
                           (mount-point "/")
-                          (type "ext4"))
-                         %base-file-systems))
-    
+                          (type "ext4")) %base-file-systems))
+
     (users (cons* (user-account
                     (name "panther")
                     (comment "default user")
                     (group "users")
                     (password (crypt "pantherx" "$6$abc"))
-                    (supplementary-groups '("wheel" "netdev" "lp"
-                                            "video" "audio")))
-                  %base-user-accounts))
+                    (supplementary-groups '("wheel" "netdev" "lp" "video"
+                                            "audio"))) %base-user-accounts))
 
     (packages %px-core-arm-packages)
-    (services %px-core-arm-services)
+    (services
+     %px-core-arm-services)
     (name-service-switch %mdns-host-lookup-nss)))
 
 (define px-gui-arm-os
@@ -209,15 +208,19 @@
     (inherit px-core-arm-os)
     (host-name "pantherx")
     (packages %px-gui-arm-packages)
-    (services %px-gui-arm-services)))
+    (services
+     %px-gui-arm-services)))
 
 (define (px-desktop-arm-os os-config)
-  (let ((selected-packages (prepare-packages os-config %px-desktop-arm-packages))
-        (selected-services (prepare-services os-config %px-desktop-arm-services)))
+  (let ((selected-packages (prepare-packages os-config
+                                             %px-desktop-arm-packages))
+        (selected-services (prepare-services os-config
+                                             %px-desktop-arm-services)))
     (operating-system
-     (inherit os-config)
+      (inherit os-config)
 
-     (packages selected-packages)
-     (services selected-services)
+      (packages selected-packages)
+      (services
+       selected-services)
 
-     (name-service-switch %mdns-host-lookup-nss))))
\ No newline at end of file
+      (name-service-switch %mdns-host-lookup-nss))))