From 2517ed8672440ecbe0a367b5558e390cc59aef69 Mon Sep 17 00:00:00 2001
From: i-c-u-p <96894903+i-c-u-p@users.noreply.github.com>
Date: Wed, 27 Apr 2022 00:31:03 +0000
Subject: [PATCH 1/3]  remove xmodmap from remaps script (#1109)

Uses the "altwin:menu" option from setxkbmap to map the menu key to right super instead of xmodmap, which is deprecated. setxkbmap's options can be viewed with "man xkeyboard-config". Also tried to make the comment for the xset rate change more helpful.
---
 .local/bin/remaps | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.local/bin/remaps b/.local/bin/remaps
index 3cb41e4..c95ac84 100755
--- a/.local/bin/remaps
+++ b/.local/bin/remaps
@@ -1,13 +1,11 @@
 #!/bin/sh
 
 # This script is called on startup to remap keys.
-# Increase key speed via a rate change
+# Decrease key repeat delay to 300ms and increase key repeat rate to 50 per second.
 xset r rate 300 50
-# Map the caps lock key to super...
-setxkbmap -option caps:super
-# But when it is pressed only once, treat it as escape.
+# Map the caps lock key to super, and map the menu key to right super.
+setxkbmap -option caps:super,altwin:menu_win
+# When caps lock is pressed only once, treat it as escape.
 killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape'
-# Map the menu button to right super as well.
-xmodmap -e 'keycode 135 = Super_R'
-# Turn off the caps lock if on since there is no longer a key for it.
+# Turn off caps lock if on since there is no longer a key for it.
 xset -q | grep "Caps Lock:\s*on" && xdotool key Caps_Lock

From 09af0a77b37e56272dc2937d589eda33d30e2da0 Mon Sep 17 00:00:00 2001
From: Rokosun <79040025+futureisfoss@users.noreply.github.com>
Date: Wed, 27 Apr 2022 16:47:35 +0000
Subject: [PATCH 2/3] Numerous improvements to scope (#1088)

fallback to using mediainfo when ffmpegthumbnailer or pdftoppm is not available.
correct terminal width for bat.
use cut instead of awk for efficiency.
improve spacing/indentation for the sake of consistency in code.
---
 .config/lf/scope | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.config/lf/scope b/.config/lf/scope
index 71ab628..180c294 100755
--- a/.config/lf/scope
+++ b/.config/lf/scope
@@ -6,10 +6,10 @@ set -C -f
 IFS="$(printf '%b_' '\n')"; IFS="${IFS%_}"
 
 image() {
-	if [ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ] && command -V ueberzug >/dev/null 2>&1; then
+	if [ -f "$1" ] && [ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ] && command -V ueberzug >/dev/null 2>&1; then
 		printf '{"action": "add", "identifier": "PREVIEW", "x": "%s", "y": "%s", "width": "%s", "height": "%s", "scaler": "contain", "path": "%s"}\n' "$4" "$5" "$(($2-1))" "$(($3-1))" "$1" > "$FIFO_UEBERZUG"
 	else
-		mediainfo "$1"
+		mediainfo "$6"
 	fi
 }
 
@@ -22,23 +22,23 @@ ifub() {
 # be regenerated once seen.
 
 case "$(file --dereference --brief --mime-type -- "$1")" in
-	image/*) image "$1" "$2" "$3" "$4" "$5" ;;
-	text/html) lynx -width="$4" -display_charset=utf-8 -dump "$1"  ;;
+	image/*) image "$1" "$2" "$3" "$4" "$5" "$1" ;;
+	text/html) lynx -width="$4" -display_charset=utf-8 -dump "$1" ;;
 	text/troff) man ./ "$1" | col -b ;;
-	text/* | */xml | application/json) bat --terminal-width "$4" -f "$1" ;;
+	text/* | */xml | application/json) bat --terminal-width "$(($4-2))" -f "$1" ;;
 	application/zip) atool --list -- "$1" ;;
-        audio/* | application/octet-stream) mediainfo "$1" || exit 1;;
+	audio/* | application/octet-stream) mediainfo "$1" || exit 1 ;;
 	video/* )
-		CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | awk '{print $1}')"
+		CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)"
 		[ ! -f "$CACHE" ] && ffmpegthumbnailer -i "$1" -o "$CACHE" -s 0
-		image "$CACHE" "$2" "$3" "$4" "$5"
+		image "$CACHE" "$2" "$3" "$4" "$5" "$1"
 		;;
-        */pdf)
-		CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | awk '{print $1}')"
+	*/pdf)
+		CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)"
 		[ ! -f "$CACHE.jpg" ] && pdftoppm -jpeg -f 1 -singlefile "$1" "$CACHE"
-		image "$CACHE.jpg" "$2" "$3" "$4" "$5"
+		image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1"
 		;;
-        *opendocument*) odt2txt "$1" ;;
+	*opendocument*) odt2txt "$1" ;;
 	application/pgp-encrypted) gpg -d -- "$1" ;;
 esac
 exit 1

From dcbb7dca2a3b27183a1523bbbbacb353b34dc0d7 Mon Sep 17 00:00:00 2001
From: krisdoodle45 <86745210+krisdoodle45@users.noreply.github.com>
Date: Thu, 28 Apr 2022 15:20:59 +0200
Subject: [PATCH 3/3] Fixed peertubetorrent (#1030)

* Fixed peertubetorrent

Because of https://github.com/Chocobozzz/PeerTube/pull/3746, the torrent URL is now different from the normal video url. This means the peertube API is needed to get the new torrent link.

* No more soyregex (and use built-in curl silent option)

* Add 360p quality in the description

* Simpler regex

* Parenthesize variables
---
 .local/bin/peertubetorrent | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.local/bin/peertubetorrent b/.local/bin/peertubetorrent
index 7a7a483..e89b1c0 100755
--- a/.local/bin/peertubetorrent
+++ b/.local/bin/peertubetorrent
@@ -1,7 +1,9 @@
 #!/bin/sh
 # torrent peertube videos, requires the transadd script
-# first argument is the video link, second is the quality (480 or 1080)
+# first argument is the video link, second is the quality (360, 480 or 1080)
 # 13/07/20 - Arthur Bais
 
-link="$(echo "$1" | sed "s/w/download\/torrents/")""-$2.torrent"
+instance=$(echo "$1" | sed "s/\/w.\+//")
+vidid=$(echo "$1" | sed "s/.\+\///")
+link=$(curl -s "$instance/api/v1/videos/$vidid" | grep -o "$instance/download/torrents/.\{37\}$2.torrent")
 transadd "$link"