summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.org2
-rw-r--r--group_vars/all.yml1
-rwxr-xr-xroles/caption/templates/process-captions.py2
-rw-r--r--roles/edit/tasks/main.yml15
-rw-r--r--roles/obs/tasks/main.yml2
-rw-r--r--roles/obs/templates/bashrc1
-rw-r--r--roles/obs/templates/scenes.json4
7 files changed, 22 insertions, 5 deletions
diff --git a/README.org b/README.org
index 1479d39..48403c5 100644
--- a/README.org
+++ b/README.org
@@ -212,7 +212,7 @@ Firefox profiles like to be created in an X environment
firefox -no-remote -CreateProfile "{{ emacsconf_id }}-{{ item.item.id }}
Update scenes from the gen copy:
-ssh emacsconf-gen@res.emacsconf.org "cat ~/.config/obs-studio/basic/scenes/gen.json" | jq 'walk(if type == "string" then gsub("emacsconf"; "{{ emacsconf_id }}") | gsub("gen"; "{{ item.id }}") else . end)' > roles/obs/templates/scenes.json
+ssh emacsconf-gen@res.emacsconf.org -p 46668 "cat ~/.config/obs-studio/basic/scenes/gen.json" | jq 'walk(if type == "string" then gsub("emacsconf"; "{{ emacsconf_id }}") | gsub("gen"; "{{ item.id }}") else . end)' > roles/obs/templates/scenes.json
ansible-playbook -i inventory.yml prod-playbook.yml --tags obs-scene
diff --git a/group_vars/all.yml b/group_vars/all.yml
index d16dc44..254effe 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -34,3 +34,4 @@ emacsconf_el_dir: ~{{ emacsconf_user }}/emacsconf-el
emacsconf_edit_wiki_dir: ~{{ emacsconf_user }}/emacsconf-wiki
emacsconf_private_dir: ~{{ emacsconf_user }}/emacsconf-2022-private
emacsconf_caption_dir: /data/emacsconf/{{ emacsconf_year }}
+emacsconf_timezone: US/Eastern
diff --git a/roles/caption/templates/process-captions.py b/roles/caption/templates/process-captions.py
index 1b6515c..9b345fe 100755
--- a/roles/caption/templates/process-captions.py
+++ b/roles/caption/templates/process-captions.py
@@ -141,7 +141,7 @@ def generate_captions(work):
audio = whisper.load_audio(work['audio'])
if TRIM_AUDIO:
audio = whisper.pad_or_trim(audio)
- result = model.transcribe(audio, verbose=True)
+ result = model.transcribe(audio, verbose=True, language="en")
result = clean_up_timestamps(result)
with open(new_file, 'w') as vtt:
whisper.utils.write_vtt(result['segments'], file=vtt)
diff --git a/roles/edit/tasks/main.yml b/roles/edit/tasks/main.yml
index f864b23..9419f92 100644
--- a/roles/edit/tasks/main.yml
+++ b/roles/edit/tasks/main.yml
@@ -14,7 +14,20 @@
(when packages
(package-refresh-contents)
(mapc #'package-install packages))))"
-
+- name: Add alias for Emacsconf
+ lineinfile:
+ line: alias emacsconf="emacsclient -c -a emacs"
+ dest: "~{{ emacsconf_user }}/.bashrc"
+ owner: "{{ emacsconf_user }}"
+ group: "{{ emacsconf_group }}"
+ create: yes
+- name: Set timezone
+ lineinfile:
+ line: export TZ={{ emacsconf_timezone }}
+ dest: "~{{ emacsconf_user }}/.bashrc"
+ owner: "{{ emacsconf_user }}"
+ group: "{{ emacsconf_group }}"
+ create: yes
- name: Set up Emacs configuration for interactive editing
template:
src: emacsconf-edit.el
diff --git a/roles/obs/tasks/main.yml b/roles/obs/tasks/main.yml
index ab94878..3ee7330 100644
--- a/roles/obs/tasks/main.yml
+++ b/roles/obs/tasks/main.yml
@@ -16,6 +16,8 @@
- ffmpeg
- pulseaudio
- jackd2
+ - kitty
+ - kitty-terminfo
- alsa-utils
- dbus-x11
- obs-studio
diff --git a/roles/obs/templates/bashrc b/roles/obs/templates/bashrc
index 4d65cbd..eecc39a 100644
--- a/roles/obs/templates/bashrc
+++ b/roles/obs/templates/bashrc
@@ -116,5 +116,6 @@ alias play=track-mpv
alias qa-louder="pactl set-sink-volume {{ item.id }}-qa +5% "
alias qa-quieter="pactl set-sink-volume {{ item.id }}-qa -5% "
alias qa-vol="pactl set-sink-volume {{ item.id }}-qa "
+export TZ={{ emacsconf_timezone }}
export PATH=$PATH:$HOME/bin
export DISPLAY=${DISPLAY:-:{{ item.vnc_id }}}
diff --git a/roles/obs/templates/scenes.json b/roles/obs/templates/scenes.json
index 5790efd..93a0592 100644
--- a/roles/obs/templates/scenes.json
+++ b/roles/obs/templates/scenes.json
@@ -1,6 +1,6 @@
{
- "current_program_scene": "Video audio and screen",
- "current_scene": "Video audio and screen",
+ "current_program_scene": "All track audio and screen",
+ "current_scene": "All track audio and screen",
"current_transition": "Fade",
"groups": [],
"modules": {