Merge branch 'main' of github.com:duckwork/.emacs.d

4 files changed, 72 insertions, 5 deletions

@@ -147,7 +147,7 @@ is, if point < mark."
         (5 " C%C")))
       " "))
     (file-percentage-mode
-     (7 "%p%% "))
+     ((-3 "%p") "%% "))
     ,(if (region-active-p)
          (propertize (format "%s%-5d"
                              (if (and (mark)
@@ -72,7 +72,7 @@ first RECIPE's package."
                      (car recipe)
                    recipe))))
 
-(setup-define :straight-if
+(setup-define :straight-when
   (lambda (recipe condition)
     `(if ,condition
          (straight-use-package ',recipe)
@@ -83,6 +83,7 @@ If CONDITION is false, stop evaluating the body.  This macro can
 be used as HEAD, and will replace itself with the RECIPE's
 package.  This macro is not repeatable."
   :repeatable nil
+  :indent 1
   :shorthand (lambda (sexp)
                (let ((recipe (cadr sexp)))
                  (if (consp recipe) (car recipe) recipe))))
@@ -7,12 +7,12 @@
 
 ;;; Code:
 
-(require 'ytel)
+(require 'ytel nil t)
 
 (defun acdw/ytel-current-video-link ()
   "Get the link of the video at point."
   (let* ((video (ytel-get-current-video))
-        (id (ytel-video-id video)))
+         (id (ytel-video-id video)))
     (concat "https://www.youtube.com/watch?v=" id)))
 
 (defun acdw/ytel-watch ()                    ; This could possibly use `browse-url'.
@@ -31,5 +31,45 @@
     (kill-new link)
     (message "Copied %s to kill-ring" link)))
 
+
+;;; YTDIOUS: https://github.com/spiderbit/ytdious
+;; a fork of ytel that uses table-view or w/e. looks nicer
+
+(require 'ytdious nil t)
+
+(defun acdw/ytdious-current-video-link ()
+  "Get the link of the video at point."
+  (let* ((video (ytdious-get-current-video))
+         (id (ytdious-video-id-fun video)))
+    (concat "https://www.youtube.com/watch?v=" id)))
+
+(defun acdw/ytdious-watch ()                    ; This could possibly use `browse-url'.
+  "Stream video at point in mpv."
+  (interactive)
+  (let ((link (acdw/ytdious-current-video-link)))
+    (start-process "ytdious mpv" nil
+                   "mpv"
+                   link
+                   "--ytdl-format=bestvideo[height<=?720]+bestaudio/best")
+    (message "Streaming %s..." link)))
+
+(defun acdw/ytdious-copy-link ()
+  "Copy link of the video at point."
+  (interactive)
+  (let ((link (acdw/ytdious-current-video-link)))
+    (kill-new link)
+    (message "Copied %s to kill-ring" link)))
+
+(defun acdw/ytdious-quit ()
+  "Quit ytdious."
+  ;; This corrects an error with `ytdious-quit' where it doesn't have the right
+  ;; buffer setup.
+  (interactive)
+  (quit-window))
+
+;;; Ignore `ytdious-show-image-asyncron' because it's buggy.
+
+(defalias 'ytdious-show-image-asyncron #'ignore)
+
 (provide 'acdw-ytel)
 ;;; acdw-ytel.el ends here
@@ -352,7 +352,7 @@ In short, DO NOT USE THIS FUNCTION!!!"
          (cond
           ;; Straight forms require some weirdness
           ((and s1-straight s2-straight)
-           (let* ((r (rx ":straight" (? "-if") (* space) (? "(")))
+           (let* ((r (rx ":straight" (? "-when") (* space) (? "(")))
                   (s1 (replace-regexp-in-string r "" s1))
                   (s2 (replace-regexp-in-string r "" s2)))
              (string< s1 s2)))
@@ -793,6 +793,32 @@ This function is internal.  Use `acdw/make-password-fetcher' instead."
       (insert "💩")
       (setq n (1- n)))))
 
+(defun spongebob-case-region (beg end)
+  "Make region, defined by BEG and END, lOoK lIkE tHiS."
+  (interactive "*r")
+  (save-excursion
+    (let (case)
+      (goto-char beg)
+      (while (< (point) end)
+        (if (looking-at "[[:alpha:]]")
+            (if (setq case (not case))
+                (upcase-region (point) (progn (forward-char 1) (point)))
+              (downcase-region (point) (progn (forward-char 1) (point))))
+          (forward-char 1))))))
+
+(defun spongebob-case-word (n)
+  "Spongebob-case N words forward, beginning at point, moving over."
+  (interactive "*p")
+  (spongebob-case-region (point) (progn (forward-word n) (point))))
+
+(defun spongebob-case-dwim (arg)
+  "Spongebob-case words in the region if active, else word at point.
+If ARG exists, it's passed to `spongebob-case-word'."
+  (interactive "*p")
+  (if (use-region-p)
+      (spongebob-case-region (region-beginning) (region-end))
+    (spongebob-case-word arg)))
+
 
 ;;; Fat finger solutions
 (defun acdw/fat-finger-exit (&optional prefix)