From 5a71df020eb926bdd79276394a6fa4529df0109e Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sun, 8 Sep 2024 20:58:53 +0100
Subject: [PATCH 1/2] kilgharrah: install zoom

---
 hosts/kilgharrah/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index bbda2a0..4fd8469 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -47,6 +47,7 @@
       bitwarden
       discord
       tor-browser-bundle-bin
+      zoom-us
     ];
   };
 

From 5fefab9707545401ada0c981efc876b18b79cc75 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Tue, 10 Sep 2024 22:40:07 +0100
Subject: [PATCH 2/2] kilgharrah: switch from pulseaudio to pipewire

---
 hosts/kilgharrah/default.nix |  8 +-------
 hosts/kilgharrah/sound.nix   | 13 +++++++++++++
 2 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 hosts/kilgharrah/sound.nix

diff --git a/hosts/kilgharrah/default.nix b/hosts/kilgharrah/default.nix
index 4fd8469..3a834fb 100644
--- a/hosts/kilgharrah/default.nix
+++ b/hosts/kilgharrah/default.nix
@@ -6,6 +6,7 @@
     ./filesystems.nix
     ./hardware.nix
     ./networking.nix
+    ./sound.nix
   ];
 
   nixpkgs.hostPlatform = "x86_64-linux";
@@ -29,13 +30,6 @@
 
   services.printing.enable = true;
 
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-  # services.pipewire = {
-  #   enable = true;
-  #   pulse.enable = true;
-  # };
-
   age.secrets.user-password-kilgharrah-qenya.file = ../../secrets/user-password-kilgharrah-qenya.age;
   users.users.qenya.hashedPasswordFile = config.age.secrets.user-password-kilgharrah-qenya.path;
   users.users.qenya.extraGroups = [ "wheel" ];
diff --git a/hosts/kilgharrah/sound.nix b/hosts/kilgharrah/sound.nix
new file mode 100644
index 0000000..cb97bd4
--- /dev/null
+++ b/hosts/kilgharrah/sound.nix
@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+  environment.systemPackages = with pkgs; [ helvum ]; # patchbay
+}
\ No newline at end of file