diff --git a/app-configs/benedikta/mycroft/mycroft.conf b/app-configs/benedikta/mycroft/mycroft.conf index 8aef1d4..efc9634 100644 --- a/app-configs/benedikta/mycroft/mycroft.conf +++ b/app-configs/benedikta/mycroft/mycroft.conf @@ -1,35 +1,13 @@ { "log_level": "INFO", - "logs": { - "path": "stdout" - }, - "lang": "en-us", + "logs": { "path": "stdout" }, "listener": { - "wake_word": "hey_benedikta", + "continuous_listen": true, + "microphone": { + "module": "ovos-microphone-plugin-socket" + }, "VAD": { "module": "ovos-vad-plugin-silero" } - }, - "hotwords": { - "hey_benedikta": { - "module": "ovos-ww-plugin-vosk", - "listen": true, - "debug": false, - "rule": "equals", - "samples": [ - "hey benedicta", - "hey benedikta", - "benedikta", - "benedicta" - ], - "fallback_ww": "hey_benedikta_pocketsphinx" - }, - "hey_benedikta_pocketsphinx": { - "module": "ovos-ww-plugin-pocketsphinx", - "phonemes": "HH EY . B EH N AH D IY K T AH", - "threshold": 1e-10, - "lang": "en-us", - "listen": true - } } } diff --git a/app-configs/rinoa/multi-scrobbler/config.json.j2 b/app-configs/rinoa/multi-scrobbler/config.json.j2 index 2753f8c..c17b1db 100644 --- a/app-configs/rinoa/multi-scrobbler/config.json.j2 +++ b/app-configs/rinoa/multi-scrobbler/config.json.j2 @@ -26,17 +26,6 @@ }, "sources": [ - { - "type": "spotify", - "enabled": true, - "name": "spotifySource", - "clients": ["lastFmClient", "ListenBrainzClient", "malojaClient"], - "data": { - "clientId": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token)['secret']['YOUR_SPOTIFY_ID'] }}", - "clientSecret": "{{ lookup('community.hashi_vault.vault_kv2_get', 'env', engine_mount_point='rinoa-docker', url=vault_addr, token=vault_token)['secret']['YOUR_SPOTIFY_SECRET'] }}", - "redirectUri": "https://scrobble.trez.wtf/callback" - } - }, { "type": "lastfm", "enabled": true, diff --git a/app-configs/ultima/hivemind/config/server.json.j2 b/app-configs/ultima/hivemind/config/server.json.j2 index c0eddcd..c141b03 100644 --- a/app-configs/ultima/hivemind/config/server.json.j2 +++ b/app-configs/ultima/hivemind/config/server.json.j2 @@ -1,5 +1,6 @@ { "binarize": true, + "allowed_encodings": [ "JSON-B64", "JSON-URLSAFE-B64", @@ -9,10 +10,12 @@ "JSON-B32", "JSON-HEX" ], + "allowed_ciphers": [ "CHACHA20-POLY1305", "AES-GCM" ], + "agent_protocol": { "module": "hivemind-ovos-agent-plugin", "hivemind-ovos-agent-plugin": { @@ -20,30 +23,10 @@ "port": 8181 } }, + "binary_protocol": { "module": "hivemind-audio-binary-protocol-plugin", - "hivemind-audio-binary-protocol-plugin": { - "stt": { - "module": "ovos-stt-plugin-server", - "ovos-stt-plugin-server": {} - }, - "tts": { - "module": "ovos-tts-plugin-server", - "ovos-tts-plugin-server": {} - }, - "vad": { - "module": "ovos-vad-plugin-silero", - "ovos-vad-plugin-silero": {} - }, - "wake_word": "hey_benedikta", - "hotwords": { - "hey_benedikta": { - "module": "ovos-ww-plugin-precise-lite", - "model": "https://github.com/OpenVoiceOS/precise-lite-models/raw/master/wakewords/en/hey_mycroft.tflite" - } - } - } - }, + "hivemind-audio-binary-protocol-plugin": {}, "network_protocol": { "hivemind-websocket-plugin": { "host": "0.0.0.0", @@ -60,6 +43,7 @@ "cert_name": "hivemind" } }, + "database": { "module": "hivemind-json-db-plugin", "hivemind-json-db-plugin": { @@ -67,4 +51,4 @@ "subfolder": "hivemind-core" } } -} \ No newline at end of file +} diff --git a/app-configs/ultima/ovos/mycroft.conf b/app-configs/ultima/ovos/mycroft.conf index 0a18948..18293e5 100644 --- a/app-configs/ultima/ovos/mycroft.conf +++ b/app-configs/ultima/ovos/mycroft.conf @@ -56,10 +56,7 @@ } }, "listener": { - "wake_word": "hey_benedikta", - "VAD": { - "module": "ovos-vad-plugin-silero" - } + "wake_word": "hey_benedikta" }, "hotwords": { "hey_benedikta": {