diff options
| author | Franz Geffke <franz@pantherx.org> | 2024-03-26 09:36:44 +0000 |
|---|---|---|
| committer | Franz Geffke <franz@pantherx.org> | 2024-03-26 09:36:44 +0000 |
| commit | 40981ce197908b6b7e70e59f3f6295ff691952c1 (patch) | |
| tree | 1e7bca49fd029d1e26bd880d73059a78bdba0713 | |
| parent | b4f305491a2679d1494afa2fa97e351d32881a8e (diff) | |
cleanup default channel config
| -rw-r--r-- | px/system/os.scm | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/px/system/os.scm b/px/system/os.scm index cc6ceeb..26b5a2b 100644 --- a/px/system/os.scm +++ b/px/system/os.scm @@ -13,6 +13,7 @@ #:use-module (nongnu packages linux) #:use-module (nongnu system linux-initrd) #:use-module (guix gexp) + #:use-module (guix channels) #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix records) @@ -260,6 +261,20 @@ return @code{defaule-value} if there is no modification applied." (list linux-firmware)) (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)) + ;; ;; OS config generation ;; @@ -276,16 +291,7 @@ return @code{defaule-value} if there is no modification applied." %px-substitute-server-key %nonguix-substitute-server-key) existing-keys)) - (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)))))) + (channels %pantherx-default-channels)))) (define* (make-os config #:key (kernel 'libre) |