From f725871b48b103eda1b33ab5d480296878b337cb Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Tue, 19 Dec 2023 01:16:03 +0100
Subject: [PATCH] .

---
 config.org             | 27 +++++++++------------------
 config.scm             | 20 ++++++++++----------
 keys/guix-bordeaux.pub |  7 -------
 keys/guix-ci.pub       |  7 -------
 keys/non-guix.pub      |  7 ++++++-
 5 files changed, 25 insertions(+), 43 deletions(-)
 delete mode 100644 keys/guix-bordeaux.pub
 delete mode 100644 keys/guix-ci.pub

diff --git a/config.org b/config.org
index 09d4732..8d63e09 100644
--- a/config.org
+++ b/config.org
@@ -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
diff --git a/config.scm b/config.scm
index ff676c0..cc0530d 100644
--- a/config.scm
+++ b/config.scm
@@ -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
diff --git a/keys/guix-bordeaux.pub b/keys/guix-bordeaux.pub
deleted file mode 100644
index ad9182d..0000000
--- a/keys/guix-bordeaux.pub
+++ /dev/null
@@ -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
diff --git a/keys/guix-ci.pub b/keys/guix-ci.pub
deleted file mode 100644
index 620d0ef..0000000
--- a/keys/guix-ci.pub
+++ /dev/null
@@ -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
diff --git a/keys/non-guix.pub b/keys/non-guix.pub
index e0f8149..68a2660 100644
--- a/keys/non-guix.pub
+++ b/keys/non-guix.pub
@@ -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