From 72a67b03676e435d52fc84b2f3990ad12d54159a Mon Sep 17 00:00:00 2001
From: Ryan Schanzenbacher <ryan@rschanz.org>
Date: Sun, 4 Feb 2024 19:12:46 -0500
Subject: [PATCH] bumped bluez version and fixed all dependency chains for new
 package

---
 modules/ryan-config/base-system.scm  |  9 ++++---
 modules/ryan-packages/linux.scm      | 35 ++++++++++++++++++++++++++++
 modules/ryan-packages/networking.scm | 14 +++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 modules/ryan-packages/linux.scm
 create mode 100644 modules/ryan-packages/networking.scm

diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 5bb7db9..69d043b 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -13,6 +13,8 @@
                 #:use-module (ryan-packages freedesktop)
                 #:use-module (ryan-packages wm)
                 #:use-module (ryan-packages virtualization)
+                #:use-module (ryan-packages linux)
+                #:use-module (ryan-packages networking)
                 #:use-module (rosenthal packages wm)
                 #:use-module (gnu packages security-token)
                 #:use-module (gnu services security-token)
@@ -128,8 +130,8 @@
                                                           "grimblast"
                                                           "slurp"
                                                           "wl-clipboard"
-                                                          "bluez"
-                                                          "blueman"
+                                                          ;"bluez"
+                                                          ;"blueman"
                                                           "ldacbt"
                                                           "libfreeaptx"
                                                           "libfdk"
@@ -146,7 +148,7 @@
                                                           "wireplumber"
                                                           "wireshark"
                                                           "zsh"))
-                           (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan waybar-new virt-manager-ovmf)
+                           (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan waybar-new virt-manager-ovmf bluez-ryan blueman-ryan)
                            %my-base-packages ))
 
     ;; Below is the list of system services.  To search for available
@@ -175,6 +177,7 @@
                    (service virtlog-service-type)
                    (service bluetooth-service-type
                             (bluetooth-configuration
+                              (bluez bluez-ryan)
                               (experimental #t)
                               (fast-connectable? #t)))
                    (udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
diff --git a/modules/ryan-packages/linux.scm b/modules/ryan-packages/linux.scm
new file mode 100644
index 0000000..600117c
--- /dev/null
+++ b/modules/ryan-packages/linux.scm
@@ -0,0 +1,35 @@
+(define-module (ryan-packages linux)
+               #:use-module (guix download)
+               #:use-module (guix packages)
+               #:use-module (guix gexp)
+               #:use-module (gnu packages)
+               #:use-module (gnu packages linux)
+               #:use-module (gnu packages python-xyz)
+               #:use-module (guix git-download)
+               #:use-module (guix utils))
+
+(define-public bluez-ryan
+  (package
+    (inherit bluez)
+    (version "5.72")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://kernel.org/linux/bluetooth/bluez-"
+               version ".tar.xz"))
+        (sha256
+          (base32
+            "0vjk4ihywzv8k07bxq7clqgi2afrw54nfp0gcnxw35m98nipz7a9"))))
+    (arguments (list
+                 #:configure-flags
+                 #~(list "--sysconfdir=/etc"
+                         "--localstatedir=/var"
+                         "--enable-library"
+                         "--disable-manpages"
+                         "--disable-systemd"
+                         "--enable-hid2hci"
+                         (string-append "--with-dbusconfdir=" #$output "/etc")
+                         (string-append "--with-udevdir=" #$output "/lib/udev"))))))
+
+bluez-ryan
diff --git a/modules/ryan-packages/networking.scm b/modules/ryan-packages/networking.scm
new file mode 100644
index 0000000..6d660a3
--- /dev/null
+++ b/modules/ryan-packages/networking.scm
@@ -0,0 +1,14 @@
+(define-module (ryan-packages networking)
+               #:use-module (guix gexp)
+               #:use-module (guix packages)
+               #:use-module (gnu packages)
+               #:use-module (gnu packages networking)
+               #:use-module (ryan-packages linux)
+               #:use-module (guix utils))
+
+(define-public blueman-ryan
+  (package
+    (inherit blueman)
+    (inputs (modify-inputs (package-inputs blueman) (delete "bluez") (prepend bluez-ryan)))))
+
+blueman-ryan