[emacs][bin] various updatesHEADmaster

6 files changed, 30 insertions, 2 deletions

diff --git a/emacs/.emacs.d/init/ycp-markup.el b/emacs/.emacs.d/init/ycp-markup.el
index c5f874f..68b5459 100644
--- a/emacs/.emacs.d/init/ycp-markup.el
+++ b/emacs/.emacs.d/init/ycp-markup.el
@@ -71,7 +71,7 @@
 (my-package wiki
   (my-keybind wiki-mode-map
     "C-'" #'my-wiki-grok-wikipedia)
-  (my-setq-from-local wiki-sites)
+  (my-setq-from-local wiki-sites wiki-local-dir)
   (wiki-define-site-commands)
   (add-to-list 'browse-url-handlers
                `(wiki-engine-entry-url-p
diff --git a/emacs/.emacs.d/init/ycp-web.el b/emacs/.emacs.d/init/ycp-web.el
index c43aae6..fd16b10 100644
--- a/emacs/.emacs.d/init/ycp-web.el
+++ b/emacs/.emacs.d/init/ycp-web.el
@@ -187,6 +187,7 @@
   (my-override hnreader--print-frontpage-item)
   (my-override hnreader--print-comments)
   (my-override hnreader--get-title)
+  (my-setq-from-local my-hnreader-save-dir)
   (require 'my-web)
   (add-to-list 'browse-url-handlers
                `(my-hacker-news-url-p
@@ -340,6 +341,7 @@
 
 (my-package fediorg
   (:delay 60)
+  (my-setq-from-local fediorg-dir)
   (require 'my-web)
   (add-to-list 'browse-url-handlers
                `(fediorg-post-url-p
@@ -389,6 +391,7 @@
    exitter-oauth-consumer-key exitter-oauth-consumer-secret
    exitter-access-token exitter-username exitter-password exitter-email
    exitter-oauth-token exitter-oauth-token-secret exitter-oauth-token-ctime)
+  (my-setq-from-local exitter-dir)
   (setq exitter-debug nil)
   (add-to-list 'browse-url-handlers
                `(exitter-post-url-p
@@ -398,6 +401,7 @@
 
 (my-package reddio
   (:delay 60)
+  (my-setq-from-local reddio-dir)
   (add-to-list 'browse-url-handlers
                `(reddio-reddit-url-p
                  . ,(lambda (url &rest _) (reddio-open-url url))))
diff --git a/emacs/.emacs.d/lisp/emacs-hnreader b/emacs/.emacs.d/lisp/emacs-hnreader
-Subproject 8444e177035e236e991f9ea73074c053a45426a
+Subproject a56f67a99a855ca656da1c1985e09f44509e4bb
diff --git a/emacs/.emacs.d/lisp/my/my-media-segment.el b/emacs/.emacs.d/lisp/my/my-media-segment.el
index c8326a7..e8ee5cc 100644
--- a/emacs/.emacs.d/lisp/my/my-media-segment.el
+++ b/emacs/.emacs.d/lisp/my/my-media-segment.el
@@ -210,7 +210,7 @@ Uses `my-media-segment-max-inflight' to limit number of inflight tasks."
                         (buffer-substring-no-properties
                          (point)
                          (progn (beginning-of-line 2) (point))))))
-          (push (list :title (my-make-filename title) :start start :end end) results)
+          (push (list :title (my-make-doc-file-name title) :start start :end end) results)
           )
         (setq end nil)
         (dolist (result results)
diff --git a/misc/.config/mpv/mpv.conf b/misc/.config/mpv/mpv.conf
index 3b49398..b6b1beb 100644
--- a/misc/.config/mpv/mpv.conf
+++ b/misc/.config/mpv/mpv.conf
@@ -7,6 +7,8 @@ script-opts=ytdl_hook-ytdl_path=/usr/bin/yt-dlp
 ytdl-format="bestvideo[height<=?720]+bestaudio/best"
 osc=no
 stop-screensaver = "yes"
+# play audio with ui
+# profile=pseudo-gui
 
 [emacsconf-talks]
 # Positioning
diff --git a/misc/bin/mpvmix.sh b/misc/bin/mpvmix.sh
new file mode 100755
index 0000000..8bc0ac8
--- /dev/null
+++ b/misc/bin/mpvmix.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Randomly play media segments from a list of files with start and end
+# time line format:
+# 1:00//1:05//~/file.mp4
+
+f="$1"
+n=$(cat "$f" | wc -l)
+while true; do
+  while read -r line; do
+    echo "$line"
+    regex='([0-9:]+)//([0-9:]+)//(.+)'
+    [[ "$line" =~ $regex ]] || continue
+    start=${BASH_REMATCH[1]}
+    end=${BASH_REMATCH[2]}
+    media=${BASH_REMATCH[3]}
+    media="${media/#~/${HOME}}"
+    # echo "start: $start; end: $end; file: $media"
+    mpv --start=$start --end=$end "$media"
+  done <<<$(shuf -n $n "$f")
+  sleep 1
+done