From 2c2a36b47d4cadc4d22592914c7fe3dfaea5f7e5 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Fri, 2 Aug 2024 14:40:26 -0400
Subject: Switch to Guix's pipewire home service and update Rise.

---
 dthompson/machines/ikaruga.scm |   1 +
 dthompson/machines/rise.scm    | 109 ++++++++++++++++++++++-------------------
 2 files changed, 60 insertions(+), 50 deletions(-)

(limited to 'dthompson/machines')

diff --git a/dthompson/machines/ikaruga.scm b/dthompson/machines/ikaruga.scm
index 4fb4fff..6c08f1b 100644
--- a/dthompson/machines/ikaruga.scm
+++ b/dthompson/machines/ikaruga.scm
@@ -32,6 +32,7 @@
   #:use-module (gnu)
   #:use-module (gnu bootloader)
   #:use-module (gnu home)
+  #:use-module (gnu home services sound)
   #:use-module (gnu packages)
   #:use-module (gnu services)
   #:use-module (gnu services base)
diff --git a/dthompson/machines/rise.scm b/dthompson/machines/rise.scm
index c5fb3de..8620e1d 100644
--- a/dthompson/machines/rise.scm
+++ b/dthompson/machines/rise.scm
@@ -32,6 +32,7 @@
   #:use-module (gnu)
   #:use-module (gnu bootloader)
   #:use-module (gnu home)
+  #:use-module (gnu home services sound)
   #:use-module (gnu packages)
   #:use-module (gnu services)
   #:use-module (gnu services base)
@@ -47,9 +48,10 @@
   #:use-module (gnu system file-systems)
   #:use-module (gnu system mapped-devices)
   #:use-module (nongnu packages linux)
-  #:use-module (nongnu system linux-initrd))
+  #:use-module (nongnu system linux-initrd)
+  #:export (rise-os rise-home))
 
-(define-public rise-os
+(define rise-os
   (operating-system
    (locale "en_US.utf8")
    (timezone "America/New_York")
@@ -85,9 +87,8 @@
 		  (name "realtime")
 		  (system? #t))
 	         %base-groups))
-   (packages (append (map specification->package
-			  '("ncurses" "nss-certs" "strace"))
-                     %base-packages))
+   (packages (cons (specification->package "nss-certs")
+                   %base-packages))
    (services (modify-services
 	         (cons* (service gnome-desktop-service-type)
                         (service bluetooth-service-type)
@@ -112,7 +113,7 @@
 			          (pam-limits-entry "@realtime"
 					            'both 'memlock 'unlimited)))
                         %desktop-services)
-	       ;; In this house, we use JACK.
+	       ;; In this house, we use Pipewire.
 	       (delete pulseaudio-service-type)
                ;; Get nonguix substitutes.
                (guix-service-type config =>
@@ -122,7 +123,7 @@
                                     (append (list "https://substitutes.nonguix.org")
                                             %default-substitute-urls))
                                    (authorized-keys
-                                    (append (list (local-file "keys/nonguix-signing-key.pub"))
+                                    (append (list (local-file "../../keys/nonguix-signing-key.pub"))
                                             %default-authorized-guix-keys))))))
    (mapped-devices (list (mapped-device
                           (source (uuid "ee0a37d1-36d6-4e50-8af0-fc0bfe8c22ef"))
@@ -139,47 +140,55 @@
                          (dependencies mapped-devices)) %base-file-systems))
    (name-service-switch %mdns-host-lookup-nss)))
 
-(define-public rise-home
+(define rise-home
   (home-environment
-   (packages (specifications->packages
-	      '("audacity"
-                "alsa-utils"
-                "ardour"
-                "blender"
-	        "calf"
-                "carla"
-                "dragonfly-reverb"
-	        "emacs"
-	        "emacs-better-defaults"
-	        "emacs-buffer-env"
-	        "emacs-doom-modeline"
-	        "emacs-doom-themes"
-	        "emacs-flycheck-guile"
-	        "emacs-geiser-guile"
-	        "emacs-magit"
-	        "emacs-markdown-mode"
-	        "emacs-paredit"
-	        "emacs-rainbow-delimiters"
-	        "emacs-smex"
-	        "emacs-use-package"
-	        "emacs-which-key"
-	        "firefox"
-	        "font-google-noto-sans-cjk"
-	        "font-google-noto-serif-cjk"
-	        "font-inconsolata"
-	        "gimp"
-	        "git"
-	        "gnome-tweaks"
-                "htop"
-                "hydrogen"
-                "jack"
-	        "lsp-plugins"
-                "milkytracker"
-	        "obs"
-	        "openssh"
-	        "patchage"
-                "qjackctl"
-	        "sfxr"
-                "x42-plugins"
-                "yt-dlp")))
-   (services common-services)))
+   (packages
+    (cons* (package-with-pw-jack (specification->package "ardour") "ardour8")
+           (package-with-pw-wrapper (specification->package "firefox"))
+           (specifications->packages
+            '("audacity"
+              "blender"
+              "calf"
+              "carla"
+              "dragonfly-reverb"
+              "easyeffects"
+              "emacs"
+              "emacs-better-defaults"
+              "emacs-buffer-env"
+              "emacs-doom-modeline"
+              "emacs-doom-themes"
+              "emacs-flycheck-guile"
+              "emacs-geiser-guile"
+              "emacs-magit"
+              "emacs-markdown-mode"
+              "emacs-paredit"
+              "emacs-rainbow-delimiters"
+              "emacs-smex"
+              "emacs-use-package"
+              "emacs-which-key"
+              "font-google-noto-emoji"
+              "font-google-noto-sans-cjk"
+              "font-google-noto-serif-cjk"
+              "font-inconsolata"
+              "gimp"
+              "git"
+              "gnome-tweaks"
+              "google-chrome-stable"
+              "htop"
+              "libresprite"
+              "lsp-plugins"
+              "milkytracker"
+              "ncurses"
+              "obs"
+              "openssh"
+              "pavucontrol"
+              "qjackctl"
+              "qpwgraph"
+              "sfxr"
+              "strace"
+              "x42-plugins"
+              "xdg-desktop-portal"
+              "xdg-desktop-portal-gtk"
+              "yt-dlp"))))
+   (services (cons (service home-pipewire-service-type)
+                   common-services))))
-- 
cgit v1.2.3