channel

commit 59bbd06ca94539eb0770b86a7630699ec766598a
parent 288d523255022a5842d4dfcf20eb7c2986243b1a
Author: Luke Willis <lukejw@monastech.xyz>
Date:   Mon,  6 Apr 2026 03:24:02 -0400

services: Add flag in mt-base-services to disable mt substitutes

Diffstat:
M
mt/channels.scm
 | 
12
++++++------
M
mt/services.scm
 | 
13
+++++++++----

2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/mt/channels.scm b/mt/channels.scm
@@ -33,17 +33,17 @@
     "https://substitutes.nonguix.org"))
 
 (define %mt-authorized-guix-keys
-  (cons* 
-    (plain-file "nonguix.pub" "\
-(public-key
- (ecc
-  (curve Ed25519)
-  (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))")
+  (cons*
     (plain-file "monastech.pub" "\
 (public-key 
  (ecc 
   (curve Ed25519)
   (q #52A437D7AEB4E4007976A93BDDA585B319DCFDE6A0204BBFE4B09C51065768D9#)))")
+    (plain-file "nonguix.pub" "\
+(public-key
+ (ecc
+  (curve Ed25519)
+  (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))")
     %default-authorized-guix-keys))
 
 %mt-channels
diff --git a/mt/services.scm b/mt/services.scm
@@ -88,7 +88,8 @@
                 (terminal-switch #t)
                 (default-session-command login-manager)))))))
 
-(define* (mt-base-services #:key (discover? #f))
+(define* (mt-base-services #:key (discover? #f)
+                                 (sans-mt-substitutes? #f))
   (append
     (list
      (service openssh-service-type
@@ -100,8 +101,12 @@
                       (inherit config)
                       (channels %mt-channels)
                       (discover? discover?)
-                      (substitute-urls %mt-substitute-urls)
-                      (authorized-keys %mt-authorized-guix-keys)))
+                      (substitute-urls (if sans-mt-substitutes?
+                                         (cdr %mt-substitute-urls)
+                                         %mt-substitute-urls))
+                      (authorized-keys (if sans-mt-substitutes?
+                                         (cdr %mt-authorized-guix-keys)
+                                         %mt-authorized-guix-keys))))
       (delete login-service-type)
       (delete agetty-service-type)
       (delete mingetty-service-type)
@@ -125,7 +130,7 @@
      (service guix-publish-service-type
               (guix-publish-configuration
                 (port 8080))))
-   (mt-base-services)))
+   (mt-base-services #:sans-mt-substitutes? #t)))
 
 (define %mt-clergy-services
   (append