prom0: Remove unnecessary whitespace

Previously, only guix-ci0.home.rekahsoft.ca was configured to use substitutes from custom
substitute servers, notably non-guix. This however is not favorable for other vms, as some
package substitutes are only available on custom substitute servers (eg. my own internal one,
non-guix, etc..).

This commit adjusts this, as well as reorganizes public key files.

.guix/rekahsoft/guix-config/proxmox-vm-lvm-minimal.scm

@@ -23,14 +23,18 @@
 (define %automation-user "auto")
 (define %guix-signing-keys
   (list
-   (local-file "../../../.pubkeys/guix-signing-key_lenovo-t480s.pub")
-   (local-file "../../../.pubkeys/guix-signing-key_dell-precision.pub")))
+   (local-file "../../../.pubkeys/guix/lenovo-t480s.pub")
+   (local-file "../../../.pubkeys/guix/dell-precision.pub")
+
+   (local-file "../../../.pubkeys/guix/cuirass-genenetwork-org.pub")
+   (local-file "../../../.pubkeys/guix/cuirass-nonguix-org.pub")
+   (local-file "../../../.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub")))
 
 ;; Keys used for ssh access
-(define %deploy-key (local-file "../../../.pubkeys/deploy-key.pub"))
-(define %collin-ed25519-key (local-file "../../../.pubkeys/ed25519-861CD08E.pub"))
-(define %collin-rsa4096-key (local-file "../../../.pubkeys/rsa4096-6765FB18.pub"))
-(define %collin-rsa-key (local-file "../../../.pubkeys/rsa2048-ED51AB07.pub"))
+(define %deploy-key (local-file "../../../.pubkeys/ssh/deploy-key.pub"))
+(define %collin-ed25519-key (local-file "../../../.pubkeys/ssh/ed25519-861CD08E.pub"))
+(define %collin-rsa4096-key (local-file "../../../.pubkeys/ssh/rsa4096-6765FB18.pub"))
+(define %collin-rsa-key (local-file "../../../.pubkeys/ssh/rsa2048-ED51AB07.pub"))
 
 (define syslog-configuration
   (plain-file "syslog.conf"
@@ -119,7 +123,10 @@ mail.*                                 -/var/log/maillog
        config => (guix-configuration
 		 (inherit config)
                  (authorized-keys (append %guix-signing-keys %default-authorized-guix-keys))
-		 (substitute-urls %default-substitute-urls))))))
+		 (substitute-urls (append (list "https://cuirass.genenetwork.org"
+                                                "https://substitutes.nonguix.org"
+                                                "https://guix-ci.home.rekahsoft.ca")
+		                          %default-substitute-urls)))))))
 
 (define (proxmox-vm-lvm-minimal host-name)
   (operating-system

.guix/rekahsoft/guix-config/vms/cloud0-home-rekahsoft-ca.scm

@@ -29,9 +29,7 @@
 
     (services
      (append
-      (list (service containerd-service-type)
-            (service docker-service-type)
-            (service radicale-service-type
+      (list (service radicale-service-type
              (radicale-configuration
               (auth (radicale-auth-configuration
                      (type 'htpasswd)

.guix/rekahsoft/guix-config/vms/guix-ci0-home-rekahsoft-ca.scm

@@ -331,16 +331,4 @@ PUBLISH-URL."
       (guix-service-type config =>
                          (guix-configuration
 	                  (inherit config)
-                          (extra-options '("--max-jobs=4"))
-	                  (substitute-urls
-	                   (append (list "https://substitutes.nonguix.org")
-		                   (guix-configuration-substitute-urls config)))
-	                  (authorized-keys
-	                   (append (list (plain-file "non-guix.pub"
-				                     "(public-key
-                                       (ecc
-                                        (curve Ed25519)
-                                        (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
-                                        )
-                                       )"))
-                                   (guix-configuration-authorized-keys config))))))))))
+                          (extra-options '("--max-jobs=4")))))))))

.guix/rekahsoft/guix-config/vms/prom0-home-rekahsoft-ca.scm

@@ -35,4 +35,3 @@
                               "/var/lib/prometheus/data:/prometheus"))
                            (respawn? #t)))))
      %proxmox-vm-legacy-services))))
-

.pubkeys/guix/cuirass-genenetwork-org.pub

@@ -0,0 +1,6 @@
+(public-key
+ (ecc
+   (curve Ed25519)
+   (q #9578AD6CDB23BA51F9C4185D5D5A32A7EEB47ACDD55F1CCB8CEE4E0570FBF961#)
+  )
+ )

.pubkeys/guix/cuirass-nonguix-org.pub

@@ -0,0 +1,6 @@
+(public-key
+ (ecc
+  (curve Ed25519)
+  (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
+  )
+ )

.pubkeys/guix/guix-ci-home-rekahsoft-ca.pub

@@ -0,0 +1,6 @@
+(public-key
+ (ecc
+   (curve Ed25519)
+   (q #13EBA5788C96A57B32273782E8CB24834338B7DC00D7C0F103CA2C5576409A78#)
+  )
+ )

channels.scm

@@ -25,7 +25,7 @@
         (url "https://git.rekahsoft.ca/rekahsoft/rekahsoft-guix.git")
         (branch "master")
         (commit
-          "a8d6dfe7088e605acae725f59c1e663a1e897189")
+          "7e1b7c9eede1c3e7be546fbde904fa718cf7a371")
         (introduction
           (make-channel-introduction
             "d910ac4ca1e1a115934b10921bc23f50bd481043"