This commit is contained in:
Daniel Ziltener 2023-12-19 01:16:03 +01:00
parent 940bc05b4f
commit f725871b48
5 changed files with 25 additions and 43 deletions

View File

@ -52,6 +52,7 @@ This is to be run after setting up the partitions.
- gnu services linux
- gnu services networking
- gnu services pm
- gnu services sound
- gnu services virtualization
- gnu services xorg
- gnu system nss
@ -193,9 +194,7 @@ These services are unmodified, or have just few settings.
| libvirt | ((unix-sock-group "libvirt")) |
| fstrim | () |
| fprintd | () |
| udev | () |
| seatd | () |
| inputattach | () |
#+NAME: root-simple-service-block
#+begin_src scheme :noweb yes :exports none :results output
@ -217,17 +216,12 @@ These services are unmodified, or have just few settings.
#+NAME: nonguix-pubkey
#+begin_src scheme :tangle keys/non-guix.pub :mkdirp yes
(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))
#+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#)))
(public-key
(ecc
(curve Ed25519)
(q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
)
)
#+end_src
#+NAME: root-modified-desktop-services
@ -248,11 +242,8 @@ These services are unmodified, or have just few settings.
%default-substitute-urls))
(authorized-keys
(append (list (plain-file "non-guix.pub"
"<<nonguix-pubkey>>")
(plain-file "guix-ci.pub"
"<<guix-ci-pubkey>>")
(plain-file "guix-bordeaux.pub"
"<<guix-bordeaux-pubkey>>")))))))
"<<nonguix-pubkey>>"))
%default-authorized-guix-keys)))))
#+end_src
*** Greeter Service

View File

@ -13,6 +13,7 @@
;; - gnu services linux
;; - gnu services networking
;; - gnu services pm
;; - gnu services sound
;; - gnu services virtualization
;; - gnu services xorg
;; - gnu system nss
@ -34,6 +35,7 @@
(gnu services linux)
(gnu services networking)
(gnu services pm)
(gnu services sound)
(gnu services virtualization)
(gnu services xorg)
(gnu system nss)
@ -156,11 +158,13 @@
%default-substitute-urls))
(authorized-keys
(append (list (plain-file "non-guix.pub"
"(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#)))")))))))
"(public-key
" (ecc
" (curve Ed25519)
" (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
" )
" )"))
%default-authorized-guix-keys)))))
(list (service tlp-service-type (tlp-configuration))
(service
thermald-service-type
@ -186,13 +190,9 @@
(service
fprintd-service-type
(fprintd-configuration))
(service udev-service-type (udev-configuration))
(service
seatd-service-type
(seatd-configuration))
(service
inputattach-service-type
(inputattach-configuration)))
(seatd-configuration)))
(list polkit-wheel-service)
(list

View File

@ -1,7 +0,0 @@
;; #+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

View File

@ -1,7 +0,0 @@
;; #+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

View File

@ -3,5 +3,10 @@
;; #+NAME: nonguix-pubkey
;; [[file:../config.org::nonguix-pubkey][nonguix-pubkey]]
(public-key (ecc (curve Ed25519) (q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)))
(public-key
(ecc
(curve Ed25519)
(q #C1FD53E5D4CE971933EC50C9F307AE2171A2D3B52C804642A7A35F84F3A4EA98#)
)
)
;; nonguix-pubkey ends here