aboutsummaryrefslogtreecommitdiff
path: root/tw/channels.scm
diff options
context:
space:
mode:
authorTimo Wilken2024-03-27 17:03:29 -0500
committerTimo Wilken2024-03-27 17:03:29 -0500
commita56bdba05f21d75dc4b0fad74d3912c384d5c6c5 (patch)
treeb165d7518e01d651735e9d9acc47c1eaa3566493 /tw/channels.scm
parentb992616be8836b5675e50c944b7eea451074ef20 (diff)
Configure channels through guix-configuration
In recent versions, it seems Guix silently overwrites any custom /etc/guix/channels.scm file, so configure channels though Guix' configuration.
Diffstat (limited to 'tw/channels.scm')
-rw-r--r--tw/channels.scm29
1 files changed, 13 insertions, 16 deletions
diff --git a/tw/channels.scm b/tw/channels.scm
index 5687470e..c45ca603 100644
--- a/tw/channels.scm
+++ b/tw/channels.scm
@@ -1,22 +1,23 @@
(define-module (tw channels)
#:use-module (gnu services)
#:use-module (gnu services base)
+ #:use-module (guix channels)
#:use-module (guix gexp)
#:use-module (guix modules))
(define-public %system-channels
- ;; Channel `tw' depends on `nonguix'.
+ ;; Channel `tw' depends on `nonguix' and others.
;; See also `.guix-channel' in this repo.
- #~(cons* (channel
- (name 'tw)
- (url "https://git.twilken.net/dotfiles")
- (branch "master")
- (introduction
- (make-channel-introduction
- "f9036f78b4b4f4f35f52b3584dd5a3a747b498bf"
- (openpgp-fingerprint
- "53EC 3C06 8568 83DD 9235 5BC2 2FC7 8504 681F 69B0"))))
- %default-channels))
+ (cons* (channel
+ (name 'tw)
+ (url "https://git.twilken.net/dotfiles")
+ (branch "master")
+ (introduction
+ (make-channel-introduction
+ "f9036f78b4b4f4f35f52b3584dd5a3a747b498bf"
+ (openpgp-fingerprint
+ "53EC 3C06 8568 83DD 9235 5BC2 2FC7 8504 681F 69B0"))))
+ %default-channels))
;; Nonguix substitute server's signing key.
;; From <https://substitutes.nonguix.org/signing-key.pub>.
@@ -37,7 +38,6 @@
"(public-key (ecc (curve Ed25519) (q #E0E0A927949FF46DD5B7A63334BC168DC63D6C90D4F9AD6C071A4520B8B659A7#)))")))
(define-public %system-channel-services
- ;; The gaming channel (https://gitlab.com/guix-gaming-channels) is per-user only.
(list (simple-service 'nonguix guix-service-type
(guix-extension
(authorized-keys (list %nonguix-signing-key))
@@ -45,7 +45,4 @@
(simple-service 'offloading guix-service-type
(guix-extension
- (authorized-keys %tw-signing-keys)))
-
- (extra-special-file "/etc/guix/channels.scm"
- (scheme-file "channels.scm" %system-channels))))
+ (authorized-keys %tw-signing-keys)))))