From 620ba9c114311a17d4c38f23f54246e0cf996ef9 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Sun, 3 Nov 2024 23:16:26 -0500
Subject: [PATCH] update commits, switch to newer audio packages

---
 channels.scm             | 6 +++---
 home/home.scm            | 9 +++++++--
 modules/freya/system.scm | 2 ++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/channels.scm b/channels.scm
index 4988770..0d0d20f 100644
--- a/channels.scm
+++ b/channels.scm
@@ -3,7 +3,7 @@
         (url "https://git.savannah.gnu.org/git/guix.git")
         (branch "master")
         (commit
-          "d29090727b328f96e79285379e4fac9a7dee316e")
+          "547d97180471e90e404a948015f65431961aa273")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,7 +14,7 @@
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
         (commit
-          "ad966c3844385e8f7b60b0dc915f92a1eba47e09")
+          "9f065c321e7d6b39f8610a8d65528f79a8733459")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -25,7 +25,7 @@
         (url "https://g.freya.cat/freya/sakura")
         (branch "main")
         (commit
-          "850f52efa71fe2aa9a6b165c46e822858bebb5f7")
+          "b10ab400efeafb20098c8296cb2c4d511f2670c9")
         (introduction
           (make-channel-introduction
             "8fb2f9c2fa414754c41c1c73665e3e73e12693ab"
diff --git a/home/home.scm b/home/home.scm
index e55be0d..117db7f 100644
--- a/home/home.scm
+++ b/home/home.scm
@@ -17,8 +17,9 @@
              (gnu home services syncthing)
              (gnu home services)
              (freya certs)
-             (sakura services pipewire)
+             (sakura home services pipewire)
              (sakura packages gnome-xyz)
+             (sakura packages sound)
              (sakura packages vim))
 
 
@@ -60,6 +61,7 @@
                                                     "easyeffects"
                                                     "gamescope"
                                                     "overskride"
+                                                    "blueman"
 
                                                     ; gtk
                                                     "wxwidgets"
@@ -191,6 +193,9 @@
                       (file-append pinentry "/bin/pinentry"))
                     (ssh-support? #t)))
 
-         (service home-pipewire-service-type)
+         (service home-pipewire-service-type
+                  (home-pipewire-configuration
+                    (pipewire pipewire-sakura)
+                    (wireplumber wireplumber-sakura)))
          (service home-dbus-service-type)
          )))
diff --git a/modules/freya/system.scm b/modules/freya/system.scm
index 87b44c6..7294ef7 100644
--- a/modules/freya/system.scm
+++ b/modules/freya/system.scm
@@ -25,6 +25,7 @@
            #:use-module (nongnu packages linux)
            #:use-module (freya certs)
            #:use-module (sakura packages qt)
+           #:use-module (sakura packages sound)
            #:use-module (sakura packages virtualization)
            #:use-module (sakura bootloader uki))
 
@@ -272,6 +273,7 @@
           ; bluetooth
           (service bluetooth-service-type
                    (bluetooth-configuration
+                     (bluez bluez-sakura)
                      (experimental #t)
                      (fast-connectable? #t)
                      (auto-enable? #t)))