1 files changed, 17 insertions, 6 deletions
diff --git a/modules/freya/system.scm b/modules/freya/system.scm
index 7aa8576..501d0e9 100644
--- a/modules/freya/system.scm
+++ b/modules/freya/system.scm
@@ -35,6 +35,7 @@
            #:use-module (freya packages gl)
            #:use-module (freya packages qt)
            #:use-module (freya packages wm)
+           #:use-module (freya packages pulseaudio)
            #:use-module (freya packages networking)
            #:use-module (freya packages virtualization))
 
@@ -106,7 +107,6 @@
 
                                                            ; needed programs
                                                            "qemu"
-                                                           "pulseaudio" ; pactl
                                                            "alsa-utils"
                                                            "neovim"
 
@@ -151,6 +151,9 @@
                                  ; bluetooth
                                  bluez-new
 
+                                 ; pactl
+                                 pulseaudio-new
+
                                  ; system
                                  virt-manager-ovmf
                                  freya-ca-certs
@@ -159,12 +162,15 @@
 
          (services
            (append (list
+                ; system
+                (service nix-service-type)
+                (service pam-limits-service-type)
                 (service openssh-service-type)
-                (service pcscd-service-type)
-                (service spice-vdagent-service-type)
+                ; networking
                 (simple-service 'wireguard-module
                         kernel-module-loader-service-type
                         '("wireguard"))
+                ; printing
                 (service cups-service-type
                     (cups-configuration
                       (web-interface? #t)))
@@ -172,21 +178,25 @@
                     (avahi-configuration
                       (publish? #f)
                       (publish-workstation? #f)))
+               ; docker
                (service docker-service-type)
                (service containerd-service-type)
-               (service nix-service-type)
+               ; vms
                (service libvirt-service-type
                         (libvirt-configuration
                           (libvirt libvirt-ovmf)
                           (unix-sock-group "libvirt")
                           (tls-port "16555")))
                (service virtlog-service-type)
+               (service spice-vdagent-service-type)
+               ; audio
                (service bluetooth-service-type
                         (bluetooth-configuration
                           (bluez bluez-new)
                           (experimental #t)
                           (fast-connectable? #t)))
-               (service pam-limits-service-type)
+               ; yubikey
+               (service pcscd-service-type)
                (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
 
            (modify-services %desktop-services
@@ -205,7 +215,8 @@
                             (delete pulseaudio-service-type)
                             (delete gdm-service-type)
                             (delete avahi-service-type)
-                            (delete alsa-service-type))))
+                            (delete alsa-service-type)
+                            (delete screen-locker-service-type))))
 
          (name-service-switch %mdns-host-lookup-nss)