diff options
| author | Franz Geffke <franz@pantherx.org> | 2024-03-31 15:52:28 +0100 |
|---|---|---|
| committer | Franz Geffke <franz@pantherx.org> | 2024-03-31 15:52:28 +0100 |
| commit | 5fc9975ee0305e9ed57acf75e9b71f5aaa0e9165 (patch) | |
| tree | 046e7890ab704dd27ad6c58d5ba6c0c71553a1d2 /px/system/os.scm | |
| parent | 3dae6df6f54a2e6e8bf900b680da3521e890e860 (diff) | |
px: Simplify system configuration; add docs
Diffstat (limited to 'px/system/os.scm')
| -rw-r--r-- | px/system/os.scm | 38 |
1 files changed, 17 insertions, 21 deletions
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 |