.
This commit is contained in:
parent
36d84bf01d
commit
8658a82c9f
4 changed files with 46 additions and 14 deletions
40
config.org
40
config.org
|
@ -217,21 +217,35 @@ These services are unmodified, or have just few settings.
|
||||||
(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))
|
(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
#+NAME: guix-ci-pubkey
|
||||||
|
#+begin_src scheme :tangle keys/guix-ci.pub :mkdirp yes
|
||||||
|
(public-key (ecc (curve Ed25519) (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)))
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
#+NAME: guix-bordeaux-pubkey
|
||||||
|
#+begin_src scheme :tangle keys/guix-bordeaux.pub :mkdirp yes
|
||||||
|
(public-key (ecc (curve Ed25519) (q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)))
|
||||||
|
#+end_src
|
||||||
|
|
||||||
#+NAME: root-modified-desktop-services
|
#+NAME: root-modified-desktop-services
|
||||||
#+begin_src scheme :exports none :results code :noweb no-export
|
#+begin_src scheme :exports none :results code :noweb no-export
|
||||||
(modify-services
|
(modify-services
|
||||||
%desktop-services
|
%desktop-services
|
||||||
(delete login-service-type)
|
(delete login-service-type)
|
||||||
(delete mingetty-service-type)
|
(delete mingetty-service-type)
|
||||||
(delete console-font-service-type)
|
(delete console-font-service-type)
|
||||||
(guix-service-type config => (guix-configuration
|
(guix-service-type config => (guix-configuration
|
||||||
(inherit config)
|
(inherit config)
|
||||||
(substitute-urls
|
(substitute-urls
|
||||||
(append (list "https://substitutes.nonguix.org")
|
(append (list "https://substitutes.nonguix.org")
|
||||||
%default-substitute-urls))
|
%default-substitute-urls))
|
||||||
(authorized-keys
|
(authorized-keys
|
||||||
(append (list (plain-file "non-guix.pub"
|
(append (list (plain-file "non-guix.pub"
|
||||||
"<<nonguix-pubkey>>")))))))
|
"<<nonguix-pubkey>>")
|
||||||
|
(plain-file "guix-ci.pub"
|
||||||
|
"<<guix-ci-pubkey>>")
|
||||||
|
(plain-file "guix-bordeaux.pub"
|
||||||
|
"<<guix-bordeaux-pubkey>>")))))))
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
*** Greeter Service
|
*** Greeter Service
|
||||||
|
|
|
@ -152,7 +152,11 @@
|
||||||
%default-substitute-urls))
|
%default-substitute-urls))
|
||||||
(authorized-keys
|
(authorized-keys
|
||||||
(append (list (plain-file "non-guix.pub"
|
(append (list (plain-file "non-guix.pub"
|
||||||
"(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))")))))))
|
"(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))")
|
||||||
|
(plain-file "guix-ci.pub"
|
||||||
|
"(public-key (ecc (curve Ed25519) (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)))")
|
||||||
|
(plain-file "guix-bordeaux.pub"
|
||||||
|
"(public-key (ecc (curve Ed25519) (q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)))")))))))
|
||||||
(list (service tlp-service-type (tlp-configuration))
|
(list (service tlp-service-type (tlp-configuration))
|
||||||
(service
|
(service
|
||||||
thermald-service-type
|
thermald-service-type
|
||||||
|
|
7
keys/guix-bordeaux.pub
Normal file
7
keys/guix-bordeaux.pub
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
;; #+NAME: guix-bordeaux-pubkey
|
||||||
|
|
||||||
|
;; [[file:../config.org::guix-bordeaux-pubkey][guix-bordeaux-pubkey]]
|
||||||
|
(public-key (ecc (curve Ed25519) (q #7D602902D3A2DBB83F8A0FB98602A754C5493B0B778C8D1DD4E0F41DE14DE34F#)))
|
||||||
|
;; guix-bordeaux-pubkey ends here
|
7
keys/guix-ci.pub
Normal file
7
keys/guix-ci.pub
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
;; #+NAME: guix-ci-pubkey
|
||||||
|
|
||||||
|
;; [[file:../config.org::guix-ci-pubkey][guix-ci-pubkey]]
|
||||||
|
(public-key (ecc (curve Ed25519) (q #8D156F295D24B0D9A86FA5741A840FF2D24F60F7B6C4134814AD55625971B394#)))
|
||||||
|
;; guix-ci-pubkey ends here
|
Loading…
Reference in a new issue