px: Simplify system configuration; add docs

2 files changed, 40 insertions, 46 deletions

diff --git a/px/system/config.scm b/px/system/config.scm
index e2c2f30..85a4b1c 100644
--- a/px/system/config.scm
+++ b/px/system/config.scm
@@ -22,8 +22,8 @@
   #:use-module (guix gexp)
   #:use-module (guix channels)
   #:use-module (srfi srfi-1)
-  #:export (px-core-os
 
+  #:export (px-core-os 
             px-desktop-os
             px-desktop-ee-os
 
@@ -34,25 +34,24 @@
             %default-pantherx-channel)
 
   ;; Re-export for convenience
-  #:re-export (%px-core-services
+  #:re-export (%px-core-services 
+               %px-desktop-minmal-services
+               %px-desktop-services
+               %px-desktop-ee-services
 
-                %px-desktop-core-services
-                %px-desktop-services
-                %px-desktop-ee-services
+               %px-server-services
+               %px-server-ee-services
 
-                %px-server-services
-                %px-server-ee-services
+               %px-core-packages
 
-                %px-core-packages
+               %px-desktop-core-packages
+               %px-desktop-packages-gtk
+               %px-desktop-packages-qt
+               %px-desktop-packages
+               %px-desktop-ee-packages
 
-			    %px-desktop-core-packages
-                %px-desktop-packages-gtk
-                %px-desktop-packages-qt
-                %px-desktop-packages
-                %px-desktop-ee-packages
-
-                %px-server-packages
-                %px-server-ee-packages))
+               %px-server-packages
+               %px-server-ee-packages))
 
 ;;;
 ;;; PantherX Desktop OS defintions
@@ -68,14 +67,13 @@
 ;; For use in unattended-upgrade-service-type
 (define %default-pantherx-channel
   (channel
-   (name 'pantherx)
-   (branch "master")
-   (url "https://channels.pantherx.org/git/panther.git")
-   (introduction
-    (make-channel-introduction
-     "54b4056ac571611892c743b65f4c47dc298c49da"
-     (openpgp-fingerprint
-      "A36A D41E ECC7 A871 1003  5D24 524F EB1A 9D33 C9CB")))))
+    (name 'pantherx)
+    (branch "master")
+    (url "https://channels.pantherx.org/git/panther.git")
+    (introduction
+     (make-channel-introduction "54b4056ac571611892c743b65f4c47dc298c49da"
+                                (openpgp-fingerprint
+                                 "A36A D41E ECC7 A871 1003  5D24 524F EB1A 9D33 C9CB")))))
 
 ;;;
 ;;; CORE
@@ -159,4 +157,4 @@
            #:authorized-keys authorized-keys
            #:templates templates
            #:default-packages %px-server-ee-packages
-           #:default-services %px-server-ee-services))
\ No newline at end of file
+           #:default-services %px-server-ee-services))
diff --git a/px/system/os.scm b/px/system/os.scm
index 26b5a2b..4383928 100644
--- a/px/system/os.scm
+++ b/px/system/os.scm
@@ -19,24 +19,22 @@
   #:use-module (guix records)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
-  #:export (make-os
+  
+  #:export (make-os 
             os-template
             os-template-service
 
-            ;; used in px system config
             prepare-packages
             prepare-services
             prepare-swap-devices
 
-            ;; used in ee repo
             adjust-bootloader-theme
-
-            ;; This is not used anywhere
-            ;; %px-artwork-repository
-            ;; %px-grub-theme
             
-            ;; %px-substitute-server-url
-            ;; %px-substitute-server-key
+            %px-substitute-server-key
+            %nonguix-substitute-server-key
+            %px-substitute-server-key
+            %nonguix-substitute-server-key
+
             apply-px-substitute-server))
 
 ;;;
@@ -262,18 +260,16 @@ return @code{defaule-value} if there is no modification applied."
     (else (operating-system-firmware config))))
 
 (define %pantherx-default-channels
-  (append
-    (list 
-     (channel
-			(name 'pantherx)
-      (branch "master")
-      (url "https://channels.pantherx.org/git/panther.git")
-      (introduction
-      (make-channel-introduction
-        "54b4056ac571611892c743b65f4c47dc298c49da"
-        (openpgp-fingerprint
-          "A36A D41E ECC7 A871 1003  5D24 524F EB1A 9D33 C9CB")))))
-    %default-channels))
+  (append (list (channel
+                  (name 'pantherx)
+                  (branch "master")
+                  (url "https://channels.pantherx.org/git/panther.git")
+                  (introduction
+                   (make-channel-introduction
+                    "54b4056ac571611892c743b65f4c47dc298c49da"
+                    (openpgp-fingerprint
+                     "A36A D41E ECC7 A871 1003  5D24 524F EB1A 9D33 C9CB")))))
+          %default-channels))
 
 ;;
 ;; OS config generation