Merge pull request #32 from simono/tv-enhancements

Television enhancements

Author: simono

Brewfile

@@ -23,6 +23,7 @@ brew "rnr"
 brew "rustup"
 brew "sd"
 brew "television"
+brew "uv"
 brew "vivid"
 brew "xh"
 brew "zoxide"

dotbot-config.yaml

@@ -46,4 +46,5 @@
 - shell:
     - fish -c 'fisher update'
     - bat cache --build
-    - tv update-channels
+    - tv update-channels --force
+    - for f in television/cable-overrides/*.toml; do ./television/merge-toml.py ~/.config/television/cable/"$(basename "$f")" "$f"; done

television/cable-overrides/dirs.toml

@@ -0,0 +1,7 @@
+# Override for tv dirs channel.
+#
+# Simon Olofsson <simon@olofsson.de>
+#
+
+[preview]
+command = "eza --group-directories-first --all --icons=always --color=always --oneline '{}'"

television/cable-overrides/files.toml

@@ -0,0 +1,14 @@
+# Override for tv files channel.
+#
+# Simon Olofsson <simon@olofsson.de>
+#
+
+[preview]
+env = "__DELETE__"
+
+[keybindings]
+ctrl-x = "actions:edit"
+ctrl-b = "actions:goto_parent_dir"
+
+[actions.edit]
+mode = "fork"

television/cable-overrides/fish-history.toml

@@ -0,0 +1,9 @@
+# Override for tv fish-history channel.
+#
+# Simon Olofsson <simon@olofsson.de>
+#
+
+# Keep chronological order (newest first) when searching.
+# TODO: Remove once tv releases with this as default.
+[source]
+sort_results = false

television/cable-overrides/git-log.toml

@@ -0,0 +1,12 @@
+# Override for tv git-log channel.
+#
+# Simon Olofsson <simon@olofsson.de>
+#
+
+# Keep chronological order (newest first) when searching.
+# TODO: Remove once tv releases with this as default.
+[source]
+sort_results = false
+
+[preview]
+command = "git show -p --stat --pretty=fuller '{strip_ansi|split: :1}' | delta --color-only"

television/cable-overrides/text.toml

@@ -0,0 +1,14 @@
+# Override for tv text channel.
+#
+# Simon Olofsson <simon@olofsson.de>
+#
+
+[preview]
+env = "__DELETE__"
+
+[keybindings]
+ctrl-x = "actions:edit"
+
+[actions.edit]
+command = "vim '+{strip_ansi|split:\\::1}' '{strip_ansi|split:\\::0}'"
+mode = "fork"

television/merge-toml.py

@@ -0,0 +1,33 @@
+#!/usr/bin/env -S uv run
+# /// script
+# dependencies = ["tomli-w"]
+# ///
+# Merges override into base TOML file in-place.
+#
+# Usage: merge-toml.py base.toml override.toml
+
+import sys
+import tomllib
+import tomli_w
+from pathlib import Path
+
+
+def merge(base, override):
+    for k, v in override.items():
+        if v == "__DELETE__":
+            base.pop(k, None)
+        elif k in base and isinstance(base[k], dict) and isinstance(v, dict) and v:
+            merge(base[k], v)
+        else:
+            base[k] = v
+    return base
+
+
+if __name__ == "__main__":
+    base_path = Path(sys.argv[1])
+    override_path = Path(sys.argv[2])
+
+    base = tomllib.loads(base_path.read_text())
+    override = tomllib.loads(override_path.read_text())
+
+    base_path.write_text(tomli_w.dumps(merge(base, override)))