From e457edd526ec772ab45ad73a3e901fdda83e67c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Schm=C3=B6cker?= <m.schmoecker@brickfire.eu>
Date: Mon, 4 Nov 2024 18:37:08 +0100
Subject: [PATCH] feat: include fuzzy audio sink option

---
 controller/thymis_controller/modules/kiosk.py | 19 +++++++++++++++++++
 frontend/src/lib/config/ModuleCard.svelte     |  4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/controller/thymis_controller/modules/kiosk.py b/controller/thymis_controller/modules/kiosk.py
index fdb1e839..8279ad0d 100644
--- a/controller/thymis_controller/modules/kiosk.py
+++ b/controller/thymis_controller/modules/kiosk.py
@@ -54,6 +54,18 @@ class Kiosk(modules.Module):
         order=55,
     )
 
+    audio_sink_fuzzy = modules.Setting(
+        display_name=modules.LocalizedString(
+            en="Audio Sink",
+            de="Audio Sink",
+        ),
+        type="string",
+        default="",
+        description="Select the audio sink via a fuzzy search. Eg. 'audio' or 'hdmi' can be used to match the default output or HDMI on a Raspberry Pi 3.\nTo list available sinks, the following commands can be used on the device:\n> machinectl shell thymiskiosk@.host\n> pactl list short sinks",
+        example="HDMI",
+        order=57,
+    )
+
     enable_vnc = modules.Setting(
         display_name=modules.LocalizedString(
             en="Enable VNC server",
@@ -119,6 +131,12 @@ def write_nix_settings(
 
         volume = max(0, min(100, int(volume)))
 
+        audio_sink_fuzzy = (
+            module_settings.settings["audio_sink_fuzzy"]
+            if "audio_sink_fuzzy" in module_settings.settings
+            else self.audio_sink_fuzzy.default
+        )
+
         nonce = hash(str(module_settings.__dict__))
 
         f.write(
@@ -148,6 +166,7 @@ def write_nix_settings(
             {'exec ${pkgs.bash}/bin/bash -c "mkdir -p $HOME/tigervnc; ${pkgs.tigervnc}/bin/vncpasswd -f <<< \\"'+ vnc_password + '\\" > $HOME/tigervnc/passwd"' if enable_vnc else ''}
             {'exec ${pkgs.tigervnc}/bin/x0vncserver -display :0 -PasswordFile=$HOME/tigervnc/passwd' if enable_vnc else ''}
             exec "${{pkgs.pamixer}}/bin/pamixer --set-volume {volume}"
+            {f'exec "${{pkgs.pulseaudio}}/bin/pactl set-default-sink \'\'$(${{pkgs.pulseaudio}}/bin/pactl list short sinks | grep -m1 -i \'{audio_sink_fuzzy}\' | cut -f1)"' if audio_sink_fuzzy else ''}
             '');
             systemd.services.display-manager.restartIfChanged = lib.mkOverride {priority} true;
             systemd.services.display-manager.environment.NONCE = lib.mkOverride {priority} "{nonce}";
diff --git a/frontend/src/lib/config/ModuleCard.svelte b/frontend/src/lib/config/ModuleCard.svelte
index 9d7eafc6..708aba5a 100644
--- a/frontend/src/lib/config/ModuleCard.svelte
+++ b/frontend/src/lib/config/ModuleCard.svelte
@@ -31,7 +31,7 @@
 </script>
 
 <Card
-	class="max-w-none grid grid-cols-[minmax(50px,3fr)_1fr] sm:grid-cols-[auto_150px] xl:grid-cols-[auto_250px] gap-4"
+	class="max-w-none grid grid-cols-[minmax(50px,3fr)_1fr] sm:grid-cols-[auto_250px] xl:grid-cols-[auto_350px] gap-4"
 	padding={'sm'}
 >
 	{#each settingEntries as [key, setting]}
@@ -146,7 +146,7 @@
 				{/if}
 			</div>
 		</div>
-		<P class="mt-6">{setting.description}</P>
+		<P class="mt-6 whitespace-pre-line">{setting.description}</P>
 	{:else}
 		<div>{$t('config.no-settings')}</div>
 	{/each}