vimrc: escape text search path

.aliases

@@ -41,7 +41,7 @@ reload() {
 }
 
 update-shell() {
-    if [[ '${platform,,}' == *'ming'* ]]; then
+    if [[ ${platform,,} == *'ming'* ]]; then
         pacman -Syu
         printf "\n${BOLD}${YELLOW}Close this shell, open a new one, and then run 'pacman -Su'${NORMAL}\n"
     fi
@@ -63,6 +63,7 @@ expand_path() {
     ret=$(readlink -m "$ret")
     echo $ret
 }
+
 is_absolute_unix_path() {
     if [[ $1 =~ ^/ ]]; then echo 1; else echo 0; fi
 }
@@ -109,8 +110,12 @@ remove_windows_file() {
     fi
 }
 
-open_explorer_here() {
-    local path_expanded=$(expand_path "$1")
+open_explorer() {
+    local target="$1"
+    if [[ $target == "" ]]; then
+        target="$PWD"
+    fi
+    local path_expanded=$(expand_path "$target")
     if [[ -d $path_expanded ]]; then
         local path=$(unix_to_windows_path "$path_expanded")
         explorer.exe "$path"
@@ -119,6 +124,54 @@ open_explorer_here() {
     fi
 }
 
+open_filepilot() {
+    local target="$1"
+    if [[ $target == "" ]]; then
+        target="$PWD"
+    fi
+    local path_expanded=$(expand_path "$target")
+    if [[ -d $path_expanded ]]; then
+        local path=$(unix_to_windows_path "$path_expanded")
+        start fpilot.exe "$path"
+    else
+        echo "Folder no longer exists"
+    fi
+}
+
+remove_extra_spaces() {
+    # Replace consecutive spaces with a single space.
+    #
+    # We're using this in the various vid/audio download functions because
+    # Windows seems to strip extra spaces when creating a file, so we need
+    # to match this behaviour in order to do post-processing after downloading.
+    ret=$(echo "$1" | tr -s ' ')
+    echo "$ret"
+}
+
+flash_taskbar() {
+    if [[ ${platform,,} == *'ming'* ]]; then
+      powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "
+      \$h = (Get-Process mintty -EA SilentlyContinue | ? MainWindowHandle | select -First 1).MainWindowHandle
+      if (-not \$h) { exit }
+
+      Add-Type -TypeDefinition 'using System; using System.Runtime.InteropServices;
+      public static class F {
+        [StructLayout(LayoutKind.Sequential)] public struct I { public uint cb; public IntPtr h; public uint f; public uint c; public uint t; }
+        [DllImport(\"user32.dll\")] public static extern bool FlashWindowEx(ref I i);
+      }'
+      \$i = New-Object F+I
+      \$i.cb = [Runtime.InteropServices.Marshal]::SizeOf(\$i)
+      \$i.h  = [IntPtr]\$h
+      \$i.f  = 2 -bor 12
+      \$i.c  = 0
+      \$i.t  = 0
+      [F]::FlashWindowEx([ref]\$i) | Out-Null
+      "
+    else
+        echo "flash_taskbar not implemented for this platform"
+    fi
+}
+
 ##################
 # Building code
 ##################
@@ -169,7 +222,7 @@ if [[ $platform == 'Darwin' ]]; then
   alias trash='rmtrash'
   alias tt='rmtrash'
 
-elif [[ "${platform,,}" == *'ming'* ]]; then # convert to lowercase then compare with wildcard
+elif [[ ${platform,,} == *'ming'* ]]; then # convert to lowercase then compare with wildcard
   #alias rm='echo "use trash command instead!"'
   #alias rmr='echo "use trash command instead!"'
   alias trash='remove_windows_file'
@@ -189,20 +242,27 @@ alias ls='ls -F --color'
 alias l='ls -lh'
 alias ll='ls -lha'
 
-alias aliases='vim ~/.dotfiles/aliases'
+mkcd() {
+    mkdir -p "${1}"
+    cd "${1}"
+}
+
+alias aliases='vim ~/.aliases'
 alias al='aliases'
 
-if [[ "${platform,,}" == *'ming'* ]]; then
+if [[ ${platform,,} == *'ming'* ]]; then
     _checksum() {
         local algo="$1"
         local file="$2"
-        certutil -hashfile $file $algo
+        certutil -hashfile "$file" $algo
     }
     alias checksum='certutil -hashfile'
-    alias checksum-md5='_checksum MD5'
-    alias checksum-sha1='_checksum SHA1'
-    alias checksum-sha256='_checksum SHA256'
-    alias checksum-sha512='_checksum SHA512'
+
+    # I use delegating to certutil via _checksum() but these programs are faster.
+    alias checksum-md5='md5sum.exe'
+    alias checksum-sha1='sha1sum.exe'
+    alias checksum-sha256='sha256sum.exe'
+    alias checksum-sha512='sha512sum.exe'
 fi
 
 check_signature() {
@@ -233,22 +293,21 @@ alias cls=clear
 alias cpr='cp -r'
 alias dc='gdc'
 alias duh='du -csh'
-alias e='open_explorer_here "$PWD"'
-alias exp='echo "Use e instead."'
+
+dos2unix_all() {
+    local path="$1"
+    if [[ $path == "" ]]; then
+        path="$PWD"
+    fi
+    find $path -type f -exec dos2unix '{}' '+'
+}
+alias d2u='dos2unix_all'
+
+alias e='open_explorer'
 alias f='fg'
 alias hist='history'
 alias histroy='history'
-alias irb='irb --readline -r irb/completion'
-alias lcc='lein clean'
-alias lca='lein cljsbuild auto dev'
-alias ldi='lein deps install'
-alias lsd='lein start-dev'
 alias moon='curl wttr.in/moon -A "curl"'
-alias reguard='killall -9 ruby ; guard'
-alias rb='rbenv'
-alias rbg='rbenv gemset active'
-alias rbp='cd $RBENV_PATH/versions/$(rbenv version | sed -e "s/ (set.*$//")'
-alias rbl='cd $RBENV_PATH/versions/$(rbenv version | sed -e "s/ (set.*$//")/lib/ruby'
 alias rc='rclone'
 alias rcc='rclone copy'
 alias restart='sudo shutdown now -r'
@@ -262,9 +321,6 @@ alias t='tree'
 alias tag='ctags -R .'
 alias v='vim'
 alias vi='vim'
-alias vh='vagrant halt'
-alias vs='vagrant ssh'
-alias vu='vagrant up'
 alias vimrc='vim ~/.vimrc'
 alias weather='curl wttr.in/toronto -A "curl"'
 
@@ -337,7 +393,9 @@ make_vid_dir_and_cd_into() {
         fi
     fi
 
-    printf "${BOLD}Creating directory ${YELLOW}'$dir_name'${NORMAL}\n"
+    dir_name=$(remove_extra_spaces "$dir_name")
+
+    printf "${BOLD}Creating directory ${YELLOW}\"$dir_name\"${NORMAL}\n"
     mkdir "$dir_name" 2>/dev/null
     cd "$dir_name"
 
@@ -353,32 +411,54 @@ make_vid_dir_and_cd_into() {
 function my_transcribe_video() {
     file="$1"
     output="$2"
+    include_small=$3
+    start_time="$4"
+    end_time="$5"
+
     if [[ $file == "" ]]; then
-        printf "Usage: <input video> <optional output name>\n"
+        error "Usage: <input video> <optional output name> <optional include small model (1 or 0)> <optional start time> <optional end time>"
         return
     fi
     if [[ $output == "" ]]; then
         output="${1%.*}"  # just use the input name without the extension.
     fi
+
+    if [[ $start_time == "" ]]; then start_time="0"; fi
+    if [[ $end_time   == "" ]]; then end_time="0"; fi
+
     # Tiny is fast and semi-accurate, so whatever.
     # Base is pretty good overall. It has good punctuation inserting and
     # catches most words. Small and medium can do better word detection at
     # times, but suffer from bad punctuation. Medium is particularly bad and
     # not adding commas and periods.
-    transcribe-video "$file" "$output" tiny base
+    if [[ $include_small -eq 1 ]]; then
+        transcribe-video "$file" "$output" $start_time $end_time tiny base small
+    else
+        transcribe-video "$file" "$output" $start_time $end_time tiny base
+    fi
+    flash_taskbar
 }
 
 function my_transcribe_video_all_models() {
     file="$1"
     output="$2"
+    start_time="$3"
+    end_time="$4"
+
     if [[ $file == "" ]]; then
-        printf "Usage: <input video> <optional output name>\n"
+        error "Usage: <input video> <optional output name> <optional start time> <optional end time>"
         return
     fi
+
     if [[ $output == "" ]]; then
         output="${1%.*}"   # just use the input name without the extension.
     fi
-    transcribe-video "$file" "$output" tiny base small medium
+
+    if [[ $start_time == "" ]]; then start_time="0"; fi
+    if [[ $end_time   == "" ]]; then end_time="0"; fi
+
+    transcribe-video "$file" "$output" $start_time $end_time tiny base small medium
+    flash_taskbar
 }
 
 
@@ -409,13 +489,10 @@ download_youtube_vid() {
 
     if [[ $format == "" ]]; then
         printf "${BOLD}No format given; using best available.${NORMAL}\n"
-        # Download best mp4 video.
-        format="bv*[ext=mp4]+ba[ext=m4a]"
+        # Download best mp4 video, best audio then merge.
+        format="bv[ext=mp4]+ba[ext=m4a]"
     fi
 
-    # We're assuming we'll always have an mp4 video only and audio track to merge.
-    opts+=" --merge-output-format mp4 --write-subs --sub-lang en --embed-subs"
-
     if [[ $make_folder == "1" ]]; then
         make_vid_dir_and_cd_into $url ""
         if [[ $? -ne 0 ]]; then
@@ -431,9 +508,13 @@ download_youtube_vid() {
 
     # Get the video filename.
     local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
+    filename=$(remove_extra_spaces "$filename")
     printf "filename: $filename\n"
 
-    # Download
+    # Download the video.
+    # We're assuming we'll always have an mp4 video only and audio track to merge.
+    opts+=" --merge-output-format mp4 --write-subs --sub-lang en --embed-subs --embed-thumbnail --embed-metadata"
+
     local cmd="yt-dlp.exe -f $format -o \"$filename\" $opts $url"
     eval $cmd   # Need to eval in order to preserve the quotes wrapping the filename format string.
     error=$?
@@ -454,8 +535,16 @@ download_youtube_vid() {
     if [[ $make_folder == "1" ]]; then cd ..; fi
 
     printf "${BOLD}Finished downloading ${YELLOW}$filename${NORMAL}\n"
+    flash_taskbar
 }
 
+
+#
+# You can control which videos are downloaded using the opts param:
+#   --playlist-start NUMBER  (1-indexed)
+#   --playlist-end   NUMBER
+#   --playlist-items ITEMS   (Can be something like 1,2,5 or a range like 1-3,7,10-20)
+#
 download_youtube_playlist() {
     local format="$1"
     local url="$2"
@@ -463,8 +552,8 @@ download_youtube_playlist() {
     shift 3
     local opts="$@"
 
-    if [[ $url == "" ]]; then
-        error "Usage: <url> <directory name (optional)> <optional args>"
+    if [[ $url == "" || $dir_name == "" ]]; then
+        error "Usage: <url> <directory name> <optional args>"
         return
     fi
 
@@ -472,29 +561,28 @@ download_youtube_playlist() {
 
     if [[ $format == "" ]]; then
         printf "${BOLD}No format given; using best available.${NORMAL}\n"
-        # Download best mp4 video and best m4a audio, then merge.
-        format="bv*[ext=mp4]+ba[ext=m4a]"
-        opts+=" --merge-output-format mp4"
+        # Download best mp4 video, best audio then merge.
+        format="bv[ext=mp4]+ba[ext=m4a]"
     fi
 
-    opts+=" --write-sub --sub-lang en --embed-subs"
-
-    if [[ $dir_name != "" ]]; then
     make_vid_dir_and_cd_into $url "$dir_name"
     if [[ $? -ne 0 ]]; then
         return
     fi
-    fi
 
-    local cmd="yt-dlp.exe -f $format -o \"v%(playlist_index)03d--%(upload_date>%Y-%m-%d)s-%(title)s-yt-%(id)s.%(ext)s\" $opts $url"
+    # We're assuming we'll always have an mp4 video only and audio track to merge.
+    opts+=" --merge-output-format mp4 --write-subs --sub-lang en --embed-subs --embed-thumbnail --embed-metadata"
+
+    local cmd="yt-dlp.exe -f $format -o \"%(playlist_index)03d--%(upload_date>%Y-%m-%d)s-%(title)s-yt-%(id)s.%(ext)s\" $opts $url"
     eval $cmd   # Need to eval in order to preserve the quotes wrapping the filename format string.
 
     # Removing any trailing subtitle files
     rm *.vtt *.srt 2>/dev/null
 
-    if [[ $dir_name == "1" ]]; then cd ..; fi
+    cd ..
 
     printf "${BOLD}Finished downloading the playlist\n${NORMAL}"
+    flash_taskbar
 }
 
 download_youtube_playlist_list() {
@@ -514,6 +602,7 @@ download_youtube_playlist_list() {
     eval $cmd  1>"${output_name}.txt"  # Need to eval in order to preserve the quotes wrapping the filename format string.
 
     printf "${BOLD}Finished downloading the playlist video list\n${NORMAL}"
+    flash_taskbar
 }
 
 download_youtube_uploads_list() {
@@ -542,12 +631,59 @@ download_youtube_uploads_list() {
     eval $cmd  1>"${output_name}.txt"  # Need to eval in order to preserve the quotes wrapping the filename format string.
 
     printf "${BOLD}Finished downloading the upload list\n${NORMAL}"
+    flash_taskbar
+}
+
+function download_youtube_audio() {
+    local make_folder="$1"
+    local url="$2"
+    shift 2
+    local opts="$@"
+
+    if [[ $url == "" ]]; then
+        error "Usage: <make folder?> <url> <optional args>"
+        return
+    fi
+
+    printf "${BOLD}Downloading Youtube audio\n\n${NORMAL}"
+
+    if [[ $make_folder == "1" ]]; then
+        make_vid_dir_and_cd_into $url ""
+        if [[ $? -ne 0 ]]; then
+            return
+        fi
+    fi
+
+    local format="140"
+    local name_format="%(upload_date>%Y-%m-%d)s-%(title)s-yt-%(id)s"
+
+    # Get the audio filename.
+    local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
+    filename=$(remove_extra_spaces "$filename")
+    printf "filename: $filename\n"
+
+    # Download the audio.
+    local cmd="yt-dlp.exe -f $format -o \"$filename\" $opts $url"
+    eval $cmd   # Need to eval in order to preserve the quotes wrapping the filename format string.
+    error=$?
+
+    if [[ $error -ne 0 ]]; then
+        error "Error: Failed to download '$url'"
+        if [[ $make_folder == "1" ]]; then cd ..; fi
+        return
+    fi
+
+    if [[ $make_folder == "1" ]]; then cd ..; fi
+
+    printf "${BOLD}Finished downloading ${YELLOW}$filename${NORMAL}\n"
+    flash_taskbar
 }
 
 # Download Twitch chat transcript
 actually_download_twitch_chat() {
     local url="$1"
     local filename="$2"
+    filename=$(remove_extra_spaces "$filename")
 
     rechat.exe -d $url "$filename.json"
     if [[ -f "$filename.json" ]]; then
@@ -578,7 +714,7 @@ download_twitch_chat() {
         fi
     fi
 
-    actually_download_twitch_chat $url "$(yt-dlp.exe --get-filename -o "%(upload_date>%Y-%m-%d)s-%(title)s-tw-%(id)s.chat" $opts $url)"
+    actually_download_twitch_chat $url "$(yt-dlp.exe --get-filename -o "%(upload_date>%Y-%m-%d)s-%(title)s-tw-%(id)s" $opts $url)"
 
     if [[ $make_folder == "1" ]]; then cd ..; fi
 }
@@ -592,7 +728,15 @@ download_twitch_chat() {
 #   `tw-1080p60 <url> --cookies /c/<cookie_path>/twitch_cookies.txt`
 #
 # To extract a portion of a video, you have to first download the entire file and then use the
-# `trim-video` or `compress-video-and-trim` scripts.
+# `trim-video` or `compress-video' with a time range.
+#
+# To download a partial stream use one of these commands. We need to reencode to remove extra frames from the start/end with a negative timeline.
+#
+#   This reencodes during the download, slightly faster than the next option:
+#   yt-dlp -f "b" --external-downloader ffmpeg --external-downloader-args "ffmpeg_i:-ss 0:7:10.00 -to 0:8:06.00" --external-downloader-args "ffmpeg_o:-c:v libx264 -c:a aac" URL
+#
+#   Download then re-encode:
+#   yt-dlp -f "b" --external-downloader ffmpeg --external-downloader-args "ffmpeg_i:-ss 5:25:38.00 -to 5:56:50.00" URL -o temp.mp4 ; trim-video-cpu temp.mp4 "FINAL_NAME" 0
 #
 download_twitch_vid() {
     local format="$1"
@@ -613,12 +757,15 @@ download_twitch_vid() {
     # It's a two step process because streamlink cannot pass the formatted filename to ffmpeg.
     # We fallback to yt-dlp when it's a subscriber VOD because we don't have an easy way to access it with streamlink.
 
-    local subscriber_vod=0
+    local use_ytdlp=0
+
     local split_opts=($opts)
-    if [[ ${split_opts[0]} == "--cookies" ]]; then
-        subscriber_vod=1
+    for i in "${split_opts[@]}"; do
+        if [[ $i == "--cookies" ]]; then
+            use_ytdlp=1
             printf "${BOLD}Subscriber VOD. Will use yt-dlp to download.${NORMAL}\n"
         fi
+    done
 
     if [[ $shortname == "1" || $compress == "1" || $transcribe == "1" ]]; then
         printf "${BOLD}Downloading Twitch vid "
@@ -661,16 +808,19 @@ download_twitch_vid() {
 
     # Get the video filename.
     local filename=$(yt-dlp.exe --get-filename -f $yt_dlp_format -o "$name_format.%(ext)s" $opts $url)
+    filename=$(remove_extra_spaces "$filename")
+    printf "filename: $filename\n"
 
-    # Download
-    if [[ $subscriber_vod == "0" ]]; then
-        local cmd="streamlink.exe --twitch-low-latency --twitch-disable-ads --twitch-disable-hosting --force --force-progress $opts $url $streamlink_format -O | ffmpeg -i pipe:0 -c copy \"$filename\""
-    else
+    # Download the video.
+    if [[ $use_ytdlp == "1" ]]; then
+        printf "${YELLOW}${BOLD}\nUsing yt-dlp to download...${NORMAL}\n"
+        opts+=" --embed-thumbnail --embed-metadata"
         local cmd="yt-dlp.exe -f $yt_dlp_format -o \"$filename\" $opts $url"
+    else
+        printf "${YELLOW}${BOLD}\nUsing streamlink to download...${NORMAL}\n"
+        local cmd="streamlink.exe --twitch-low-latency --twitch-disable-ads --twitch-disable-hosting --force --progress=force $opts $url $streamlink_format -O | ffmpeg -i pipe:0 -c copy \"$filename\""
     fi
 
-    printf "${YELLOW}${BOLD}Downloading video\n${NORMAL}"
-
     eval $cmd  # Need to eval in order to preserve the quotes wrapping the filename format string.
     error=$?
 
@@ -682,9 +832,9 @@ download_twitch_vid() {
 
     if [[ $compress == "1" ]]; then
         local temp_name="temp_${RANDOM}"
-        # 0=cpu, 1=gpu
-        compress-video "$filename" "$temp_name" 0
         extension="${filename##*.}"
+        # 0=cpu, 1=gpu
+        compress-video "$filename" "$temp_name" 1
         mv "$filename" "orig_$filename"
         mv $temp_name.$extension "$filename"
         printf "${BOLD}Make sure to delete the original video file\n${NORMAL}"
@@ -697,6 +847,7 @@ download_twitch_vid() {
     if [[ $make_folder == "1" ]]; then cd ..; fi
 
     printf "${BOLD}Finished downloading ${YELLOW}$filename${NORMAL}\n"
+    flash_taskbar
 }
 
 # Download Vimeo videos.
@@ -704,20 +855,29 @@ download_twitch_vid() {
 # e.g.  --cookies cookies.txt --referer https://gillyandkeeves.tv https://player.vimeo.com/video/756941969
 # The vid ID can be found by looking at the embed's iframe src attribute.
 download_vimeo_vid() {
-    local shortname="$1"
-    local compress="$2"
-    local transcribe="$3"
-    local format="$4"
+    local format="$1"
+    local shortname="$2"
+    local compress="$3"
+    local transcribe="$4"
     local make_folder="$5"
     local url="$6"
-    shift 5
+    shift 6
     local opts="$@"
 
-    if [[ $format == "" || $url == "" ]]; then
-        error "Usage: <format> <make folder?> <url> <optional args>"
+    if [[ $url == "" ]]; then
+        error "Usage: <make folder?> <url> <optional args>"
         return
     fi
 
+    if [[ $format == "" ]]; then
+        printf "${BOLD}No format given; using best available.${NORMAL}\n"
+        # Download best mp4 video, best audio then merge.
+        format="bv[ext=mp4]+ba[ext=m4a]"
+    fi
+
+    # We're assuming we'll always have an mp4 video only and audio track to merge.
+    opts+=" --merge-output-format mp4 --write-subs --sub-lang en --embed-subs --embed-thumbnail --embed-metadata"
+
     if [[ $shortname == "1" || $compress == "1" || $transcribe == "1" ]]; then
         printf "${BOLD}Downloading Vimeo vid "
         if [[ $shortname == "1" ]];  then printf "| ${YELLOW}using short name${NORMAL}${BOLD} "; fi
@@ -741,9 +901,12 @@ download_vimeo_vid() {
         local name_format="%(upload_date>%Y-%m-%d)s-shortname-vimeo-%(id)s"
     fi
 
-    # Download the video.
+    # Get the video filename.
     local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
+    filename=$(remove_extra_spaces "$filename")
+    printf "filename: $filename\n"
 
+    # Download the video.
     local cmd="yt-dlp.exe -f $format -o \"$filename\" $opts $url"
     eval $cmd   # Need to eval in order to preserve the quotes wrapping the filename format string.
 
@@ -752,7 +915,7 @@ download_vimeo_vid() {
         if [[ $compress == "1" ]]; then
             local temp_name="temp_${RANDOM}"
             # 0=cpu, 1=gpu
-            compress-video "$filename" "$temp_name" 0
+            compress-video "$filename" "$temp_name" 1
             extension="${filename##*.}"
             mv "$filename" "orig_$filename"
             mv $temp_name.$extension "$filename"
@@ -771,6 +934,7 @@ download_vimeo_vid() {
     if [[ $make_folder == "1" ]]; then cd ..; fi
 
     printf "${BOLD}Finished downloading ${YELLOW}$filename${NORMAL}\n"
+    flash_taskbar
 }
 
 # Download Twitter videos.
@@ -778,7 +942,7 @@ download_twitter_vid() {
     local format="$1"
     local make_folder="$2"
     local url="$3"
-    local vid_name="$4"
+    local vid_name="$4" # optional
 
     if [[ $url == "" ]]; then
         error "Usage: <make folder?> <url> <optional filename> <optional args>"
@@ -787,13 +951,26 @@ download_twitter_vid() {
 
     printf "${BOLD}Downloading Twitter vid.${NORMAL}\n"
 
+    local opts=""
+
+    if [[ $# > 3 ]]; then
+        # Since the name is optional and we might pass options, like --cookie etc
+        # we need to check if the vid name is set to an option.
+        if [[ $vid_name == -* ]]; then
+            echo "vid name is an option"
+            shift 3
+            vid_name=""
+            opts="$@"
+        else
+            shift 4
+            opts="$@"
+        fi
+    fi
+
     if [[ $vid_name == "" ]]; then
         local name_format="%(upload_date>%Y-%m-%d)s-%(title)s-twitter-%(id)s"
-        local opts=""
     else
         local name_format="%(upload_date>%Y-%m-%d)s-${vid_name}-twitter-%(id)s"
-        shift 4
-        local opts="$@"
     fi
 
     if [[ $make_folder == "1" ]]; then
@@ -808,9 +985,13 @@ download_twitter_vid() {
         format="b"
     fi
 
-    # Download the video.
+    # Get the video filename.
     local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
+    filename=$(remove_extra_spaces "$filename")
+    printf "filename: $filename\n"
 
+    # Download the video.
+    opts+=" --embed-thumbnail --embed-metadata"
     local cmd="yt-dlp.exe -f $format -o \"$filename\" $opts $url"
     eval $cmd   # Need to eval in order to preserve the quotes wrapping the filename format string.
 
@@ -822,15 +1003,17 @@ download_twitter_vid() {
     if [[ $make_folder == "1" ]]; then cd ..; fi
 
     printf "${BOLD}Finished downloading ${YELLOW}$filename${NORMAL}\n"
+    flash_taskbar
 }
 
 # Download Instagram videos.
+# If the download fails because you need to be authenticated then don't use the cookies arg because IG will flag your
+# account as a bot and might ban you. Instead, use the instagram download code from private dotfiles.
 download_instagram_vid() {
     local transcribe="$1"
-
     local make_folder="$2"
     local url="$3"
-    local vid_name="$4"
+    local vid_name="$4" # optional
 
     if [[ $url == "" ]]; then
         error "Usage: <make folder?> <url> <optional filename> <optional args>"
@@ -839,13 +1022,26 @@ download_instagram_vid() {
 
     printf "${BOLD}Downloading Instagram vid.${NORMAL}\n"
 
+    local opts=""
+
+    if [[ $# > 3 ]]; then
+        # Since the name is optional and we might pass options, like --cookie etc
+        # we need to check if the vid name is set to an option.
+        if [[ $vid_name == -* ]]; then
+            echo "vid name is an option"
+            shift 3
+            vid_name=""
+            opts="$@"
+        else
+            shift 4
+            opts="$@"
+        fi
+    fi
+
     if [[ $vid_name == "" ]]; then
         local name_format="%(upload_date>%Y-%m-%d)s-%(title)s-ig-%(id)s"
-        local opts=""
     else
         local name_format="%(upload_date>%Y-%m-%d)s-${vid_name}-ig-%(id)s"
-        shift 4
-        local opts="$@"
     fi
 
     if [[ $make_folder == "1" ]]; then
@@ -857,9 +1053,13 @@ download_instagram_vid() {
 
     format="b" # best available
 
-    # Download the video.
+    # Get the video filename.
     local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
+    filename=$(remove_extra_spaces "$filename")
+    printf "filename: $filename\n"
 
+    # Download the video.
+    opts+=" --embed-thumbnail --embed-metadata"
     local cmd="yt-dlp.exe -f $format -o \"$filename\" $opts $url"
     eval $cmd   # Need to eval in order to preserve the quotes wrapping the filename format string.
 
@@ -877,6 +1077,7 @@ download_instagram_vid() {
     if [[ $make_folder == "1" ]]; then cd ..; fi
 
     printf "${BOLD}Finished downloading ${YELLOW}$filename${NORMAL}\n"
+    flash_taskbar
 }
 
 # Download MP4 video.
@@ -900,20 +1101,36 @@ download_mp4() {
     fi
 
     mv $temp_name "$filename.mp4"
+    flash_taskbar
 }
 
-# Download from m3u8 stream to mp4.
-download_from_m3u8() {
-    local m3u8_path="$1"
+# Download a stream to mp4. Can be from an m3u8 file, an mpd, etc. Whatever the
+# supported extensions are from ffmpeg.
+#
+# You can supply a local file or a URL to the stream file. If the request
+# requires cookies then the easiest way to do it is to run the ffmpeg command
+# yourself using this as the example format:
+#
+# ffmpeg -protocol_whitelist file,https,crypto,tls,tcp -headers $'Cookie: CloudFront-Policy=ayJTdGF0ZW1lbnQiOlt7IlJlc291cmNlIjoiaHR0cHM6Ly92aWRlby5zdGVsbGFydGlja2V0cy5jb20vb3JnYW5pemF0aW9ucy8yYWQ0YTBhYi1iZWM3LTQ4NjMtYTBmMS0zNjI0N2NjODNkMjMvdHJhbnNjb2RlZC85MWFmYjI4MS0wNy0yMC0yM19LcmF6YW1fUHJlc2VudHMqIiwiQ29uZGl0aW9uIjp7IkRhdGVMZXNzVGhhbiI6eyJBV1M6RXBvY2hUaW1lIjoxNjkwNDk4ODAwfSwiSXBBZGRyZXNzIjp7IkFXUzpTb3VyY2VJcCI6IjY0LjEzNy4xNDkuMTkzLzMyIn19LCJTdHJlYW1Ub2tlbklkIjoiOTJlMTg2ZjUtZWZiMS00ZDAzLWE0NGQtZTg3YzQ3NzFiODI2IiwiU3RyZWFtVG9rZW5WaWV3ZXJJZCI6Ijg3NzFlMTBhLTcxNjUtNDcxOS1iMjFiLTkwNjljZDgzNzdhYyIsIlN0cmVhbVRva2VuVmlld2VyVHlwZSI6IkN1c3RvbWVyIiwiU3RyZWFtVG9rZW5SZXNvdXJjZUlkIjoiZDY3Mzc4NWMtNDEzNy00MDRhLTkzZjctNjQxN2Q4MmY2NmUxIiwiU3RyZWFtVG9rZW5SZXNvdXJjZVR5cGUiOiJWaWRlb09uRGVtYW5kIn1dfQ__; CloudFront-Signature=H0RwSHRX9y4PIqbAmxtEoGEPbO5da%7EW764sbHBXcPwnSSuq5PcjPM2UuP1YKL%7E92WcRTEiJ9FMDVbxNtPDZea2lCk9txvpHdmn7BBy6JNwKd-%7ED9RKq3SSqB00O8P1VkztKtkALYgn8lq3ihk7Nss0wYE9WxgvNNU30umcP-wSHFtuiGsbArivbWvu639Ku5bkfwm8azXI9hvz5D7OtwSyo3z%7E8trw3rALDwCgHZiqQrEQtfN4NYAWZ%7EuzdcGRgdUVmMQotBHG0WpPDItqBR9RLVel%7EWB0mQOO3Dax9DnGHlBaBs5mdR28NqOj8XCY4pAhguJQlERcANIK2WXm56dA__; CloudFront-Key-Pair-Id=APK3IWIJLRLBNXI2PR4Q\r\n' -i https://video.stellartickets.com/organizations/2ad4a0ac-bec7-4863-a0f1-36247cc83d23/transcoded/91afb281-07-20-23_Krazam_Presents_index_1080p_20230721T024151_1.m3u8 -acodec copy -vcodec copy krazam.mp4
+#
+# You can get the cookie header value from the browser's dev tools network
+# page. I tried adding support to this function so that you can just pass the
+# cookie value as an arg but it would not work and I don't want to waste more
+# time on it.
+#
+# If you need to debug the http request then add "-v trace" to the command above.
+#
+download_mp4_from_stream() {
+    local stream_path="$1"
     local filename="$2"
 
-    if [[ $m3u8_path == "" || $filename == "" ]]; then
-        error "Usage: <m3u8 path> <filename>"
+    if [[ $stream_path == "" || $filename == "" ]]; then
+        error "Usage: <stream path> <filename>"
         return
     fi
 
     printf "${BOLD}Downloading: ${YELLOW}$filename${NORMAL}\n"
-    ffmpeg.exe -protocol_whitelist file,https,crypto,tls,tcp -i $m3u8_path -acodec copy -vcodec copy "${filename}.mp4"
+    ffmpeg.exe -protocol_whitelist file,data,https,crypto,tls,tcp -allowed_extensions ALL -i $stream_path -acodec copy -vcodec copy "${filename}.mp4"
 
     if [[ $? -ne 0 ]]; then
         error "Error: failed to download."
@@ -921,6 +1138,29 @@ download_from_m3u8() {
     fi
 
     printf "${BOLD}Finished downloading ${YELLOW}$filename${NORMAL}\n"
+    flash_taskbar
+}
+
+# Same notes from above regarding cookies/headers.
+download_aac_from_stream() {
+    local stream_path="$1"
+    local filename="$2"
+
+    if [[ $stream_path == "" || $filename == "" ]]; then
+        error "Usage: <stream path> <filename>"
+        return
+    fi
+
+    printf "${BOLD}Downloading: ${YELLOW}$filename${NORMAL}\n"
+    ffmpeg.exe -protocol_whitelist file,https,crypto,tls,tcp -i $stream_path -acodec copy "${filename}.aac"
+
+    if [[ $? -ne 0 ]]; then
+        error "Error: failed to download."
+        return
+    fi
+
+    printf "${BOLD}Finished downloading ${YELLOW}$filename${NORMAL}\n"
+    flash_taskbar
 }
 
 
@@ -932,29 +1172,55 @@ alias yt-list-desc='download_youtube_uploads_list 1 '
 
 alias yt='download_youtube_vid                  ""        $SHORTNAME_OFF $TRANSCRIBE_OFF'
 alias yt-shortname='download_youtube_vid        ""        $SHORTNAME_ON  $TRANSCRIBE_OFF'
-alias yt-1080='download_youtube_vid             "137+140" $SHORTNAME_OFF $TRANSCRIBE_OFF'
-alias yt-1080-shortname='download_youtube_vid   "137+140" $SHORTNAME_ON  $TRANSCRIBE_OFF'
-alias yt-720='download_youtube_vid              "136+140" $SHORTNAME_OFF $TRANSCRIBE_OFF'
-alias yt-720-shortname='download_youtube_vid    "136+140" $SHORTNAME_ON  $TRANSCRIBE_OFF'
+
+alias yt-4k='download_youtube_vid               "625+234" $SHORTNAME_OFF $TRANSCRIBE_OFF'
+alias yt-4k-shortname='download_youtube_vid     "625+234" $SHORTNAME_ON  $TRANSCRIBE_OFF'
+
+alias yt-1440='download_youtube_vid             "620+234" $SHORTNAME_OFF $TRANSCRIBE_OFF'
+alias yt-1440p60='download_youtube_vid          "400+234" $SHORTNAME_OFF $TRANSCRIBE_OFF'
+alias yt-1440-shortname='download_youtube_vid   "620+234" $SHORTNAME_OFF $TRANSCRIBE_OFF'
+
+# Premium
+alias yt-1080p='download_youtube_vid            "616+234" $SHORTNAME_OFF $TRANSCRIBE_OFF'
+alias yt-1080p-shortname='download_youtube_vid  "616+234" $SHORTNAME_ON  $TRANSCRIBE_OFF'
+# Normal
+alias yt-1080='download_youtube_vid             "137+ba[ext=m4a]" $SHORTNAME_OFF $TRANSCRIBE_OFF'
+alias yt-1080-shortname='download_youtube_vid   "137+ba[ext=m4a]" $SHORTNAME_ON  $TRANSCRIBE_OFF'
+
+alias yt-720='download_youtube_vid              "136+234" $SHORTNAME_OFF $TRANSCRIBE_OFF'
+alias yt-720-shortname='download_youtube_vid    "136+234" $SHORTNAME_ON  $TRANSCRIBE_OFF'
+
 #TRANSCRIPTION ON
 alias ytt='download_youtube_vid                 ""        $SHORTNAME_OFF $TRANSCRIBE_ON'
 alias yt-shortname-t='download_youtube_vid      ""        $SHORTNAME_ON  $TRANSCRIBE_ON'
-alias yt-1080-t='download_youtube_vid           "137+140" $SHORTNAME_OFF $TRANSCRIBE_ON'
-alias yt-1080-shortname-t='download_youtube_vid "137+140" $SHORTNAME_ON  $TRANSCRIBE_ON'
-alias yt-720-t='download_youtube_vid            "136+140" $SHORTNAME_OFF $TRANSCRIBE_ON'
-alias yt-720-shortname-t='download_youtube_vid  "136+140" $SHORTNAME_ON  $TRANSCRIBE_ON'
+alias yt-4k-t='download_youtube_vid             "625+234" $SHORTNAME_OFF $TRANSCRIBE_ON'
+alias yt-4k-shortname-t='download_youtube_vid   "625+234" $SHORTNAME_ON  $TRANSCRIBE_ON'
+alias yt-1440-t='download_youtube_vid           "620+234" $SHORTNAME_OFF $TRANSCRIBE_ON'
+alias yt-1440-shortname-t='download_youtube_vid "620+234" $SHORTNAME_ON  $TRANSCRIBE_ON'
+alias yt-1080p-t='download_youtube_vid           "616+234" $SHORTNAME_OFF $TRANSCRIBE_ON'
+alias yt-1080p-shortname-t='download_youtube_vid "616+234" $SHORTNAME_ON  $TRANSCRIBE_ON'
+alias yt-1080-t='download_youtube_vid           "270+234" $SHORTNAME_OFF $TRANSCRIBE_ON'
+alias yt-1080-shortname-t='download_youtube_vid "270+234" $SHORTNAME_ON  $TRANSCRIBE_ON'
+alias yt-720-t='download_youtube_vid            "136+234" $SHORTNAME_OFF $TRANSCRIBE_ON'
+alias yt-720-shortname-t='download_youtube_vid  "136+234" $SHORTNAME_ON  $TRANSCRIBE_ON'
 #---------------------------
 alias yt-playlist='download_youtube_playlist       ""'
+alias yt-playlist-audio='download_youtube_playlist "234"'
+alias yt-playlist-4k='download_youtube_playlist    "625+234"'
+alias yt-playlist-1440='download_youtube_playlist  "620+234"'
+alias yt-playlist-1080p='download_youtube_playlist "616+234"'
+alias yt-playlist-1080='download_youtube_playlist  "270+234"'
+alias yt-playlist-720='download_youtube_playlist   "136+234"'
+alias yt-playlist-tiny='download_youtube_playlist  "160+234"'
 alias yt-playlist-list='download_youtube_playlist_list '
-alias yt-playlist-1080='download_youtube_playlist "137+140"'
-alias yt-playlist-720='download_youtube_playlist  "136+140"'
-alias yt-playlist-tiny='download_youtube_playlist "160+140"'
-alias yt-audio='yt-dlp.exe -f "140"'
+#---------------------------
+alias yt-audio='download_youtube_audio'
 
 #-------------------------------------------------
 # Twitch Vid DL
 #-------------------------------------------------
 alias tw-chat='download_twitch_chat'
+alias twc='download_twitch_chat 1'
 
 alias tw='download_twitch_vid                                ""        $SHORTNAME_OFF $COMPRESSION_OFF $TRANSCRIBE_OFF'
 alias tw-compressed='download_twitch_vid                     ""        $SHORTNAME_OFF $COMPRESSION_ON  $TRANSCRIBE_OFF'
@@ -1027,16 +1293,16 @@ alias tw-4k-shortname-compressed-t='download_twitch_vi       "2160p"   $SHORTNAM
 #-------------------------------------------------
 # Vimeo Vid DL
 #-------------------------------------------------
-alias vimeo='download_vimeo_vid              $SHORTNAME_OFF $COMPRESSION_ON $TRANSCRIBE_OFF'
-alias vimeo-t='download_vimeo_vid            $SHORTNAME_OFF $COMPRESSION_ON $TRANSCRIBE_ON'
-alias vimeo-compressed='download_vimeo_vid   $SHORTNAME_OFF $COMPRESSION_ON $TRANSCRIBE_OFF'
-alias vimeo-compressed-t='download_vimeo_vid $SHORTNAME_OFF $COMPRESSION_ON $TRANSCRIBE_ON'
+alias vimeo='download_vimeo_vid              "" $SHORTNAME_OFF $COMPRESSION_OFF $TRANSCRIBE_OFF'
+alias vimeo-t='download_vimeo_vid            "" $SHORTNAME_OFF $COMPRESSION_OFF $TRANSCRIBE_ON'
+alias vimeo-compressed='download_vimeo_vid   "" $SHORTNAME_OFF $COMPRESSION_ON  $TRANSCRIBE_OFF'
+alias vimeo-compressed-t='download_vimeo_vid "" $SHORTNAME_OFF $COMPRESSION_ON  $TRANSCRIBE_ON'
 
 #-------------------------------------------------
 # Instagram Vid DL
 #-------------------------------------------------
-alias ig='download_instagram_vid  $TRANSCRIBE_OFF'
-alias igt='download_instagram_vid $TRANSCRIBE_ON'
+alias ig='echo using my accounts with cookies to dl ig vids makes instagram think i am a bot and they might close my account. do not use your accounts; download_instagram_vid  $TRANSCRIBE_OFF'
+alias igt='echo using my accounts with cookies to dl ig vids makes instagram think i am a bot and they might close my account. do not use your accounts' #download_instagram_vid  $TRANSCRIBE_ON'
 
 #-------------------------------------------------
 # Twitter Vid DL
@@ -1047,36 +1313,50 @@ alias twitter='download_twitter_vid "" '
 # Misc
 #-------------------------------------------------
 alias download-mp4='download_mp4'
-alias download-from-m3u8='download_from_m3u8'
+alias download-from-stream='download_mp4_from_stream'
+alias download-audio-from-stream='download_aac_from_stream'
+alias download-audio-from-m3u8='echo Use download-audio-from-stream instead.'
 
 ####################################################################################################
 # Video Compression
 ####################################################################################################
 
-function _compress_video_hard() {
-    local crf=35
-    local name="$1"
-    local out="$2"
-    if [[ name == "" || out == "" ]]; then
-        error "Usage: cmd <source> <dest>"
+alias cv='compress-video'
+alias jv='join-video'
+alias av='analyze-volume'
+alias aa='analyze-volume'
+alias nv='normalize-volume'
+alias na='normalize-volume'
+alias tv='echo can just do a cv with a time range...' #trim-video-vbr'
+
+function compress_and_normalize_volume() {
+    local final_name="$1"
+    shift 1
+    local opts="$@"
+    if [[ $final_name == "" ]]; then
+        error "Provide a final file name and optional args for compress-video"
         return
     fi
-    # 0=cpu, 1=gpu
-    compress-video-with-crf $crf "$name" "$out" 0
+    compress-video f.mp4 ff $opts ; normalize-volume ff.mp4 "$final_name" ; flash_taskbar
 }
 
-alias compress-video-hard='_compress_video_hard'
+alias cvn='compress_and_normalize_volume'
 
 ####################################################################################################
 # Git
 ####################################################################################################
 
-if [[ '${platform,,}' == *'ming'* ]]; then
+if [[ ${platform,,} == *'ming'* ]]; then
     # Fix a weird mingw 'not a valid identifierline' error.
     # Got the fix from https://github.com/Alexpux/MSYS2-packages/issues/735#issuecomment-328938800
     alias git="PATH=/usr/bin git"
 fi
 
+# Performs a commit amend with the nocheckin prehook disabled.
+git_amend_nocheckin() {
+    eval "DISABLE_NOCHECKIN=1 git commit --amend"
+}
+
 git_cmd_wrapper() {
     # If no args are provided then run `git status -s`
     if [[ $# > 0 ]]; then
@@ -1102,6 +1382,7 @@ git_commit_signed() {
     eval "$cmd"
 }
 
+# Performs a commit amend to the head with the nocheckin prehook disabled.
 git_fix_nocheckin() {
     eval "DISABLE_NOCHECKIN=1 git commit --amend -C HEAD"
 }
@@ -1122,11 +1403,23 @@ git_create_stash_patch() {
     printf "${BOLD}${YELLOW}Created $file for stash@{$stashNum}.${NORMAL}\n"
 }
 
+git_print_tracked_file_sizes() {
+    git ls-tree -r -l HEAD | sort -k 4 -nr | awk '{
+        sha = substr($3, 1, 7);  # Truncate the commit SHA to 7 characters
+        if ($4 >= 1024 * 1024) {
+            printf "%s  sha:%s  %06.2f MB   %s\n", $2, sha, $4 / 1024 / 1024, $5
+        } else if ($4 >= 1024) {
+            printf "%s  sha:%s  %06.2f KB   %s\n", $2, sha, $4 / 1024, $5
+        } else {
+            printf "%s  sha:%s  %04d B      %s\n", $2, sha, $4, $5
+        }
+    }'
+}
+
 alias am='git commit --amend'
+alias amno='git_amend_nocheckin'
 alias ama='git commit --amend -C head --author'
 alias ams='git commit -S --amend' # signed
-alias ammend='echo "use am instead"'
-alias amend='echo "use am instead"'
 alias g='git_cmd_wrapper'
 alias ga='git add -A'
 alias gaa='git add -A; gdcc'
@@ -1164,12 +1457,16 @@ alias gf='git fetch'
 alias gfa='git fetch --all'
 alias gfd='git fetch --prune' # Removes remote branches that don't have a counterpart branch on the remote.
 alias gfix='git commit --amend -C HEAD'
+alias gfx='git commit --amend -C HEAD'
 alias gfixs='git commit -S -a --amend -C HEAD' # signed
+alias gfxs='git commit -S -a --amend -C HEAD' # signed
 alias gfixno='git_fix_nocheckin'
+alias gfxno='git_fix_nocheckin'
 alias gfo='git fetch origin'
 alias gfu='git fetch up'
 alias gfm='git fetch origin master'
 alias gfup='git fetch upstream'
+alias ggcf='git gc --prune=now'
 alias ggrep='git log --all --oneline | grep '
 alias gla='git lg --all'
 alias gl='git lg -30'
@@ -1184,8 +1481,8 @@ alias gmffm='git merge --ff-only master'
 alias gmffs='git merge --ff-only --squash'
 alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'
-alias gpa='git push --all && echo "pushing tags..." && git push --tags'
-alias gpaf='git push --all -f && echo "pushing tags..." && git push --tags -f'
+alias gpa='echo "pushing all branches..." && git push --all && echo "pushing tags..." && git push --tags'
+alias gpaf='echo "force pushing all branches..." && git push --all -f && echo "force pushing tags..." && git push --tags -f'
 alias gpf='git push -f'
 alias gpff='git pull --ff-only'
 alias gplu='git pull --set-upstream origin HEAD'
@@ -1194,6 +1491,7 @@ alias gpo='git push origin'
 alias gpom='git push origin master'
 alias gpr='git pull --rebase'
 alias gpt='git push --tags'
+alias gptf='git push --tags -f'
 alias gpu='git push --set-upstream origin HEAD'
 alias gr='git reset'
 alias gr1='git reset HEAD^1'
@@ -1230,6 +1528,7 @@ alias gsd='git stash drop'
 alias gsl='git stash list'
 alias gsi='git stash -p'
 alias gsp='git stash pop'
+alias gspm='git stash pop --merge'
 alias gsp0='git stash pop stash@{0}'
 alias gsp1='git stash pop stash@{1}'
 alias gsp2='git stash pop stash@{2}'
@@ -1246,6 +1545,7 @@ alias gx='git reset --hard'
 alias gxx='git reset --hard HEAD~1'
 alias gxom='git reset --hard origin/master'
 alias gstats='echo "Total commits: $(git rev-list HEAD --count)"; echo "\nAuthor breakdown:"; git shortlog | grep -E "^[^ ]"'
+alias gsize='git_print_tracked_file_sizes'
 alias gwip="git add . && git commit -m \"WIP\""
 
 ####################################################################################################

.env.loader

@@ -13,16 +13,20 @@ esac
 export PLATFORM=$platform
 export PLATFORM_OS=$platform_os
 
-test -f "$HOME/.env.platform"    && . "$HOME/.env.platform"
+os_lower="${platform_os,,}"
+test -f "$HOME/dotfiles/${os_lower}/env.platform" && . "$HOME/dotfiles/${os_lower}/env.platform"
+
 test -f "$HOME/.env.common-pre"  && . "$HOME/.env.common-pre"
 test -f "$HOME/.env.private"     && . "$HOME/.env.private"
 test -f "$HOME/.env.common-post" && . "$HOME/.env.common-post"
+
 test -f "$HOME/.aliases"         && . "$HOME/.aliases"
 test -f "$HOME/.aliases.common"  && . "$HOME/.aliases.common"
 test -f "$HOME/.aliases.private" && . "$HOME/.aliases.private"
 
 if [[ $_MC_SET_ENV_PATH -ne 1 ]]; then
     test -d "$HOME/bin"              && export PATH=$HOME/bin/:$PATH
+    #TODO: remove this
     test -d "$HOME/.dotfiles/bin"    && export PATH=$HOME/.dotfiles/bin/:$PATH
 fi
 

.gitconfig

@@ -1,17 +1,33 @@
 [include]
-  path = ~/.gitconfig.platform
-  path = ~/.gitconfig.private
+  # Shared config from private dotfiles
+  path = ~/.private-dotfiles.common/gitconfig
+  # Computer-specific config from private dotfiles (might not exist)
+  path = ~/.private-dotfiles/gitconfig
 [init]
   defaultBranch = master
 [merge]
   summary = true
   tool = vimdiff
 [core]
-  excludesfile = ~/.gitignore
+  excludesfile = ~/.private-dotfiles.common/gitignore
   hookspath = ~/.git_hooks
   preloadindex = true
   fscache = true
   editor = vim
+  # I used to have this set to true, which would result in checked out files
+  # being converted to CRLF line endings and commits converting to LF. I'm
+  # tired of this conversion shit though so I'm turning it off and will be
+  # enforcing LF line endings via a combination of editorconfig and
+  # gitattribute files on a per-project basis. This should make sure that
+  # anyone contributing to my projects will be committing LF line endings.
+  # The only exception is that the gitattributes files will commit batch
+  # files with CRLF to avoid Windows glitches.
+  #
+  # I used these posts for reference:
+  #   https://markentier.tech/posts/2021/10/autocrlf-true-considered-harmful/
+  #   https://troyready.com/blog/git-windows-dont-convert-line-endings.html
+  #
+  autocrlf = false
 [push]
   default = upstream
 [pull]

.gitignore

@@ -1,9 +1 @@
-vim/.netrwhist
-vim/bundle/*
-vim/plugged/*
-vim/undo
-vim/undo/*
-vim/autoload/plug.vim.old
-config/openbox/lxde-rc.xml
-*.pyc
-!bin
+*

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vim/bundle/Vundle.vim"]
-	path = vim/bundle/Vundle.vim
-	url = https://github.com/VundleVim/Vundle.vim.git

.vim/autoload/plug.vim

@@ -22,7 +22,7 @@
 "   Plug 'SirVer/ultisnips' | Plug 'honza/vim-snippets'
 "
 "   " On-demand loading
-"   Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+"   Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle' }
 "   Plug 'tpope/vim-fireplace', { 'for': 'clojure' }
 "
 "   " Using a non-default branch

.vim/colors/campo-dark-blue.vim

@@ -15,7 +15,9 @@ endif
 
 set background=dark
 hi clear
+if exists("syntax_on")
     syntax reset
+endif
 
 source $HOME/.vim/colors/utils
 let g:colors_name = "campo-dark-blue"
@@ -33,6 +35,7 @@ let s:bg      = "072730"
 let s:select         = "546e8f"
 let s:window         = "37474f"
 let s:comment        = "5dea82"
+let s:annotated_note = "8dea82"
 let s:tab            = "03404a"
 let s:error          = "e40e0e"
 let s:proc           = "0eefcb"
@@ -83,7 +86,7 @@ call X("Identifier",             s:grey,    "",     "none")
 call X("Statement",              s:text,    "",     "")        " 'return', 'goto', 'case', 'break', etc
 call X("Conditional",            s:text,    "",     "")
 call X("Repeat",                 s:text,    "",     "")        " 'for' and 'while'
-call X("Structure",              "ae90ea",  "",     "")
+call X("Structure",              "ae90ea",  "",     "")        " enum, struct, union
 call X("Function",               s:proc,    "",     "")
 call X("Constant",               s:text,    "",     "")        " Constants, e.g. SOME_CONST
 call X("Boolean",                s:text,    "",     "")        " true, false
@@ -96,11 +99,12 @@ call X("Define",                 "a5bce4",  "",     "none")
 call X("Include",                s:text,    "",     "")        " #include in C/C++
 call X("Number",                 s:text,    "",     "")
 
-" Notes
-call X("Todo",                   "b8fbb0",  s:bg, "underline")
-call X("Bugs",                   "d8fbb0",  s:bg, "standout")
-call X("Notes",                  "ffffff",  s:bg, "standout")
-call X("Notices",                s:warn,    s:bg, "bold")
+" Notes and annotated comment text
+call X("MyTitle",                s:text,           "", "bold")     " // # Some Title
+call X("MyAnnotatedNote",        s:text,           "", "bold")     " // @incomplete
+call X("MyNote",                 s:annotated_note, "", "standout") " // NOTE:, IDEA:, TODO:
+call X("MyEmphasis",             s:yellow,         "", "bold")     " // WARNING:, IMPORTANT:
+call X("MyBug",                  s:red,            "", "standout") " // FIXME:, BUG:, DEPRECATED:
 
 " Build markers
 call X("BuildError",             s:error,   s:bg, "bold")
@@ -123,31 +127,6 @@ call X("cStorageClass",          s:text,    "", "")
 call X("cConditional",           s:text,    "", "")
 call X("cRepeat",                s:text,    "", "")
 
-" Python Highlighting
-call X("pythonInclude",          s:red,     "", "")
-call X("pythonStatement",        s:blue,    "", "")
-call X("pythonConditional",      s:purple,  "", "")
-call X("pythonRepeat",           s:purple,  "", "")
-call X("pythonException",        s:purple,  "", "")
-call X("pythonFunction",         s:proc,    "", "")
-call X("pythonSelf",             s:grey,    "", "")
-call X("pythonOperator",         s:purple,  "", "")
-call X("pythonExtraOperator",    s:purple,  "", "")
-call X("pythonClass",            s:proc,    "", "")
-call X("pythonDecorator",        s:orange,  "", "")
-call X("pythonDocstring",        s:comment, "", "")
-call X("pythonBuiltinObj",       s:yellow,  "", "")
-call X("pythonBuiltinType",      s:orange,  "", "")
-call X("pythonNumber",           s:orange,  "", "")
-
-" JS Highlighting
-call X("javaScriptBraces",       s:text,    "", "")
-call X("javaScriptFunction",     s:purple,  "", "")
-call X("javaScriptConditional",  s:purple,  "", "")
-call X("javaScriptRepeat",       s:purple,  "", "")
-call X("javaScriptNumber",       s:orange,  "", "")
-call X("javaScriptMember",       s:orange,  "", "")
-
 " HTML Highlighting
 call X("htmlTag",                s:text,    "", "")
 call X("htmlTagName",            s:text,    "", "")

.vim/colors/campo-dark-earth.vim

@@ -0,0 +1,136 @@
+" A simple dark earth-tone vim colorscheme.
+" Created by Michael Campagnaro (https://git.michael.is)
+
+if has('termguicolors')
+    " Supports 24-bit color range
+    set termguicolors
+else
+    echoerr "This theme requires 'termguicolors' support!"
+endif
+
+if !has("gui_running") && &t_Co != 88 && &t_Co != 256
+    echoerr "Don't have expected color support!"
+endif
+
+set background=dark
+hi clear
+if exists("syntax_on")
+    syntax reset
+endif
+
+source $HOME/.vim/colors/utils
+let g:colors_name = "campo-dark-earth"
+
+" Shared colors
+let s:blue           = "3699cc"
+let s:purple         = "ce93d8"
+let s:grey           = "b0bec5"
+let s:orange         = "ffb74d"
+let s:yellow         = "fff176"
+let s:green          = "88b888"
+let s:red            = "ef2929"
+let s:text           = "e5d8d0" " A majority of the syntax will use this.
+let s:bg             = "24252a"
+let s:select         = "614853"
+let s:window         = "1f2126"
+let s:comment        = "888984"
+let s:annotated_note = "aaaba6"
+let s:tab            = "3d2a38"
+let s:error          = "e40e0e"
+let s:proc           = s:text
+let s:warn           = "dcd53e"
+let s:spell          = "aaf53e"
+let s:soft_red       = "9a5d6e"
+let s:cursor_line    = "2a2a2d"
+
+" Vim
+call X("Normal",                 s:text,    s:bg,      "")
+call X("LineNr",                 s:comment, "",        "")
+call X("NonText",                s:text,    "",        "")
+call X("SpecialKey",             s:blue,    "",        "")
+call X("Search",                 s:text,    s:select,  "")
+call X("TabLineSel",             s:text,    s:bg,      "bold")
+call X("TabLine",                "dddddd",  s:tab,     "none")
+call X("TabLineFill",            "",        s:tab,     "none") " The tab line region that doesn't contain tab entries.
+call X("StatusLine",             s:window,  s:text,    "reverse")
+call X("StatusLineNC",           s:window,  s:comment, "reverse")
+call X("VertSplit",              s:window,  s:window,  "none")
+call X("Visual",                 "",        s:select,  "")
+call X("Directory",              s:blue,    "",        "")
+call X("ModeMsg",                s:green,   "",        "")
+call X("MoreMsg",                s:green,   "",        "")
+call X("Question",               s:green,   "",        "")
+call X("MatchParen",             "",        s:select,  "")
+call X("Folded",                 s:comment, s:bg,      "")
+call X("FoldColumn",             s:comment, s:bg,      "")
+call X("SpellBad",               s:spell,   s:bg,      "bold")
+call X("SpellCap",               s:text,    s:bg,      "")     " A word that should start with a capital
+call X("SpellLocal",             s:spell,   s:bg,      "bold") " Correctly spelled but used in another region.
+call X("SpellRare",              s:text,    s:bg,      "")     " A correctly spelled that is hardly ever used. Don't care about this.
+call X("ErrorMsg",               s:error,   s:bg,      "bold")
+if version >= 700
+    call X("PMenu",              s:text,    s:select,  "none") " Autocompletion menu
+    call X("PMenuSel",           s:text,    "926975",  "bold") " Selected autocompletion item
+    call X("SignColumn",         "",        s:bg,      "none")
+    call X("CursorLine",         "",        s:cursor_line,  "none") " Horizontal line at the cursor.
+    call X("CursorColumn",       "",        s:cursor_line,  "none") " Vertical line at the cursor.
+end
+if version >= 703
+    call X("ColorColumn",        "",        s:cursor_line, "none")  " Vertical line set by colorcolumn option.
+end
+
+" Standard Highlighting
+call X("Comment",                s:comment,  "",     "")
+call X("Title",                  s:comment,  "",     "")
+call X("Cursor",                 "",         s:text, "")
+call X("Identifier",             s:soft_red, "",     "none")
+call X("Statement",              s:soft_red, "",     "")        " 'return', 'goto', 'case', 'break', etc
+call X("Conditional",            s:soft_red, "",     "")
+call X("Repeat",                 s:text,     "",     "")        " 'for' and 'while'
+call X("Structure",              s:soft_red, "",     "")        " enum, struct, union
+call X("Function",               s:proc,     "",     "")
+call X("Constant",               s:text,     "",     "")        " Constants, e.g. SOME_CONST
+call X("Boolean",                s:text,     "",     "")        " true, false
+call X("String",                 "bba76a",   "",     "")
+call X("Special",                s:text,     "",     "")
+call X("PreProc",                s:text,     "",     "")
+call X("Operator",               s:text,     "",     "none")
+call X("Type",                   s:text,     "",     "")        " Data types
+call X("Define",                 s:text,     "",     "none")
+call X("Include",                s:text,     "",     "")        " #include in C/C++
+call X("Number",                 s:soft_red, "",     "")
+
+" Notes and annotated comment text
+call X("MyTitle",                s:annotated_note, "", "bold")     " // # Some Title
+call X("MyAnnotatedNote",        s:annotated_note, "", "bold")     " // @incomplete
+call X("MyNote",                 s:soft_red,       "", "standout") " // NOTE:, IDEA:, TODO:
+call X("MyEmphasis",             s:yellow,         "", "bold")     " // WARNING:, IMPORTANT:
+call X("MyBug",                  s:red,            "", "standout") " // FIXME:, BUG:, DEPRECATED:
+
+" Build markers
+call X("BuildError",             s:error,   s:bg, "bold")
+call X("BuildWarn",              s:warn,    s:bg, "bold")
+call X("BuildInfo",              s:text,    s:bg, "bold")
+
+" Jai Highlighting
+call X("jaiVariableDeclaration", s:text,     "", "")
+call X("jaiDirective",           s:soft_red, "", "")
+
+" airblade/vim-gitgutter
+call X("GitGutterAdd",           s:green,   "", "")
+call X("GitGutterDelete",        s:red,     "", "")
+call X("GitGutterChange",        s:yellow,  "", "")
+call X("GitGutterChangeDelete",  s:orange,  "", "")
+
+" C Highlighting
+call X("cType",                  s:text,    "", "")
+call X("cStorageClass",          s:text,    "", "")
+call X("cConditional",           s:text,    "", "")
+call X("cRepeat",                s:text,    "", "")
+
+" Diff Highlighting
+call X("DiffAdd",                s:window,  s:green,  "none")
+call X("DiffDelete",             s:window,  s:red,    "none")
+call X("DiffChange",             s:window,  s:yellow, "none")
+call X("DiffText",               s:bg,      s:yellow, "none")
+

.vim/colors/campo-dark-greenish.vim

@@ -5,6 +5,8 @@
 " The theme file original copied from the Tomorrow theme.
 " See https://github.com/chriskempson/vim-tomorrow-theme.git for it.
 " Hex color conversion functions borrowed from the theme "Desert256".
+"
+" @todo convert to new format (see campo-dark-blue.vim)
 
 if has('termguicolors')
   " Supports 24-bit color range

.vim/colors/campo-dark-grey-blue.vim

@@ -7,7 +7,8 @@
 " Hex color conversion functions borrowed from the theme "Desert256".
 
 " @TODO port these colors over to a copy of campo-dark-greyscale so that I
-" have better control over the C syntax highlighting.
+" have better control over the C syntax highlighting. And use the improved
+" format used in campo-dark-blue.vim
 
 
 if has('termguicolors')

.vim/colors/campo-dark-greyscale.vim

@@ -3,6 +3,8 @@
 " Version: 1.0
 "
 " Hex color conversion functions borrowed from the theme "Desert256".
+"
+" @todo convert to new format (see campo-dark-blue.vim)
 
 if has('termguicolors')
   " Supports 24-bit color range

.vim/colors/campo-light-greyscale.vim

@@ -1,6 +1,7 @@
 " A very simple light colorscheme.
 " Maintainer: Michael Campagnaro <mikecampo@gmail.com>
 " Version: 1.0
+"
 
 if has('termguicolors')
   " Supports 24-bit color range

.vim/colors/campo-light.vim

@@ -5,6 +5,8 @@
 " The theme file original copied from the Tomorrow theme.
 " See https://github.com/chriskempson/vim-tomorrow-theme.git for it.
 " Hex color conversion functions borrowed from the theme "Desert256".
+"
+" @todo convert to new format (see campo-dark-blue.vim)
 
 let g:campo_theme_use_rainbow_parens = 1
 
@@ -13,7 +15,7 @@ let s:foreground = "263238"
 let s:background = "fbfbfb"
 let s:selection = "e3fc8d"
 let s:line = "d5d5d5"
-let s:comment = "7c7c7c"
+let s:comment = "4c4c4c"
 let s:red = "d62a28"
 let s:orange = "ff7800"
 let s:yellow = "eab700"
@@ -294,13 +296,14 @@ if has("gui_running") || &t_Co == 88 || &t_Co == 256
     call <SID>X("Number", s:black, "", "")
     "call <SID>X("Ignore", "666666", "", "")
 
-    " Custom TODO/NOTE colors
-    call <SID>X("Todo", s:red, s:background, "underline")
-    call <SID>X("Bugs", s:red, s:background, "standout")
-    call <SID>X("Notes","666666", "ffffff","bold")
-    call <SID>X("Notices","dcd53e",s:background,"bold")
-    call <SID>X("ErrorMsg", s:error_msg_foreground, s:error_msg_background, "underline")
+    " Notes and annotated comment text
+    call <SID>X("MyTitle",                s:foreground,  "",      "bold")          " // # Some Title
+    call <SID>X("MyAnnotatedNote",        s:foreground,  "",      "bold")          " // @incomplete
+    call <SID>X("MyNote",                 "",            s:black, "standout")      " // NOTE:, IDEA:, TODO:
+    call <SID>X("MyEmphasis",             s:orange,      "",      "bold,standout") " // WARNING:, IMPORTANT:
+    call <SID>X("MyBug",                  s:red,         "",      "standout")      " // FIXME:, BUG:, DEPRECATED:
 
+    call <SID>X("ErrorMsg", s:error_msg_foreground, s:error_msg_background, "underline")
 
     " Vim Highlighting
     call <SID>X("vimCommand", s:blue, "", "none")

.vim/spell/en.utf-8.add

@@ -271,3 +271,7 @@ memcpy
 strlen
 u8
 s64
+Sculpey
+grey
+googly
+favour

README.md

@@ -1,11 +0,0 @@
-# dotfiles
-
-Various dotfiles and misc configs. Some of it is customized around my system setup
-(like aliases pointing to paths) but you should be able to easily remove that stuff.
-
-## Installing
-
-There is an `install` script that facilitates the setup, however it's been a while since I did a
-full system setup and this script may not be fully complete. An alternative method is to manually
-symlink files in the root directory. OS specific configs are in their respective folders.
-

bin/aws-list-deep-glacier-files

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-error() {
-    printf "${BOLD}${RED}$1${NORMAL}\n"
-}
-
-abort() {
-  error "\nAborting...\n"
-  exit 1
-}
-
-set -e
-
-bucket="$1"
-path="$2"
-output_file="$3"
-
-if [[ $bucket == "" || $path == "" || $output_file == "" ]]; then
-    error "Usage: aws-list-deep-glacier-files <bucket-name> <path-in-bucket> <output-file>"
-    exit 1
-fi
-
-aws s3api list-objects-v2 --bucket $bucket --prefix $path --query "Contents[?StorageClass=='DEEP_ARCHIVE']" --output text | LC_ALL=C awk '{print substr($0, index($0, $2))}' | awk '{NF-=3};3' > "$output_file"

bin/aws-restore-deep-glacier-folder

@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-
-#
-# Restores all files/folders inside a particular bucket path,
-# e.g. aws-restore-deep-glacier-folder mcampagnaro-deep-glacier images restored_images
-# will restore all files inside the images folder of the mcampagnaro-deep-glacier bucket, saving
-# temp restoration data in the local "restored_images" directory.
-#
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-error() {
-    printf "${BOLD}${RED}$1${NORMAL}\n"
-}
-
-abort() {
-  error "\nAborting...\n"
-  exit 1
-}
-
-set -e
-
-bucket="$1"
-path="$2"
-temp_dir="$3"
-number_of_objects_per_file=100
-days_available=7
-restore_tier="Bulk" # Can also be "Standard"
-
-if [[ $bucket == "" || $path == "" || $temp_dir == "" ]]; then
-    error "Usage: aws-restore-deep-glacier-folder <bucket-name> <path-in-bucket> <local-temp-dir>"
-    exit 1
-fi
-
-printf "${BOLD}Restoring ${GREEN}$bucket:$path${NORMAL}${BOLD} with local temp folder ${GREEN}$temp_dir${NORMAL}\n"
-
-mkdir -p "$temp_dir"
-pushd "$temp_dir" &>/dev/null
-
-aws s3api list-objects-v2 --bucket $bucket --prefix $path --query "Contents[?StorageClass=='DEEP_ARCHIVE']" --output text | LC_ALL=C awk '{print substr($0, index($0, $2))}' | awk '{NF-=3};3' > all_objects_list.txt
-
-# Generate the main script that will kick off the restoration.
-printf "while read x; do\n    printf \"aws s3api restore-object --restore-request '{\\\\\"Days\\\\\":$days_available,\\\\\"GlacierJobParameters\\\\\":{\\\\\"Tier\\\\\":\\\\\"$restore_tier\\\\\"}}' --bucket $bucket --key \\\\\"\$x\\\\\"\\\\n\"\n    aws s3api restore-object --restore-request \"{\\\\\"Days\\\\\":$days_available,\\\\\"GlacierJobParameters\\\\\":{\\\\\"Tier\\\\\":\\\\\"$restore_tier\\\\\"}}\" --bucket $bucket --key \"\$x\"\ndone < all_objects_list.txt\nprintf \"\\\\nDone! You can now delete this folder.\\\\n\"\n" > run.sh
-chmod +x run.sh
-
-printf "${BOLD}You can now run ${GREEN}$temp_dir/run.sh${NORMAL}${BOLD} to start the restoration process.\n"
-
-popd &>/dev/null

bin/convert-video-avi-to-mp4

@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-# This is for reencoding an AVI video. I wasn't able to play the encoded videos
-# on my phone when using libx264 and libx265 encoders, but mpeg4 works. Also
-# I'm using the aac codec because some old avi's were using a codec that's not
-# supported in the mp4 container.
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-if [[ $1 == "" || $2 == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <filename> <bitrate, e.g. \"4000k\"> <optional output name>${NORMAL}\n"
-    exit 1
-fi
-
-filename=$(basename -- "$1")
-extension="${filename##*.}"
-filename="${filename%.*}"
-
-bitrate="$2"
-
-output_name="$3"
-if [[ $output_name == "" ]]; then
-    output="${filename}_CONVERTED-${bitrate}.mp4"
-else
-    output="${output_name}.mp4"
-fi
-
-printf "\n${YELLOW}${BOLD}Encoding '$filename.$extension' with target bitrate $bitrate | output: $output${NORMAL}\n"
-ffmpeg -i "$filename.$extension" -c:a aac -c:v mpeg4 -b:v $bitrate "$output"
-printf "\n${GREEN}${BOLD}Done encoding '$filename.$extension' to '$output'${NORMAL}\n\n"

bin/convert-video-flv-to-mp4

@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# This is for reencoding an FLV video to mp4 using an mpeg4 encoder.
-# Can optionally compress the video.
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-if [[ $1 == "" || $2 == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <compress 1|0> <filename> <optional output name>${NORMAL}\n"
-    exit 1
-fi
-
-compress="$1"
-
-filename=$(basename -- "$2")
-extension="${filename##*.}"
-filename="${filename%.*}"
-
-output="$3"
-if [[ $output == "" ]]; then
-    output="${filename}_CONVERTED"
-fi
-
-printf "\n${YELLOW}${BOLD}Encoding '$filename.$extension' | compress: $compress | output: $output.mp4${NORMAL}\n"
-
-if [[ $compress -eq 1 ]]; then
-    temp_output="temp_$output.mp4"
-else
-    temp_output="$output.mp4"
-fi
-
-# convert first.
-# we convert then compress instead of compressing on first pass because this results in a slightly higher bitrate.
-ffmpeg -y -stats -loglevel level+error -vsync 0 -hwaccel cuvid -c:v h264_cuvid -i "$filename.$extension" -c:a aac -c:v h264_nvenc -b:v 5M "$temp_output"
-
-if [[ $compress -eq 1 ]]; then
-    compress-video 1 "$temp_output" "$output"
-    rm "$temp_output"
-else
-    printf "\n"
-fi
-
-printf "${GREEN}${BOLD}Done encoding '$filename.$extension' to '$output.mp4'${NORMAL}\n\n"

bin/convert-video-mkv-to-mp4

@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# This is for reencoding an mkv video to mp4 using an mpeg4 encoder.
-# Can optionally compress the video.
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-if [[ $1 == "" || $2 == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <compress 1|0> <filename> <optional output name>${NORMAL}\n"
-    exit 1
-fi
-
-compress="$1"
-
-filename=$(basename -- "$2")
-extension="${filename##*.}"
-filename="${filename%.*}"
-
-output="$3"
-if [[ $output == "" ]]; then
-    output="${filename}_CONVERTED"
-fi
-
-printf "\n${YELLOW}${BOLD}Encoding '$filename.$extension' | compress: $compress | output: $output.mp4${NORMAL}\n"
-
-if [[ $compress -eq 1 ]]; then
-    temp_output="temp_$output.mp4"
-else
-    temp_output="$output.mp4"
-fi
-
-# convert first.
-# we convert then compress instead of compressing on first pass because this results in a slightly higher bitrate.
-ffmpeg -y -stats -loglevel level+error -i "$filename.$extension" -vcodec copy -acodec copy "$temp_output"
-
-if [[ $compress -eq 1 ]]; then
-    compress-video 1 "$temp_output" "$output"
-    rm "$temp_output"
-else
-    printf "\n"
-fi
-
-printf "${GREEN}${BOLD}Done encoding '$filename.$extension' to '$output.mp4'${NORMAL}\n\n"

bin/extract-16bit-wav-from-video

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-input="$1"
-output_name="$2"
-
-if [[ $input == "" || $output_name == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <input video> <wav output name>${NORMAL}\n"
-    exit 1
-fi
-
-if [[ ! -f "$input" ]]; then
-    printf "${RED}${BOLD}Error: failed to extract audio. Video file \"$input\" doesn't exist.\n${NORMAL}"
-    exit 1
-fi
-
-# Add extension if not provided.
-output_basename=$(basename -- "$output_name")
-output_extension="${output_basename##*.}"
-if [[ $output_extension != "wav" ]]; then
-    output_name="${output_name}.wav"
-fi
-
-printf "\n${YELLOW}${BOLD}Extracting 16-bit WAV from $input | output: $output_name${NORMAL}\n"
-
-ffmpeg -i "$input" -ar 16000 -ac 1 -c:a pcm_s16le "$output_name"
-
-printf "${GREEN}${BOLD}Done extracting 16-bit WAV from $input | output: $output_name${NORMAL}\n"

bin/extract-audio-from-video

@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-transcode="$1"
-filename=$(basename -- "$2")
-format="$3"
-bitrate="$4"
-
-if [[ $1 == "" || $2 == "" || $3 == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <transcode? 0|1 (needed when container doesn't contain format)> <filename> <format (mp3, m4a, aac, etc)> <optional: bitrate. Uses 64k when not specified, 0 = variable (e.g. 0, 64, 128, etc)>${NORMAL}\n"
-    exit 1
-fi
-
-extension="${filename##*.}"
-filename="${filename%.*}"
-output_name="$filename.$format"
-
-if [[ $bitrate == "" ]]; then
-    bitrate="64"
-fi
-
-printf "\n${YELLOW}${BOLD}Extracting audio from $filename.$extension | bitrate: ${bitrate}k | output: $output_name${NORMAL}\n"
-
-if [[ $transcode == "1" ]]; then
-    # Transcode audio
-    ffmpeg -i "$filename.$extension" -b:a ${bitrate}k -ac 2 -ar 44100 -map a "$output_name"
-else
-    # Grab the audio stream from the video.
-    ffmpeg -i "$filename.$extension" -vn -acodec copy "$output_name"
-fi
-
-printf "\n${GREEN}${BOLD}Done extracting audio from $filename.$extension | output name '$output_name'${NORMAL}\n\n"
-

bin/file-sigcheck.bat

@@ -1,12 +0,0 @@
-@echo off
-
-cd %DEV_TOOLS%\SysinternalsSuite
-if exist %1\* (
-	echo Run on a file
-) else (
-	if exist "%~1_Report.txt" (
-		del "%~1_Report.txt"
-	)
-	sigcheck.exe /a "%~1" > "%~1_sigcheck_report.txt"
-	start notepad "%~1_sigcheck_report.txt"
-)

bin/normalize-video-volume

@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-# Use this to normalize the audio of a video using the average loudness, or RMS-based normalization.
-# This does not re-encode the video.
-#
-# Inspired by https://superuser.com/a/323127 and https://superuser.com/a/1312885
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-if [[ $1 == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <filename> <optional output name>${NORMAL}\n"
-    exit 1
-fi
-
-filename=$(basename -- "$1")
-extension="${filename##*.}"
-filename="${filename%.*}"
-
-output_name="$2"
-
-if [[ $output_name == "" ]]; then
-    output="${filename}_normalized_audio.$extension"
-else
-    output="${output_name}.$extension"
-fi
-
-printf "\n${YELLOW}${BOLD}Normalizing audio in $filename.$extension | output: $output${NORMAL}\n"
-
-# This is done in two passes. The first pass will compute the mean loudness and
-# the second pass will normalize the audio using the mean as the target.
-
-# -vn, -sn,  and -dn tells ffmpeg to ignore non-audio streams during the analysis. This speeds things up.
-ffmpeg -i "$filename.$extension" -af "volumedetect" -vn -sn -dn -f null /dev/null
-
-#ffmpeg -i "$filename.$extension" -c:v copy -ac 1 "$output"
-
-printf "\n${GREEN}${BOLD}Done normalizing audio in $filename.$extension | output: $output${NORMAL}\n\n"
-
-
-
-#---------------------------------------
-# This seems better. 2 pass using loudnorm filter.
-
-# 1st pass: ffmpeg -i "$filename.$extension" -pass 1 -filter:a loudnorm=print_format=json -vn -sn -dn -f null /dev/null
-# 2nd pass: ffmpeg -i "$filename.$extension" -c:v copy -pass 2 -filter:a loudnorm=linear=true:measured_I=$input_i:measured_LRA=$input_lra:measured_tp=$input_tp:measured_thresh=$input_thresh "$output"
-
-# TODO: extract the $input_i, input_lra, etc from the 1st pass output so that this can be automated.
-# TODO: stackoverflow said if there are subtitles or multiple vid streams then add "-map 0" before the output name. Test this.
-# TODO: disable the log file or just delete it after normalizing.

bin/transcribe-video-base

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-transcribe-video "$1" "$2" "base"

bin/transcribe-video-medium

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-transcribe-video "$1" "$2" "medium"

bin/transcribe-video-small

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-transcribe-video "$1" "$2" "small"

bin/transcribe-video-tiny

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-transcribe-video "$1" "$2" "tiny"

bin/trim-accurate-video

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-
-# Reencodes the video with a more accurate length.
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-filename=$(basename -- "$1")
-output_name="$2"
-start_time="$3"
-end_time="$4"
-
-if [[ $filename == "" || $output_name == "" || $start_time == "" || $end_time == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <filename> <output name> <start time HH:MM:SS> <end time HH:MM:SS>${NORMAL}\n"
-    exit 1
-fi
-
-extension="${filename##*.}"
-filename="${filename%.*}"
-output="${output_name}.$extension"
-timing_args="-ss $start_time -to $end_time"
-
-printf "\n${YELLOW}${BOLD}Trimming '$filename.$extension' | output: $output | start: $start_time | end: $end_time${NORMAL}\n"
-
-ffmpeg -y -stats -loglevel level+error $timing_args -accurate_seek -i "$filename.$extension" -c:v libx264 -c:a copy "$output"
-
-printf "\n${GREEN}${BOLD}Finished trimming${NORMAL}\n\n"
-

bin/trim-video

@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-if which tput >/dev/null 2>&1; then
-    ncolors=$(tput colors)
-fi
-if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
-    RED="$(tput setaf 1)"
-    GREEN="$(tput setaf 2)"
-    YELLOW="$(tput setaf 3)"
-    BLUE="$(tput setaf 4)"
-    MAGENTA="$(tput setaf 5)"
-    CYAN="$(tput setaf 6)"
-    BOLD="$(tput bold)"
-    NORMAL="$(tput sgr0)"
-else
-    RED=""
-    GREEN=""
-    YELLOW=""
-    BLUE=""
-    MAGENTA=""
-    CYAN=""
-    BOLD=""
-    NORMAL=""
-fi
-
-filename=$(basename -- "$1")
-output_name="$2"
-start_time="$3"
-end_time="$4"
-
-if [[ $filename == "" || $output_name == "" || $start_time == "" || $end_time == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <filename> <output name> <start time HH:MM:SS> <end time HH:MM:SS>${NORMAL}\n"
-    exit 1
-fi
-
-extension="${filename##*.}"
-filename="${filename%.*}"
-output="${output_name}.$extension"
-timing_args="-ss $start_time -to $end_time"
-
-printf "\n${YELLOW}${BOLD}Trimming '$filename.$extension' | output: $output | start: $start_time | end: $end_time${NORMAL}\n"
-
-ffmpeg -y -stats -loglevel level+error $timing_args -i "$filename.$extension" -c copy "$output"
-
-printf "\n${GREEN}${BOLD}Finished trimming${NORMAL}\n\n"
-

bin/vim-pull

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Copies vim data from the home directory to the dotfiles repo.
-
-set -e
-
-src="$HOME/.vim"
-dest="$HOME/.dotfiles/vim/"
-
-if [ -d $src ]; then
-    [ -d "$src/spell" ]     && echo "Syncing user dictionary" && cp -r "$src/spell"     $dest
-    [ -d "$src/colors" ]    && echo "Syncing user colors"     && cp -r "$src/colors"    $dest
-    [ -d "$src/after" ]     && echo "Syncing after directory" && cp -r "$src/after"     $dest
-    [ -d "$src/ftdetect" ]  && echo "Syncing ftdetect"        && cp -r "$src/ftdetect"  $dest
-    [ -d "$src/autoload" ]  && echo "Syncing autoload"        && cp -r "$src/autoload"  $dest
-fi

bin/vim-push

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Copies vim data from the dotfiles repo to the home directory.
-
-set -e
-
-src="$HOME/.dotfiles/vim"
-dest="$HOME/.vim/"
-
-if [ -d $src ]; then
-    [ -d "$src/spell" ]     && echo "Syncing user dictionary" && cp -r "$src/spell"     $dest
-    [ -d "$src/colors" ]    && echo "Syncing user colors"     && cp -r "$src/colors"    $dest
-    [ -d "$src/after" ]     && echo "Syncing after directory" && cp -r "$src/after"     $dest
-    [ -d "$src/ftdetect" ]  && echo "Syncing ftdetect"        && cp -r "$src/ftdetect"  $dest
-    [ -d "$src/autoload" ]  && echo "Syncing autoload"        && cp -r "$src/autoload"  $dest
-fi

dotfiles/README.md

@@ -0,0 +1,32 @@
+# dotfiles
+
+Various dotfiles and misc configs. Some of it is customized around my system
+setup (like aliases pointing to paths) but you should be able to easily remove
+that stuff.
+
+This unpacks files one directory back, which is assumed to be your home
+directory. The gitignore ignores all files by default. If you want to add a new
+file this you need to add the `-f` flag to the git add command. This setup was
+inspired by Gary Bernhardt and https://gist.github.com/meleu/053275b6842646b95491bf1af4a6ca0e
+
+## Installing
+
+```bash
+# Go to your home directory.
+cd ~
+
+# Clone the repo with the "--no-checkout" option (so we can checkout the files in our home directory)
+git clone --no-checkout <repo_url>/dotfiles.git
+
+# Go to the created directory and change the worktree to the home direcory.
+cd dotfiles
+git config core.worktree '../../'
+
+# Checkout the files. This will overwrite existing dotfiles with the same name.
+git reset --hard origin/master
+```
+
+If you want to install optional OS specific stuff, like various packages, run the `install` script in this folder.
+
+OS specific configs are in their respective folders.
+

dotfiles/bin/add-audio-to-video

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+
+# Re-encodes the video with a new primary audio channel.
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+vid_filename=$(basename -- "$1")
+audio_filename=$(basename -- "$2")
+output_name="$3"
+
+if [[ $vid_filename == "" || $audio_filename == "" || $output_name == "" ]]; then
+    printf "${BOLD}${RED}Usage: add-audio-to-video <video filename> <audio filename> <output name>${NORMAL}\n"
+    exit 1
+fi
+
+vid_extension="${vid_filename##*.}"
+vid_filename="${vid_filename%.*}"
+
+audio_extension="${audio_filename##*.}"
+audio_filename="${audio_filename%.*}"
+
+output="${output_name}.$vid_extension"
+
+audio_encoding_opts="-c:a copy"
+if [[ $audio_extension == "wav" ]]; then
+    # Re-encode the audio.
+    audio_encoding_opts="-c:a aac -b:a 192k"
+fi
+
+printf "\n${YELLOW}${BOLD}Adding audio '$audio_filename.$audio_extension' to '$vid_filename.$vid_extension' | output: $output${NORMAL}\n"
+
+# -shortest handles the inputs not being the same duration. Conversion will stop when the shortest input's end is reached.
+# Alternatively you can loop with "-stream_loop -1"
+ffmpeg -y -stats -loglevel level+error -i "$vid_filename.$vid_extension" -i "$audio_filename.$audio_extension" -c:v copy -map 0:v:0 -map 1:a:0 $audio_encoding_opts -shortest "$output"
+
+printf "\n${GREEN}${BOLD}Finished adding audio${NORMAL}\n\n"
+

dotfiles/bin/analyze-volume

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Use this to get a volume report from a video or audio file. You can use this
+# info manually normalize or increase/decrease the volume using the
+# change-volume script, supplying it the volume delta you want. Typically you
+# use the delta from the analysis report this script provides, e.g. if the
+# max_volume is -5 db then you would call change-volume with a value of 5. I
+# find that the two pass normalize-volume script works better than this
+# approach...but it will take longer to run!
+#
+# Inspired by https://superuser.com/a/323127 and https://superuser.com/a/1312885
+
+source "$HOME/dotfiles/script_helpers/windows.sh"
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+if [[ $1 == "" ]]; then
+    printf "${BOLD}${RED}Usage: analyze-volume <video or audio filename>${NORMAL}\n"
+    exit 1
+fi
+
+filename="$1"
+
+printf "\n${YELLOW}${BOLD}Analyzing audio in $filename${NORMAL}\n"
+
+# -vn, -sn,  and -dn tells ffmpeg to ignore non-audio streams during the analysis. This speeds things up.
+cmd="ffmpeg -i \"$filename\" -af volumedetect -vn -sn -dn -f null /dev/null"
+printf "\n${BOLD}Running: $cmd\n\n${NORMAL}"
+eval $cmd
+
+printf "\n${GREEN}${BOLD}Done analyzing audio in $filename\n${NORMAL}"
+printf "\n${YELLOW}${BOLD}Look at the reported max_volume value. If != 0 then call the change-volume script, passing it the filename, an output name and the delta to bring the volume to 0.\ne.g. if the max_volume is -5 db, then you would pass 5.${NORMAL}\n\n"
+
+flash_taskbar

dotfiles/bin/antimalware-service-disable.bat

@@ -1,23 +1,32 @@
-@setlocal enableextensions enabledelayedexpansion
 @echo off
+setlocal enableextensions enabledelayedexpansion
 
-rem Make sure we're running as admin. Got this garbage from https://stackoverflow.com/a/40388766
-if not "%1"=="am_admin" (
-    powershell -Command "Start-Process -Verb RunAs -FilePath '%0' -ArgumentList 'am_admin'"
+rem NOTE: Defender may see this file as malware, so you might need to exclude this before things can be disabled.
+
+rem Modified version of:
+rem https://github.com/ggannann/win10_disable_defender
+rem https://gist.github.com/xezrunner/a7a42dbc1096a40b0c78f09488fe5a2b (as of Jan 2026 this seems to have been deleted or made private)
+
+rem ============================
+rem Self-elevate via UAC if needed
+rem - Detect admin by checking membership in Administrators (SID S-1-5-32-544)
+rem - Relaunch this script elevated using PowerShell Start-Process -Verb RunAs
+rem ============================
+rem Test for membership in Administrators group
+whoami /groups | find "S-1-5-32-544" >nul
+if errorlevel 1 (
+    echo Requesting administrative privileges...
+    rem Relaunch the same script elevated, preserving args and working directory
+    powershell -NoProfile -Command ^
+        "Start-Process -FilePath '%~f0' -ArgumentList '%*' -Verb RunAs -WorkingDirectory (Get-Location).Path"
     exit /b
 )
-
-rem USE AT OWN RISK AS IS WITHOUT WARRANTY OF ANY KIND !!!!!
-rem NOTE: Defender may see this file as malware, so you will likely need to exclude this before things can be disabled.
-rem
-rem Modified version of
-rem https://raw.githubusercontent.com/mattreecebentley/win10_disable_defender/main/win10_enable_defender.bat
-rem https://gist.github.com/xezrunner/a7a42dbc1096a40b0c78f09488fe5a2b
+echo Running with administrative privileges.
+echo.
 
 reg query HKLM\SYSTEM\Setup /v DisabledDefenderServices | find "0x1"
 if %errorlevel% == 0 goto already_patched
 
-echo.
 echo Please note that Defender can only be disabled in Win10 v2004 and upwards if Tamper Protection is disabled.
 echo This setting can be found in Window settings (hint: search for 'tamper'). Please do this now and then,
 pause
@@ -94,7 +103,7 @@ reg add HKLM\SYSTEM\Setup /v DisabledDefenderServices /t REG_DWORD /d 1 /f
 
 echo.
 echo Windows Defender has (hopefully) been disabled.
-echo You should still be able to scan files going forward. Also, the Antimalware Service Executable should immediately stop using CPU cycles.
+echo You might still be able to scan files going forward depending on your version of Windows. Also, the Antimalware Service Executable should immediately stop using CPU cycles.
 echo Please restart your computer to see all changes.
 
 goto eof
@@ -105,3 +114,4 @@ echo Defender has already been disabled by this script.
 :eof
 echo.
 pause
+

dotfiles/bin/antimalware-service-enable.bat

@@ -1,17 +1,11 @@
-@setlocal enableextensions enabledelayedexpansion
 @echo off
+setlocal enableextensions enabledelayedexpansion
 
-rem Make sure we're running as admin. Got this garbage from https://stackoverflow.com/a/40388766
-if not "%1"=="am_admin" (
-    powershell -Command "Start-Process -Verb RunAs -FilePath '%0' -ArgumentList 'am_admin'"
-    exit /b
-)
+rem NOTE: Defender may see this file as malware, so you might need to exclude this before things can be disabled.
 
-rem USE AT OWN RISK AS IS WITHOUT WARRANTY OF ANY KIND !!!!!
-rem
-rem Modified version of
-rem https://raw.githubusercontent.com/mattreecebentley/win10_disable_defender/main/win10_enable_defender.bat
-rem https://gist.github.com/xezrunner/a7a42dbc1096a40b0c78f09488fe5a2b
+rem Modified version of:
+rem https://github.com/ggannann/win10_disable_defender
+rem https://gist.github.com/xezrunner/a7a42dbc1096a40b0c78f09488fe5a2b (as of Jan 2026 this seems to have been deleted or made private)
 rem
 rem Resources:
 rem https://docs.microsoft.com/en-us/powershell/module/defender/set-mppreference?view=win10-ps
@@ -19,7 +13,23 @@ rem https://docs.microsoft.com/en-us/windows/threat-protection/windows-defender-
 rem https://github.com/AndyFul/ConfigureDefender
 rem https://github.com/AndyFul/Hard_Configurator
 
+rem ============================
+rem Self-elevate via UAC if needed
+rem - Detect admin by checking membership in Administrators (SID S-1-5-32-544)
+rem - Relaunch this script elevated using PowerShell Start-Process -Verb RunAs
+rem ============================
+rem Test for membership in Administrators group
+whoami /groups | find "S-1-5-32-544" >nul
+if errorlevel 1 (
+    echo Requesting administrative privileges...
+    rem Relaunch the same script elevated, preserving args and working directory
+    powershell -NoProfile -Command ^
+        "Start-Process -FilePath '%~f0' -ArgumentList '%*' -Verb RunAs -WorkingDirectory (Get-Location).Path"
+    exit /b
+)
+echo Running with administrative privileges.
 echo.
+
 echo Enabling Windows Defender
 reg query HKLM\SYSTEM\Setup /v DisabledDefenderServices | find "0x0"
 if %errorlevel% == 0 goto already_patched
@@ -106,3 +116,4 @@ echo Defender has already been enabled by this script.
 :eof
 echo.
 pause
+

dotfiles/bin/aws-check-restore-status

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+# Shows you the status of an object restore job.
+#
+# e.g. aws-check-restore-status my-deep-glacier-bucket object/path.png
+#
+# You know it's ready when ongoing-request is false and there's a date. If that field is null then the file isn't being restored.
+#
+# You'll need the aws cli tools. Download them from https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
+#
+# If you see an error like along the lines of "'charmap' codec can't encode
+# character '\u200e' in position 42: character maps to <undefined>" then that
+# means a filename has a Unicode codepoint and the dumb aws Python code is
+# trying to read it using your system's locale, which is very likely not set to
+# use the Windows UTF-8 beta feature. This is an ongoing issue in this tool
+# that goes back to 2013!!! There's no way to fix it using environment
+# variables, at least nothing worked for me. The fix provided by the devs is
+# heavy handed: you change your system locale to use UTF-8... This has
+# consequences though like breaking legacy apps that don't have Unicode support
+# and I'm sure other weird things will happen, such as file corruption. Anyway,
+# if you're getting this charmap error then I suggest changing your system
+# locale, run this again, then switch back to your previous locale. If you
+# don't get the canonical file name then you won't be able to restore it.
+#
+# You can enable the UTF-8 locale with:
+#
+# win+r -> intl.cpl -> Administrative tab -> Change system locale -> Beta: Use Unicode UTF-8 box.
+#
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+error() {
+    printf "${BOLD}${RED}$1${NORMAL}\n"
+}
+
+abort() {
+  error "\nAborting...\n"
+  exit 1
+}
+
+set -e
+
+bucket="$1"
+path="$2"
+
+if [[ $bucket == "" || $path == "" ]]; then
+    error "Usage: aws-check-restore-status <bucket-name> <path-in-bucket>"
+    exit 1
+fi
+
+aws s3api head-object --bucket $bucket --key "$path" --query "{Restore:Restore, StorageClass:StorageClass}" --output json

dotfiles/bin/aws-list-deep-glacier-files

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+
+# Creates a file containing the names of all files in a specific bucket.
+#
+# e.g. aws-list-deep-glacier-files my-deep-glacier images image_list
+#
+# You'll need the aws cli tools. Download them from https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
+#
+# If you see an error like along the lines of "'charmap' codec can't encode
+# character '\u200e' in position 42: character maps to <undefined>" then that
+# means a filename has a Unicode codepoint and the dumb aws Python code is
+# trying to read it using your system's locale, which is very likely not set to
+# use the Windows UTF-8 beta feature. This is an ongoing issue in this tool
+# that goes back to 2013!!! There's no way to fix it using environment
+# variables, at least nothing worked for me. The fix provided by the devs is
+# heavy handed: you change your system locale to use UTF-8... This has
+# consequences though like breaking legacy apps that don't have Unicode support
+# and I'm sure other weird things will happen, such as file corruption. Anyway,
+# if you're getting this charmap error then I suggest changing your system
+# locale, run this again, then switch back to your previous locale. If you
+# don't get the canonical file name then you won't be able to restore it.
+#
+# You can enable the UTF-8 locale with:
+#
+# win+r -> intl.cpl -> Administrative tab -> Change system locale -> Beta: Use Unicode UTF-8 box.
+#
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+error() {
+    printf "${BOLD}${RED}$1${NORMAL}\n"
+}
+
+set -e
+
+bucket="$1"
+path="$2"
+output_file="$3"
+
+if [[ $bucket == "" || $path == "" || $output_file == "" ]]; then
+    error "Usage: aws-list-deep-glacier-files <bucket-name> <path-in-bucket> <output-file>"
+    exit 1
+fi
+
+# .Key gives us just the object paths. If you want the other metadata then remove that from the query.
+
+items="$(aws s3api list-objects-v2 --bucket $bucket --prefix "$path" --query "Contents[?StorageClass=='DEEP_ARCHIVE'].Key" --output text | tr '\t' '\n' | tr -d '\r')"
+
+error=$?
+if [[ ! $error -eq 0 ]]; then
+    error "Error: failed to run the aws command. Aborting."
+    exit 1
+fi
+if [[ $items == "None" ]]; then
+    error "Didn't find any files. Check that your bucket name and path is correct."
+    exit 1
+fi
+
+mapfile -t lines_array <<< "$items"
+item_count="${#lines_array[@]}"
+
+echo "$items" > "$output_file"
+
+printf "Number of items: ${BOLD}${YELLOW}$item_count${NORMAL}\n"
+printf "Wrote file list to ${BOLD}${YELLOW}$output_file${NORMAL}\n"

dotfiles/bin/aws-restore-deep-glacier-folder

@@ -0,0 +1,331 @@
+#!/usr/bin/env bash
+
+# Restores all objects recursively from a specific bucket path. If want to
+# restore objects from an rclone crypt (encrypted remote), then you'll need to
+# do some manual steps first. See the `# Rclone Crypt` section for details.
+#
+# You can set how long restore files are available for download and the AWS
+# retrieval tier. The defaults are 7 days and the bulk tier respectively.
+#
+# Available tiers: bulk, standard, and expedited.
+#
+# Bulk retrievals are the lowest-cost retrieval option when restoring objects
+# from S3 Glacier Deep Archive. They typically finish within 48 hours for
+# objects stored in the S3 Glacier Deep Archive storage class or S3
+# Intelligent-Tiering Deep Archive tier.
+#
+# If you need faster access then use the `expedited` or `standard` tiers.
+#
+# Example usage:
+#
+# aws-restore-deep-glacier-folder my-deep-glacier-bucket path/to/images restored_images 14 expedited
+#
+# This will create a run.sh script in a folder called "restored_images". Run
+# that to restore all files inside the `path/to/images` folder from the
+# my-deep-glacier bucket.  Restored objects will be available for 14 days and
+# retrieved using the expedited tier.
+#
+# After you run the generated script, you have to wait for AWS to make the
+# files available for download. You can check the status of a file with:
+#
+# aws s3api head-object --bucket my-deep-glacier-bucket --key "path/to/images/photo1.jpg" --query "{Restore:Restore, StorageClass:StorageClass}"
+#
+# (obviously change the bucket and path to suit your needs).
+#
+# Or use the aws-check-restore-status script.
+# You know it's ready when ongoing-request is false and there's a date. If that
+# field is null then the file isn't being restored.
+#
+# Once the files are restored you can download them on the S3 website or better
+# yet use RcloneBrowser. I'm sure there's also a way to do it over cli too, I
+# just haven't checked.
+#
+# You'll need the aws cli tools for this script. Download them from https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
+# Once installed, open a new shell and verify that you can run the `aws` command.
+#
+# If you see an error like along the lines of "'charmap' codec can't encode
+# character '\u200e' in position 42: character maps to <undefined>" then that
+# means a filename has a Unicode codepoint and the dumb aws Python code is
+# trying to read it using your system's locale, which is very likely not set to
+# use the Windows UTF-8 beta feature. This is an ongoing issue in this tool
+# that goes back to 2013!!! There's no way to fix it using environment
+# variables, at least nothing worked for me. The fix provided by the devs is
+# heavy handed: you change your system locale to use UTF-8... This has
+# consequences though like breaking legacy apps that don't have Unicode support
+# and I'm sure other weird things will happen, such as file corruption. Anyway,
+# if you're getting this charmap error then I suggest changing your system
+# locale, run this again, then switch back to your previous locale. If you
+# don't get the canonical file name then you won't be able to restore it.
+#
+# You can enable the UTF-8 locale with:
+#
+# win+r -> intl.cpl -> Administrative tab -> Change system locale -> Beta: Use Unicode UTF-8 box.
+
+##########################
+# Rclone Crypt
+##########################
+#
+# To restore an rclone crypt, you need to first find the encrypted name that
+# maps to the parent folder or the file you want to restore. To do this you
+# need to use rclone. There are two ways to go about this.
+#
+# 1. The simple way is to use `cryptdecode` to convert your object path to its
+# encrypted form.
+#
+# For example, say you have an rclone crypt called `s3-deep-glacier-encrypted`
+# that is stored in S3 at `my-deep-glacier-bucket:encrypted/` You have a folder
+# called `dev/fonts` that you want to restore. To get its path, run the following
+# command:
+#
+#   rclone cryptdecode --reverse s3-deep-glacier-encrypted: dev/fonts
+#
+# This will give you the encrypted path, e.g. "44ildo3grlk44jmfr96nb5r56o/oatuh75ej3l4re96nvq2qbj8ik"
+#
+# You can now restore this by running:
+#
+#   aws-restore-deep-glacier-folder my-deep-glacier-bucket 44ildo3grlk44jmfr96nb5r56o/oatuh75ej3l4re96nvq2qbj8ik restore_dev_fonts
+#
+# You should be able to simply download the dev/fonts folder after its
+# restored. The easiest way is using rclone browser because it'll decrypt them
+# for you. Alternatively you can download the encrypted files using whatever
+# method you want and then decrypt them locally with rclone.
+#
+# 2. You can also get the encrypted names by enabling the 'show_mapping' option
+# in the rclone remote config. This will log the encrytped names of folders and
+# files with the original name in the same log line. This makes it easy to
+# parse the output.
+#
+# To enable the option, edit your rclone config, edit the remote you want to
+# restore from, edit the advanced config and set `show_mapping` to true.
+#
+# Now you can list the directories and files with rclone and get the mapping
+# output on stderr. e.g. let's capture all folders and files in a txt file:
+#
+#   rclone lsf s3-deep-glacier-encrypted: -R &> keys.txt
+#
+# If your rclone config has password protection then you'll be prompted for it
+# but won't see the output since it's being written to the file. Just paste it
+# and hit enter.
+#
+# Now you have a listing of all objects and the encrypted keys that they map
+# to. If you want to scope the output to a specific path in the crypt then add
+# it after the remote name, e.g. `s3-deep-glacier-encrypted:dev/fonts`
+#
+# If you scope it like that then be aware that the output won't contain the
+# mapping for the parent path, i.e. `dev/fonts`, but you can get that using
+# `cryptdecode` (see above) or with some non-recursive outputs of the parent
+# parts using `lsd`, e.g.
+#
+#   // First call will include the dev/ key
+#   rclone lsd s3-deep-glacier-encrypted:
+#
+#   // Second call has the fonts key
+#   rclone lsd s3-deep-glacier-encrypted:dev
+#
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+error() {
+    printf "${BOLD}${RED}$1${NORMAL}\n"
+}
+
+set -e
+
+bucket="$1"
+path="$2"
+temp_dir="$3"
+days_available=7
+restore_tier="bulk" # Can also be "standard" or "expedited"
+
+if [[ $bucket == "" || $path == "" || $temp_dir == "" ]]; then
+    error "Usage: aws-restore-deep-glacier-folder <bucket-name> <path-in-bucket> <local-temp-dir> <optional: days available> <optional: restore tier>"
+    exit 1
+fi
+
+# Get the days available.
+if [[ $4 != "" ]]; then
+    days_available=$4
+fi
+
+# Get the restore tier.
+if [[ $5 != "" ]]; then
+    restore_tier="$5"
+fi
+if ! grep -qiE '\b(bulk|standard|expedited)\b' <<<"$restore_tier"; then
+    error "Restore tier is invalid. Accepted values is \"bulk\", \"standard\" and \"expedited\""
+    exit 1
+fi
+
+# Normalize the tier; lowercase it then capitalize the first character.
+restore_tier="${restore_tier,,}"
+restore_tier="${restore_tier^}"
+
+printf "Restoring ${BOLD}${YELLOW}$bucket:$path${NORMAL} for ${BOLD}${YELLOW}$days_available${NORMAL} days using the ${BOLD}${YELLOW}\"$restore_tier\"${NORMAL} restore tier.\nSaving the restoration script in ${BOLD}${YELLOW}$temp_dir${NORMAL}\n"
+
+mkdir -p "$temp_dir"
+pushd "$temp_dir" &>/dev/null
+
+# .Key gives us just the object paths. If you want the other metadata then remove that from the query.
+items="$(aws s3api list-objects-v2 --bucket $bucket --prefix "$path" --query "Contents[?StorageClass=='DEEP_ARCHIVE'].Key" --output text | tr '\t' '\n' | tr -d '\r')"
+
+error=$?
+if [[ ! $error -eq 0 ]]; then
+    error "Error: failed to run the aws command. Aborting."
+    exit 1
+fi
+if [[ $items == "None" ]]; then
+    error "Didn't find any files. Check that your bucket name and path is correct."
+    exit 1
+fi
+
+mapfile -t lines_array <<< "$items"
+item_count="${#lines_array[@]}"
+
+# Generate the main script that will kick off the restoration.
+printf "Number of items to restore: ${BOLD}${YELLOW}$item_count${NORMAL}\n"
+printf "${BOLD}${RED}Create the restore script?\n> ${NORMAL}"
+
+read -e proceed
+if [[ $proceed == "1" || $proceed == "y" || $proceed == "Y" || $proceed == "yes" || $proceed == "YES" ]]; then
+    echo "$items" > all_objects_list.txt
+
+    RUN_TEMPLATE=$(cat <<EOF
+if which tput >/dev/null 2>&1; then
+    ncolors=\$(tput colors)
+fi
+if [ -t 1 ] && [ -n "\$ncolors" ] && [ "\$ncolors" -ge 8 ]; then
+    RED="\$(tput setaf 1)"
+    GREEN="\$(tput setaf 2)"
+    YELLOW="\$(tput setaf 3)"
+    BLUE="\$(tput setaf 4)"
+    MAGENTA="\$(tput setaf 5)"
+    CYAN="\$(tput setaf 6)"
+    BOLD="\$(tput bold)"
+    NORMAL="\$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+# Open an output file.
+exec 3>>output.txt
+
+fail_count=0
+failed_filename="failed_keys_\$(printf '%%04x' \$((RANDOM * RANDOM))).txt"
+
+before_sleep_count=0
+sleep_every_n_requests=25
+sleep_duration=0.2
+
+printf "Files are being restored for $days_available days using the $restore_tier tier\\\n\\\n"
+printf "Files are being restored for $days_available days using the $restore_tier tier\\\n\\\n" >&3
+
+printf "\${BOLD}NOTE: Request failures will be saved to \${YELLOW}\$failed_filename\${NORMAL}\${BOLD} as they happen. If this script terminates prematurely then check this file for failures.\\\n\\\n"
+printf "NOTE: Request failures will be saved to \$failed_filename as they happen. If this script terminates prematurely then check this file for failures.\\\n\\\n" >&3
+
+index=1
+while read key; do
+    printf "* [\$index/$item_count] \${BOLD}\$key\${NORMAL}\\\n"
+    printf "* [\$index/$item_count] \$key\\\n" >&3
+    err=\$(
+        aws s3api restore-object \\
+            --bucket mcampagnaro-deep-glacier \\
+            --key \\"\$key\\" \\
+            --restore-request '{\\"Days\\":$days_available,\\"GlacierJobParameters\\":{\\"Tier\\":\\"$restore_tier\\"}}' \\
+            2>&1 >/dev/null
+    )
+    index=\$((index + 1))
+    before_sleep_count=\$((before_sleep_count + 1))
+
+    # strip newlines
+    err="\${err//[$'\\\t\\\r\\\n']}"
+
+    if [[ \$err != "" ]]; then
+        if ! grep -qE 'RestoreAlreadyInProgress|ObjectAlreadyInActiveTierError' <<<"\$err"; then
+            printf "\${BOLD}\${RED}FAILED! \$err\${NORMAL}"
+            printf "FAILED! \$err\" >&3
+
+            # Save the failure to a file now in case the script exits prematurely.
+            fail_count=\$((fail_count + 1))
+            printf "%%s\\\n" "\$key" >> \$failed_filename
+        else
+            if grep -qE 'RestoreAlreadyInProgress' <<<"\$err"; then
+                printf "\${BOLD}\${YELLOW}SKIPPING! File restore is already in progress.\${NORMAL}"
+                printf "SKIPPING! File restore is already in progress." >&3
+            else
+                printf "\${BOLD}\${YELLOW}SKIPPING! File is already restored. You can now download it.\${NORMAL}"
+                printf "SKIPPING! File is already restored. You can now download it." >&3
+            fi
+        fi
+    else
+        printf "\${BOLD}\${GREEN}SUCCESS!\${NORMAL}"
+        printf "SUCCESS!" >&3
+    fi
+    printf "\\\n\\\n"
+    printf "\\\n\\\n" >&3
+
+    if [[ \$before_sleep_count -eq sleep_every_n_requests ]]; then
+        printf "SLEEPING...\\\n\\\n"
+        printf "SLEEPING...\\\n\\\n" >&3
+        sleep \$sleep_duration
+        before_sleep_count=0
+    fi
+
+done < all_objects_list.txt
+
+printf "\${BOLD}\${GREEN}Done!\${NORMAL}\\\n\\\n"
+printf "Done!\\\n\\\n" >&3
+
+if [[ \$fail_count > 0 ]]; then
+    printf "\${BOLD}\${RED}There were \$fail_count failures!\\\nSee \${NORMAL}\${BOLD}\$filename\${RED} for the list. You can replace the contents of \${NORMAL}\${BOLD}all_objects_list.txt\${RED} with the list of failures and re-run this script to process them.\${NORMAL}\\\n\\\n"
+    printf "There were \$fail_count failures!\\\nSee \$filename for the list. You can replace the contents of all_objects_list.txt with the list of failures and re-run this script to process them.\\\n\\\n" >&3
+else
+    printf "There were no failures. All the files are being restored. You can now delete this folder.\\\n\\\n"
+    printf "There were no failures. All the files are being restored. You can now delete this folder.\\\n\\\n" >&3
+fi
+
+printf "(Note: the time it takes to restore an object can be found in the AWS docs - just look for the $restore_tier restore tier, which is what you used.\\\nOnce restored, download the files from the S3 site or better yet use RCloneBrowser.\\\n"
+printf "You can check the status of a file using the aws-check-restore-status script)\\\n"
+
+exec 3>&-
+
+EOF
+)
+
+    printf "$RUN_TEMPLATE" > run.sh
+
+    chmod +x run.sh
+
+    printf "${BOLD}You can now run ${GREEN}$temp_dir/run.sh${NORMAL}${BOLD} to start the restoration process.\n"
+else
+    echo Aborting.
+fi
+
+popd &>/dev/null

dotfiles/bin/change-volume

@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+# Re-encodes the audio, modify the volume based on the supplied db delta. If
+# given a video file then the file is copied as-is. If you want to bring the
+# max_volume to 0 db then call analyze-volume prior to this and pass a delta
+# based on the reported max_volume.
+#
+# Inspired by https://superuser.com/a/323127 and https://superuser.com/a/1312885
+
+source "$HOME/dotfiles/script_helpers/windows.sh"
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+if [[ $1 == "" ]]; then
+    printf "${BOLD}${RED}Usage: change-volume <video or audio filename> <output name> <volume delta in db>${NORMAL}\n"
+    exit 1
+fi
+
+filename=$(basename -- "$1")
+extension="${filename##*.}"
+filename="${filename%.*}"
+
+output_name="$2"
+delta_db="$3"
+
+if [[ $output_name == "" ]]; then
+    output="${filename}_normalized_audio.$extension"
+else
+    output="${output_name}.$extension"
+fi
+
+printf "\n${YELLOW}${BOLD}Modifying audio volume in $filename.$extension | output: $output | delta: $delta_db${NORMAL}\n"
+
+# Since we're re-encoding the audio we have to specify a codec to use.
+cmd="ffmpeg -y -stats -loglevel level+error -i \"$filename.$extension\" -af \"volume=${delta_db}dB\" -c:v copy -c:a aac \"$output\""
+printf "\n${BOLD}Running: $cmd\n\n${NORMAL}"
+eval $cmd
+
+printf "\n${GREEN}${BOLD}Done modifying volume in $filename.$extension | output: $output | delta: $delta_db${NORMAL}\n"
+
+flash_taskbar

dotfiles/bin/compress-video

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+# Bigger crf values == bigger compression.
+
+source "$HOME/dotfiles/script_helpers/windows.sh"
+
 if which tput >/dev/null 2>&1; then
     ncolors=$(tput colors)
 fi
@@ -23,10 +27,13 @@ else
     NORMAL=""
 fi
 
-use_gpu=0
+use_gpu=1
+# Found the following to work best with vids containing text (e.g. programming vids). These give similar bitrates.
+cpu_crf=20
+gpu_crf=33
 
-if [[ $# < 2 || $# > 3 ]]; then
-    printf "${BOLD}${RED}Usage: $0 <filename> <output name> <optional: use-gpu (1|0), defaults to $use_gpu> ${NORMAL}\n"
+if [[ $# < 2 || $# > 5 ]]; then
+    printf "${BOLD}${RED}Usage: compress-video <filename> <output name> <optional: use-gpu (1|0), defaults to $use_gpu> <optional: start time HH:MM:SS> <optional: end time HH:MM:SS> (NOTE: gpu crf is $gpu_crf and cpu crf is $cpu_crf - change it by calling compress-video-with-crf)${NORMAL}\n"
     exit 1
 fi
 
@@ -37,11 +44,12 @@ if [[ $# > 2 ]]; then
     use_gpu=$3
 fi
 
-# Found the following to work best with vids containing text (e.g. programming vid): 25 for CPU encoding and 27 for GPU.
-use_crf=21
+use_crf=$cpu_crf
 if [[ $use_gpu -eq 1 ]]; then
-    use_crf=25
+    use_crf=$gpu_crf
 fi
 
-compress-video-with-crf $use_crf "$filename" "$output_name" $use_gpu
+compress-video-with-crf $use_crf "$filename" "$output_name" $use_gpu $4 $5
+
+flash_taskbar
 

dotfiles/bin/compress-video-with-crf

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+# Bigger crf values == bigger compression.
+
+source "$HOME/dotfiles/script_helpers/windows.sh"
+
 if which tput >/dev/null 2>&1; then
     ncolors=$(tput colors)
 fi
@@ -23,10 +27,10 @@ else
     NORMAL=""
 fi
 
-use_gpu=0
+use_gpu=1
 
 if [[ "$#" < 3 || "$#" > 6 ]]; then
-    printf "${BOLD}${RED}Usage: $0 <crf value> <filename> <output name> <optional: use-gpu (1|0), defaults to $use_gpu> <optional: start time HH:MM:SS> <optional: end time HH:MM:SS>\n\nIf you want to encode a range of CRF values then use -1 as the crf value.${NORMAL}\n"
+    printf "${BOLD}${RED}Usage: compress-video-with-crf <crf value> <filename> <output name> <optional: use-gpu (1|0), defaults to $use_gpu> <optional: start time HH:MM:SS> <optional: end time HH:MM:SS>\n\nIf you want to encode a range of CRF values then use -1 as the crf value.${NORMAL}\n"
     exit 1
 fi
 
@@ -65,21 +69,25 @@ function encode() {
     fi
 
     if [[ $use_gpu -eq 1 ]]; then
-        # File will be slightly larger than CPU encoding, but it's much faster to transcode and doesn't max out the CPU cores.
-
         # RTX 3080
-        ffmpeg -y -stats -loglevel level+error $timing_args -vsync 0 -hwaccel cuda -hwaccel_output_format cuda -i "$filename.$extension" -c:a copy -c:v h264_nvenc -profile:v high -rc:v vbr_hq -cq:v $crf -b:v 5M -maxrate 5M -max_muxing_queue_size 9999 "$output"
+        # vbr_hq is smaller file and less bitrate than vbr - strange!
+        ffmpeg -y -stats -loglevel level+error -hwaccel cuda -hwaccel_output_format cuda $timing_args -accurate_seek -i "$filename.$extension" -c:v h264_nvenc -profile:v high -preset 3 -rc:v vbr -cq:v $crf -c:a copy -max_muxing_queue_size 9999 -movflags +faststart "$output"
 
-        # GTX 1070
-        #ffmpeg -y -stats -loglevel level+error $timing_args -vsync 0 -hwaccel cuvid -c:v h264_cuvid -i "$filename.$extension" -c:a copy -c:v h264_nvenc -profile:v high -rc:v vbr_hq -cq:v $crf -b:v 5M -maxrate 5M -max_muxing_queue_size 9999 "$output"
+        # capped bitrate w/ crf is weird. gives a more compressed copy
+        # ffmpeg -y -stats -loglevel level+error -hwaccel cuda -hwaccel_output_format cuda $timing_args -accurate_seek -i "$filename.$extension" -c:v h264_nvenc -profile:v high -preset 3 -cq:v $crf -b:v 1200K -maxrate:v 1200K -bufsize:v 2400K -c:a copy -max_muxing_queue_size 9999 -movflags +faststart "$output"
     else
         ffmpeg -y -stats -loglevel level+error $timing_args -i "$filename.$extension" -c:v libx264 -crf $crf -preset veryfast -profile:v high -level 3.0 -strict -2 "$output"
     fi
     printf "\n${GREEN}${BOLD}Finished encoding '$filename.$extension' (CRF $crf) | output name '$output'${NORMAL}\n\n"
+
+    original_size=$(wc -c <"$filename.$extension")
+    new_size=$(wc -c <"$output")
+    printf "${BOLD}Original size: $original_size${NORMAL}\n"
+    printf "${BOLD}New size:      $new_size${NORMAL}\n\n"
 }
 
 if [[ $use_crf -ne -1 ]]; then
-    encode $use_crf
+    time encode $use_crf
 else
     printf "\n${YELLOW}${BOLD}Encoding using a range of CRF values.${NORMAL}\n"
 
@@ -89,3 +97,5 @@ else
         encode $crf
     done
 fi
+
+flash_taskbar

dotfiles/bin/convert-video-to-mp4

@@ -0,0 +1,100 @@
+#!/usr/bin/env bash
+
+# This is for reencoding a non-mp4 video to mp4 using an mpeg4 encoder.
+# Can optionally compress the video.
+
+source "$HOME/dotfiles/script_helpers/windows.sh"
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+compress="$1"
+filename="$2"
+output_name="$3"
+bitrate="$4"
+
+if [[ $compress == "" || $filename == "" || $output_name == "" ]]; then
+    printf "${BOLD}${RED}Usage: convert-video-to-mp4 <compress 1|0> <filename> <output name> <optional: bitrate, e.g. \"4000k\", defaults to source>${NORMAL}\n"
+    exit 1
+fi
+
+
+filename=$(basename -- "$filename")
+extension="${filename##*.}"
+extension="${extension,,}"  # go lower-case
+filename="${filename%.*}"
+
+output="$output_name.mp4"
+
+bitrate_args=""
+
+if [[ $compress -eq 1 ]]; then
+    temp_output="temp_$output"
+else
+    temp_output="$output"
+fi
+
+# convert first.
+# we convert then compress instead of compressing on first pass because this results in a slightly higher bitrate.
+
+cmd=""
+
+if [[ $extension == "mkv" || $extension == "mpg" || $extension == "mov" ]]; then
+    if [[ $bitrate != "" ]]; then
+        bitrate_args="-b:v $bitrate"
+    else
+        bitrate="<source value>"
+    fi
+
+    cmd="ffmpeg -y -stats -loglevel level+error -i \"$filename.$extension\" -vcodec copy -acodec copy $bitrate_args \"$temp_output\""
+
+elif [[ $extension == "flv" ]]; then
+    if [[ $bitrate == "" ]]; then
+        bitrate="5M"
+    fi
+    bitrate_args="-b:v $bitrate"
+
+    cmd="ffmpeg -y -stats -loglevel level+error -vsync 0 -hwaccel cuvid -c:v h264_cuvid -i \"$filename.$extension\" -c:a aac -c:v h264_nvenc $bitrate_args \"$temp_output\""
+
+elif [[ $extension == "avi" || $extension == "wmv" ]]; then
+    cmd="ffmpeg -y -stats -loglevel level+error -i \"$filename.$extension\" -c:a aac -c:v mpeg4 $bitrate_args \"$output\""
+
+else
+    printf "${BOLD}${RED}Don't know how to convert a '$extension' to mp4. Add support!${NORMAL}\n"
+    exit 1
+fi
+
+printf "\n${YELLOW}${BOLD}Encoding '$filename.$extension' | compress: $compress | output: $output | bitrate: $bitrate${NORMAL}\n"
+
+eval "$cmd"
+
+if [[ $compress -eq 1 ]]; then
+    compress-video 1 "$temp_output" "$output"
+    rm "$temp_output"
+else
+    printf "\n"
+fi
+
+printf "${GREEN}${BOLD}Done encoding '$filename.$extension' to '$output'${NORMAL}\n\n"
+
+flash_taskbar

dotfiles/bin/copy-left-audio-channel-to-right

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-# Use this to fix the audio of a video that has audio in only the left or right
-# channel. This does not re-encode the video.
+# Use this to copy audio from the left channel to the right. This does not re-encode the video.
 
 if which tput >/dev/null 2>&1; then
     ncolors=$(tput colors)
@@ -27,7 +26,7 @@ else
 fi
 
 if [[ $1 == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <filename> <optional output name>${NORMAL}\n"
+    printf "${BOLD}${RED}Usage: copy-left-audio-channel-to-right <filename> <optional output name>${NORMAL}\n"
     exit 1
 fi
 
@@ -43,9 +42,9 @@ else
     output="${output_name}.$extension"
 fi
 
-printf "\n${YELLOW}${BOLD}Repairing audio in $filename.$extension | output: $output${NORMAL}\n"
+printf "\n${YELLOW}${BOLD}Copy left audio channeel to right channel in $filename.$extension | output: $output${NORMAL}\n"
 
-ffmpeg -i "$filename.$extension" -c:v copy -ac 1 "$output"
+ffmpeg -y -stats -loglevel level+error -i "$filename.$extension" -c:v copy -af "pan=stereo|c0=c0|c1=c0" -map 0 "$output"
 
-printf "\n${GREEN}${BOLD}Done repairing audio in $filename.$extension | output: $output${NORMAL}\n\n"
+printf "\n${GREEN}${BOLD}Done copying left audio channel to right channel in $filename.$extension | output: $output${NORMAL}\n\n"
 

dotfiles/bin/copy-right-audio-channel-to-left

@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+# Use this to copy audio from the right channel to the left. This does not re-encode the video.
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+if [[ $1 == "" ]]; then
+    printf "${BOLD}${RED}Usage: copy-right-audio-channel-to-left <filename> <optional output name>${NORMAL}\n"
+    exit 1
+fi
+
+filename=$(basename -- "$1")
+extension="${filename##*.}"
+filename="${filename%.*}"
+
+output_name="$2"
+
+if [[ $output_name == "" ]]; then
+    output="${filename}_repaired_audio.$extension"
+else
+    output="${output_name}.$extension"
+fi
+
+printf "\n${YELLOW}${BOLD}Copy right audio channeel to left channel in $filename.$extension | output: $output${NORMAL}\n"
+
+ffmpeg -y -stats -loglevel level+error -i "$filename.$extension" -c:v copy -af "pan=stereo|c0=c1|c1=c1" -map 0 "$output"
+
+printf "\n${GREEN}${BOLD}Done copying right audio channel to left channel in $filename.$extension | output: $output${NORMAL}\n\n"
+

dotfiles/bin/create-gif-from-video

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+filename=$(basename -- "$1")
+output_name="$2"
+width="$3"
+
+if [[ $filename == "" || $output_name == "" ]]; then
+    printf "${BOLD}${RED}Usage: create-gif-from-video <filename> <output name> <optional width, defaults to 240>${NORMAL}\n"
+    exit 1
+fi
+
+output="${output_name}.gif"
+if [[ $width == "" ]]; then
+    width=240
+fi
+
+printf "\n${YELLOW}${BOLD}Creating a gif from '$filename' | output: $output | width: $width${NORMAL}\n"
+
+ffmpeg -y -stats -loglevel level+error -i "$filename" -vf "fps=24,scale=$width:-1:flags=lanczos,split[s0][s1];[s0]palettegen[p];[s1][p]paletteuse" -loop 0 "$output"
+
+printf "\n${GREEN}${BOLD}Finished!${NORMAL}\n\n"
+

dotfiles/bin/embed-subtitles

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+# Adds subtitles to a video. You can pass multiple srt files in one go. This
+# preserves all existing streams, so if you've already added subtitle tracks to
+# the video then these new ones will be appended. I haven't extensively tested
+# appending yet (not sure if the mapping arg is correct), so I recommend adding
+# all of your tracks in one go.
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+filename=$(basename -- "$1")
+extension="${filename##*.}"
+filename="${filename%.*}"
+
+output_name="$2"
+output="${output_name}.$extension"
+
+shift 2
+subtitles=("$@")
+
+if [[ $filename == "" || $output_name == "" || ${#subtitles[@]} -eq 0 ]]; then
+    printf "${BOLD}${RED}Usage: embed-subtitles <video filename> <output name> <subtitle filenames>${NORMAL}\n"
+    exit 1
+fi
+
+printf "\n${YELLOW}${BOLD}Adding subtitles to $filename.$extension | output: $output${NORMAL}\n"
+
+mapping="-map 0"
+tracks=""
+
+map_index=1
+for track in "$@"; do
+    tracks+="-i \"$track\" "
+    mapping+=" -map $map_index"
+    map_index=$((map_index+1))
+done
+
+cmd="ffmpeg -i \"$filename.$extension\" $tracks $mapping -c copy -c:s mov_text \"$output\""
+printf "\n${BOLD}Running: $cmd\n\n${NORMAL}"
+eval $cmd
+
+printf "\n${GREEN}${BOLD}Done adding subtitles to $filename.$extension | output: $output\n${NORMAL}"

dotfiles/bin/extract-audio-from-video

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+# Extracts audio from a video. It expects you to know what audio codecs the
+# video container has, e.g. it's an mp4 video with aac and m4a audio. Just set
+# the format to the appropriate extension.
+#
+# If you want to convert to a different format or you want to change the sample
+# rate, channel count, trim the audio, etc. then use transcode-audio.
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+filename=$(basename -- "$1")
+format="$2"
+start_time="$3"
+end_time="$4"
+
+if [[ $1 == "" || $2 == "" ]]; then
+    printf "${BOLD}${RED}Usage: extract-audio-from-video <filename> <format (mp3, m4a, aac, etc)> <optional: start time HH:MM:SS, use empty string or 0 for start> <optional: end time HH:MM:SS, use empty string or 0 for no value>${NORMAL}\n"
+    exit 1
+fi
+
+extension="${filename##*.}"
+filename="${filename%.*}"
+output_name="$filename.$format"
+
+timing_args=""
+if [[ $start_time != "" ]]; then
+    timing_args="-ss $start_time "
+fi
+if [[ $end_time != "" ]]; then
+    if [[ $start_time == "0" && $end_time == "0" ]]; then
+        # We treat a start and end with 0 values as no op.
+        timing_args=""
+    elif [[ $end_time != "0" ]]; then
+        # Handle having a start time but end time is set to 0, can just ignore it and it'll use the remainder of the video.
+        timing_args+="-to $end_time"
+    fi
+fi
+
+printf "\n${YELLOW}${BOLD}Extracting audio from $filename.$extension | output: $output_name | start: $start_time | end: $end_time${NORMAL}\n"
+
+ffmpeg -y -stats -loglevel level+error $timing_args -i "$filename.$extension" -vn -acodec copy "$output_name"
+
+printf "\n${GREEN}${BOLD}Done extracting audio from $filename.$extension | output name '$output_name'${NORMAL}\n\n"
+

dotfiles/bin/file-checksum-md5.bat

@@ -0,0 +1,11 @@
+@echo off
+
+if exist %1\* (
+	echo Run on a file
+) else (
+	if exist "%~1_checksum-md5.txt" (
+		del "%~1_checksum-md5.txt"
+	)
+	certutil.exe -hashfile "%~1" MD5 > "%~1_checksum-md5.txt"
+	start notepad "%~1_checksum-md5.txt"
+)

dotfiles/bin/file-checksum-sha1.bat

@@ -0,0 +1,11 @@
+@echo off
+
+if exist %1\* (
+	echo Run on a file
+) else (
+	if exist "%~1_checksum-sha1.txt" (
+		del "%~1_checksum-sha1.txt"
+	)
+	certutil.exe -hashfile "%~1" SHA1 > "%~1_checksum-sha1.txt"
+	start notepad "%~1_checksum-sha1.txt"
+)

dotfiles/bin/file-checksum-sha256.bat

@@ -0,0 +1,11 @@
+@echo off
+
+if exist %1\* (
+	echo Run on a file
+) else (
+	if exist "%~1_checksum-sha256.txt" (
+		del "%~1_checksum-sha256.txt"
+	)
+	certutil.exe -hashfile "%~1" SHA256 > "%~1_checksum-sha256.txt"
+	start notepad "%~1_checksum-sha256.txt"
+)

dotfiles/bin/file-checksum-sha512.bat

@@ -0,0 +1,11 @@
+@echo off
+
+if exist %1\* (
+	echo Run on a file
+) else (
+	if exist "%~1_checksum-sha512.txt" (
+		del "%~1_checksum-sha512.txt"
+	)
+	certutil.exe -hashfile "%~1" SHA512 > "%~1_checksum-sha512.txt"
+	start notepad "%~1_checksum-sha512.txt"
+)

dotfiles/bin/file-sigcheck.bat

@@ -0,0 +1,13 @@
+@echo off
+
+cd /d %DEV_TOOLS%\SysinternalsSuite
+
+if exist %1\* (
+	echo Run on a file
+) else (
+	if exist "%~1_sigcheck_report.txt" (
+		del "%~1_sigcheck_report.txt"
+	)
+	sigcheck64.exe /a "%~1" > "%~1_sigcheck_report.txt"
+	start notepad "%~1_sigcheck_report.txt"
+)

dotfiles/bin/join-video

@@ -0,0 +1,69 @@
+#!/usr/bin/env bash
+
+# Re-encodes the video to get a more accurate timeline. Same settings as trim-video-vbr.
+# If you want fast video joining at the expense of accuracy then use join-video-fast.
+
+source "$HOME/dotfiles/script_helpers/windows.sh"
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+filename=$(basename -- "$1")
+output="$2"
+target_crf="$3"
+max_bitrate_mb="$4"
+
+default_crf="33" # if you want to compress then use the same gpu compression level from compress-video (i.e. 33, but verify it's still set to this)
+default_max_bitrate="6"
+
+if [[ $filename == "" || $output == "" ]]; then
+    printf "${BOLD}${RED}Usage: create a text file that lists the input video paths on separate lines using the format: file '/path/to/video'. Then call:\n\njoin-video <list filename> <output name> <optional: crf (quality, value = compression level) - defaults to $default_crf, use 0 for no value> <optional: max bitrate in MB - defaults to ${default_max_bitrate}M>${NORMAL}\n"
+    exit 1
+fi
+
+extension="${output##*.}"
+if [[ $extension == $output ]]; then
+    printf "${BOLD}${RED}output arg should have an extension!\n\nUsage: join-video <list filename> <output name> <optional: crf (quality, value = compression level) - defaults to $default_crf, use 0 for no value> <optional: max bitrate in MB - defaults to ${default_max_bitrate}M>${NORMAL}\n"
+    exit 1
+fi
+
+if [[ $target_crf == "" || $target_crf == "0" ]] then
+    target_crf=$default_crf
+fi
+
+if [[ $max_bitrate_mb == "" ]] then
+    max_bitrate_mb=$default_max_bitrate
+fi
+
+# bufsize is typically double the maxrate
+bufsize=$((max_bitrate_mb * 2))
+bufsize="${bufsize}M"
+max_bitrate="${max_bitrate_mb}M"
+
+printf "\n${YELLOW}${BOLD}Joining contents of '$filename' | output: $output | crf: $target_crf | max rate: $max_bitrate | buffer size: $bufsize ${NORMAL}\n"
+
+time ffmpeg -y -stats -loglevel level+error -hwaccel cuda -hwaccel_output_format cuda -f concat -safe 0 -accurate_seek -i "$filename" -c:v h264_nvenc -profile:v high -preset 3 -rc:v vbr -cq:v $target_crf -maxrate:v $max_bitrate -bufsize:v $bufsize -c:a copy -movflags +faststart "$output"
+
+printf "\n${GREEN}${BOLD}Finished joining${NORMAL}\n\n"
+
+flash_taskbar

dotfiles/bin/join-video-fast

@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 
+# A fast way to join video clips that might result in some weird playback cursor timings,
+# e.g. video player might show negative seconds at the start of the vid or the
+# playback time might oscillate a bit. Use join-video for accurate joining at
+# the cost of a much slower processing time.
+
+source "$HOME/dotfiles/script_helpers/windows.sh"
+
 if which tput >/dev/null 2>&1; then
     ncolors=$(tput colors)
 fi
@@ -35,7 +42,8 @@ output="${output_name}.mp4"
 
 printf "\n${YELLOW}${BOLD}Joining contents of '$filename'| output: $output${NORMAL}\n"
 
-ffmpeg -f concat -safe 0 -i "$filename" -c copy "$output"
+ffmpeg -y -stats -loglevel level+error -f concat -safe 0 -i "$filename" -c copy "$output"
 
 printf "\n${GREEN}${BOLD}Finished joining${NORMAL}\n\n"
 
+flash_taskbar

dotfiles/bin/normalize-volume

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+# Use this to normalize the volume of a video or audio file using the average
+# loudness, or RMS-based normalization. It does a pretty good job!
+#
+# If you want to modify the volume manually then checkout the analyze-volume
+# and change-volume scripts.
+#
+# This does not re-encode video when given a video file.
+#
+# Inspired by https://superuser.com/a/323127 and https://superuser.com/a/1312885
+
+source "$HOME/dotfiles/script_helpers/windows.sh"
+
+if which tput >/dev/null 2>&1; then
+    ncolors=$(tput colors)
+fi
+if [ -t 1 ] && [ -n "$ncolors" ] && [ "$ncolors" -ge 8 ]; then
+    RED="$(tput setaf 1)"
+    GREEN="$(tput setaf 2)"
+    YELLOW="$(tput setaf 3)"
+    BLUE="$(tput setaf 4)"
+    MAGENTA="$(tput setaf 5)"
+    CYAN="$(tput setaf 6)"
+    BOLD="$(tput bold)"
+    NORMAL="$(tput sgr0)"
+else
+    RED=""
+    GREEN=""
+    YELLOW=""
+    BLUE=""
+    MAGENTA=""
+    CYAN=""
+    BOLD=""
+    NORMAL=""
+fi
+
+if [[ $1 == "" ]]; then
+    printf "${BOLD}${RED}Usage: normalize-volume <video or audio filename> <optional output name>${NORMAL}\n"
+    exit 1
+fi
+
+filename=$(basename -- "$1")
+extension="${filename##*.}"
+filename="${filename%.*}"
+
+output_name="$2"
+
+if [[ $output_name == "" ]]; then
+    output="${filename}_normalized_audio.$extension"
+else
+    output="${output_name}.$extension"
+fi
+
+printf "\n${YELLOW}${BOLD}Normalizing audio in $filename.$extension | output: $output${NORMAL}\n"
+
+# This is done in two passes. The first pass will compute the mean loudness and
+# the second pass will normalize the audio using the mean as the target.
+
+temp_file="/tmp/_audio_info_$RANDOM"
+
+# 1st pass:
+cmd="ffmpeg -i \"$filename.$extension\" -pass 1 -filter:a loudnorm=print_format=json -vn -sn -dn -f null /dev/null 2>&1 | sed -n '/{/,/}/p' > $temp_file"
+printf "\n${BOLD}Running 1st pass:\n$cmd\n\n${NORMAL}"
+eval "$cmd"
+
+printf "${BOLD}${GREEN}Done.\n\n${NORMAL}"
+
+ii=`grep   \"input_i\"       $temp_file | cut -d: -f2 | tr -cd [:digit:].-`
+itp=`grep  \"input_tp\"      $temp_file | cut -d: -f2 | tr -cd [:digit:].-`
+ilra=`grep \"input_lra\"     $temp_file | cut -d: -f2 | tr -cd [:digit:].-`
+it=`grep   \"input_thresh\"  $temp_file | cut -d: -f2 | tr -cd [:digit:].-`
+to=`grep   \"target_offset\" $temp_file | cut -d: -f2 | tr -cd [:digit:].-`
+
+# 2nd pass:
+cmd="ffmpeg -y -stats -loglevel level+error -i \"$filename.$extension\" -c:v copy -pass 2 -filter:a loudnorm=linear=true:I=-16:LRA=11:tp=-1.5:measured_I=$ii:measured_LRA=$ilra:measured_tp=$itp:measured_thresh=$it:offset=$to:print_format=summary \"$output\""
+printf "${BOLD}Re-encoding audio:\n$cmd\n\n${NORMAL}"
+eval "$cmd"
+
+printf "\n${GREEN}${BOLD}Done normalizing volume in $filename.$extension | output: $output${NORMAL}\n"
+rm $temp_file
+
+flash_taskbar

dotfiles/bin/remove-audio-from-video

@@ -24,7 +24,7 @@ else
 fi
 
 if [[ $1 == "" ]]; then
-    printf "${BOLD}${RED}Usage: $0 <filename> <optional output name>${NORMAL}\n"
+    printf "${BOLD}${RED}Usage: remove-audio-from-video <filename> <optional output name>${NORMAL}\n"
     exit 1
 fi
 
@@ -43,7 +43,7 @@ fi
 printf "\n${YELLOW}${BOLD}Removing audio from '$filename.$extension' | output: '$output'${NORMAL}\n"
 
 # -an removes the audio.
-ffmpeg -i "$filename.$extension" -c:v copy -an "$output"
+ffmpeg -y -stats -loglevel level+error -i "$filename.$extension" -c:v copy -an -map 0 "$output"
 
 printf "\n${GREEN}${BOLD}Done removing audio from '$filename.$extension' | output: '$output'${NORMAL}\n\n"
 

dotfiles/bin/symbolic-link

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source "$HOME/.dotfiles/script_helpers/all.sh"
+source "$HOME/dotfiles/script_helpers/all.sh"
 
 cwd=$PWD
 source_path=""