From 11a2e33b48d1b6f120b6c189d0ed0ff190b33ebd Mon Sep 17 00:00:00 2001
From: Chloe Brown <chloe.brown.00@outlook.com>
Date: Wed, 29 Dec 2021 17:39:31 +0000
Subject: services: separate rtkit from pipewire

---
 yellowsquid/services/pipewire.scm | 26 +-------------------------
 yellowsquid/services/rtkit.scm    | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 25 deletions(-)
 create mode 100644 yellowsquid/services/rtkit.scm

diff --git a/yellowsquid/services/pipewire.scm b/yellowsquid/services/pipewire.scm
index b899e0c..4387d18 100644
--- a/yellowsquid/services/pipewire.scm
+++ b/yellowsquid/services/pipewire.scm
@@ -3,34 +3,10 @@
   #:use-module (gnu home services shepherd)
   #:use-module (gnu packages linux)
   #:use-module (gnu services)
-  #:use-module (gnu services dbus)
-  #:use-module (gnu system shadow)
   #:use-module (guix gexp)
-  #:use-module (yellowsquid packages rtkit)
-  #:export (rtkit-service-type
-            home-pipewire-service-type
+  #:export (home-pipewire-service-type
             home-wireplumber-service-type))
 
-(define %rtkit-accounts
-  (list (user-group (name "rtkit") (system? #t))
-        (user-account
-         (name "rtkit")
-         (group "rtkit")
-         (system? #t)
-         (comment "RealtimeKit daemon user")
-         (home-directory "/var/empty")
-         (shell "/run/current-system/profile/sbin/nologin"))))
-
-(define rtkit-service-type
-  (service-type (name 'rtkit)
-                (extensions
-                 (list (service-extension dbus-root-service-type
-                                          list)
-                       (service-extension account-service-type
-                                          (const %rtkit-accounts))))
-                (default-value rtkit)
-                (description "Realtime Kit scheduling policy daemon.")))
-
 ;; TODO: add dependency on rtkit-service-type.
 (define (home-pipewire-shepherd-service pipewire)
   "Return a shepherd service for PipeWire."
diff --git a/yellowsquid/services/rtkit.scm b/yellowsquid/services/rtkit.scm
new file mode 100644
index 0000000..65f4f5a
--- /dev/null
+++ b/yellowsquid/services/rtkit.scm
@@ -0,0 +1,28 @@
+(define-module (yellowsquid services rtkit)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu services)
+  #:use-module (gnu services dbus)
+  #:use-module (gnu system shadow)
+  #:use-module (guix gexp)
+  #:use-module (yellowsquid packages rtkit)
+  #:export (rtkit-service-type))
+
+(define %rtkit-accounts
+  (list (user-group (name "rtkit") (system? #t))
+        (user-account
+         (name "rtkit")
+         (group "rtkit")
+         (system? #t)
+         (comment "RealtimeKit daemon user")
+         (home-directory "/var/empty")
+         (shell "/run/current-system/profile/sbin/nologin"))))
+
+(define rtkit-service-type
+  (service-type (name 'rtkit)
+                (extensions
+                 (list (service-extension dbus-root-service-type
+                                          list)
+                       (service-extension account-service-type
+                                          (const %rtkit-accounts))))
+                (default-value rtkit)
+                (description "Realtime Kit scheduling policy daemon.")))
-- 
cgit v1.2.3