Merge 96b997e8cf92134e5f8f7188a3b96ec300523b74 into 07952026753f1bbeaf5b6c4eb5414a9c51536041

* Fix pdf and plain text previws in lf

Pdf previws don't appear because are generated with wrong filename.
Plain text previws with `bat` don't respect terminal theme and have
annoying border.

* Revert pdf cache filename to work properly

.config/lf/lfrc

@@ -50,7 +50,7 @@ cmd open ${{
     esac
 }}
 
-cmd mkdir $mkdir -p "$(echo $* | tr ' ' '\ ')"
+cmd mkdir $mkdir -p "$@"
 
 cmd extract ${{
 	clear; tput cup $(($(tput lines)/3)); tput bold
@@ -139,7 +139,7 @@ map D delete
 map E extract
 map C copyto
 map M moveto
-map <c-n> push :mkdir<space>
+map <c-n> push :mkdir<space>""<left>
 map <c-r> reload
 map <c-s> set hidden!
 map <enter> shell

.config/lf/scope

@@ -13,10 +13,6 @@ image() {
 	fi
 }
 
-ifub() {
-	[ -n "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ] && command -V ueberzug >/dev/null 2>&1
-}
-
 # Note that the cache file name is a function of file information, meaning if
 # an image appears in multiple places across the machine, it will not have to
 # be regenerated once seen.
@@ -29,10 +25,15 @@ case "$(file --dereference --brief --mime-type -- "$1")" in
 		CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)"
 		[ ! -f "$CACHE" ] && djvused "$1" -e 'select 1; save-page-with /dev/stdout' | convert -density 200 - "$CACHE.jpg" > /dev/null 2>&1
 		image "$CACHE.jpg" "$2" "$3" "$4" "$5" "$1" ;;
+image/svg+xml)
+	CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)"
+	[ ! -f "$CACHE" ] && inkscape --convert-dpi-method=none -o "$CACHE.png" --export-overwrite -D --export-png-color-mode=RGBA_16 "$1"
+	image "$CACHE.png" "$2" "$3" "$4" "$5" "$1"
+	;;
 	image/*) image "$1" "$2" "$3" "$4" "$5" "$1" ;;
 	text/html) lynx -width="$4" -display_charset=utf-8 -dump "$1" ;;
 	text/troff) man ./ "$1" | col -b ;;
-	text/* | */xml | application/json | application/x-ndjson) bat --terminal-width "$(($4-2))" -f "$1" ;;
+	text/* | */xml | application/json | application/x-ndjson) bat -p --theme ansi --terminal-width "$(($4-2))" -f "$1" ;;
 	audio/* | application/octet-stream) mediainfo "$1" || exit 1 ;;
 	video/* )
 		CACHE="${XDG_CACHE_HOME:-$HOME/.cache}/lf/thumb.$(stat --printf '%n\0%i\0%F\0%s\0%W\0%Y' -- "$(readlink -f "$1")" | sha256sum | cut -d' ' -f1)"

.config/nvim/init.vim

@@ -67,6 +67,14 @@ set noshowcmd
 	nm <leader>i :call ToggleIPA()<CR>
 	imap <leader>i <esc>:call ToggleIPA()<CR>a
 	nm <leader>q :call ToggleProse()<CR>
+	
+" vim-airline
+	if !exists('g:airline_symbols')
+  	    let g:airline_symbols = {}
+	endif
+	let g:airline_symbols.colnr = ' C:'
+	let g:airline_symbols.linenr = ' L:'
+	let g:airline_symbols.maxlinenr = '☰ '
 
 " Shortcutting split navigation, saving a keypress:
 	map <C-h> <C-w>h

.config/shell/profile

@@ -1,14 +1,12 @@
-#!/bin/zsh
+#!/bin/sh
+# shellcheck disable=SC2155
 
-# profile file. Runs on login. Environmental variables are set here.
+# Profile file, runs on login. Environmental variables are set here.
 
-# If you don't plan on reverting to bash, you can remove the link in ~/.profile
-# to clean up.
+# Add all directories in `~/.local/bin` to $PATH
+export PATH="$PATH:$(find ~/.local/bin -type d | paste -sd ':' -)"
 
-# Adds `~/.local/bin` to $PATH
-export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}"
-
-unsetopt PROMPT_SP
+unsetopt PROMPT_SP 2>/dev/null
 
 # Default programs:
 export EDITOR="nvim"
@@ -52,7 +50,7 @@ export SQLITE_HISTORY="$XDG_DATA_HOME/sqlite_history"
 export DICS="/usr/share/stardict/dic/"
 export SUDO_ASKPASS="$HOME/.local/bin/dmenupass"
 export FZF_DEFAULT_OPTS="--layout=reverse --height 40%"
-export LESS=-R
+export LESS="R"
 export LESS_TERMCAP_mb="$(printf '%b' '')"
 export LESS_TERMCAP_md="$(printf '%b' '')"
 export LESS_TERMCAP_me="$(printf '%b' '')"
@@ -61,15 +59,15 @@ export LESS_TERMCAP_se="$(printf '%b' '')"
 export LESS_TERMCAP_us="$(printf '%b' '')"
 export LESS_TERMCAP_ue="$(printf '%b' '')"
 export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null"
-export QT_QPA_PLATFORMTHEME="gtk2" # Have QT use gtk2 theme.
-export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads.
+export QT_QPA_PLATFORMTHEME="gtk2"        # Have QT use gtk2 theme.
+export MOZ_USE_XINPUT2=1                  # Mozilla smooth scrolling/touchpads.
 export AWT_TOOLKIT="MToolkit wmname LG3D" # May have to install wmname
-export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm
+export _JAVA_AWT_WM_NONREPARENTING=1      # Fix for Java applications in dwm
 
-[ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && setsid shortcuts >/dev/null 2>&1
+[ ! -f "$XDG_CONFIG_HOME/shell/shortcutrc" ] && setsid -f shortcuts >/dev/null 2>&1
 
 # Start graphical server on user's current tty if not already running.
 [ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
 
 # Switch escape and caps if tty and no passwd required:
-sudo -n loadkeys ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/null
+sudo -n loadkeys "$XDG_DATA_HOME/larbs/ttymaps.kmap" 2>/dev/null

.local/bin/channelrefresh

@@ -0,0 +1,50 @@
+#!/bin/dash
+
+sleep 16
+
+DATA_DIR="$HOME/.cache/youtube_channels"
+CHANNEL_LIST="$HOME/.local/share/channels.txt"
+mkdir -p "$DATA_DIR"
+
+compare_data() {
+  local channel_name="$1"
+  local data_file="${DATA_DIR}/${channel_name}.tsv"
+  local old_data_file="${DATA_DIR}/${channel_name}_old.tsv"
+
+    [ -e "$old_data_file" ] && {
+    old_urls=$(cut -f2 "$old_data_file")
+    new_urls=$(cut -f2 "$data_file")
+
+    echo "$old_urls" | sort > temp1
+    echo "$new_urls" | sort > temp2
+    new_videos=$(comm -13 temp1 temp2 | wc -l)
+    rm temp1 temp2
+
+    [ "$new_videos" -gt 0 ] && notify-send -u critical "$channel_name | $new_videos videos"
+  }
+}
+
+update_data() {
+  local channel_name="$1"
+  local channel_url="$2"
+  local data_file="${DATA_DIR}/${channel_name}.tsv"
+  local old_data_file="${DATA_DIR}/${channel_name}_old.tsv"
+
+  mv "$data_file" "$old_data_file" 2>/dev/null
+
+  yt-dlp -j --flat-playlist --skip-download --extractor-args youtubetab:approximate_date "$channel_url" | jq -r '[.title, .url, .view_count, .duration, .upload_date] | @tsv' > "$data_file"
+}
+
+update_all_channels() {
+  while IFS="=" read -r channel_name channel_url; do
+    update_data "$channel_name" "$channel_url" &
+  done < "$CHANNEL_LIST"
+
+  wait
+
+  while IFS="=" read -r channel_name channel_url; do
+    compare_data "$channel_name"
+  done < "$CHANNEL_LIST"
+}
+
+update_all_channels

.local/bin/yt-browser

@@ -0,0 +1,257 @@
+#!/bin/dash
+
+DATA_DIR="$HOME/.cache/youtube_channels"
+DOWNLOAD_DIR="$HOME/ytvideos"
+CATEGORY_LIST="$HOME/.local/share/categories.txt"
+CHANNEL_LIST="$HOME/.local/share/channels.txt"
+CUSTOM_LIST_DIR="$DATA_DIR/custom_lists"
+
+mkdir -p "$DATA_DIR" "$DOWNLOAD_DIR" "$CUSTOM_LIST_DIR"
+
+DMENU() {
+    dmenu -i -l $1 -p "$2"
+}
+
+sort_videos() {
+  data_file="$1"
+  sort_option="$2"
+
+  case $sort_option in
+    "@@sv") sort -nr -t"	" -k3 "$data_file" ;;
+    "@@sd") sort -nr -t"	" -k4 "$data_file" ;;
+         *) sort -nr -t"	" -k5 "$data_file" ;;
+  esac | cut -f1
+}
+
+get_videos() {
+  channel_name="$1"
+  sort_option="$2"
+  data_file="$DATA_DIR/$channel_name.tsv"
+  sort_videos "$data_file" "$sort_option"
+}
+
+video_url() {
+  channel_name="$1"
+  video_title="$2"
+  data_file="$DATA_DIR/$channel_name.tsv"
+  sed -n "s/$video_title\t\([^\t]*\)\t.*$/\1/p" "$data_file"
+}
+
+rofi_action() {
+  echo "WATCH\nDOWNLOAD\nSEND TO A LIST" | DMENU 3 "Choose an action for the video"
+}
+
+rofi_custom_list_action() {
+  echo "$(find "$CUSTOM_LIST_DIR" -maxdepth 1 -type f -exec basename {} \;)
+#### CREATE A LIST ####
+#### DELETE A LIST ####" | DMENU 10 "Choose an action or list"
+}
+
+list_video_action() {
+  echo "WATCH\nDOWNLOAD\nDELETE" | DMENU 3 "Choose an action for the video"
+}
+
+add_to_list() {
+  video_title="$1"
+  channel_name="$2"
+  list_name="$3"
+  echo "$channel_name: $video_title" >> "$CUSTOM_LIST_DIR/$list_name"
+}
+
+custom_list_menu() {
+  while true; do
+    list="$(rofi_custom_list_action)"
+    [ -z "$list" ] && return
+    case "$list" in
+      *CREATE*)
+        new_list=$(DMENU 0 "Enter the name of the new list")
+        [ -n "$new_list" ] && touch "$CUSTOM_LIST_DIR/$new_list"
+        ;;
+      *DELETE*)
+        delete_list=$(find "$CUSTOM_LIST_DIR" -maxdepth 1 -type f -exec basename {} \; |
+		DMENU 10 "Choose a list to delete")
+        [ -n "$delete_list" ] && rm "$CUSTOM_LIST_DIR/$delete_list"
+        ;;
+      *)
+        custom_list_video_menu "$list"
+        ;;
+    esac
+  done
+}
+
+custom_list_video_menu() {
+  list_name="$1"
+  while true; do
+    video_info=$(cat "$CUSTOM_LIST_DIR/$list_name" | DMENU 20 "Choose a video")
+    [ -z "$video_info" ] && return
+    channel_name="${video_info%%: *}"
+    video_title="${video_info##*: }"
+    custom_list_video_action_menu "$video_title" "$channel_name" "$list_name"
+  done
+}
+
+custom_list_video_action_menu() {
+  video_title="$1"
+  channel_name="$2"
+  list_name="$3"
+
+  action=$(list_video_action)
+
+  case $action in
+    WATCH)
+      video_process WATCH "$video_title" "$channel_name"
+      ;;
+    DOWNLOAD)
+      video_process DOWNLOAD "$video_title" "$channel_name" && notify-send "Downloading has finished."
+      ;;
+    DELETE)
+      escaped_video_title="$(echo "$video_title" | sed 's/[][\^$.\/|*+?(){}#]/\\&/g')"
+      sed "/$escaped_video_title/d" "$CUSTOM_LIST_DIR/$list_name" > "$CUSTOM_LIST_DIR/${list_name}.tmp" &&
+	  mv "$CUSTOM_LIST_DIR/${list_name}.tmp" "$CUSTOM_LIST_DIR/$list_name"
+      ;;
+    *)
+      return
+      ;;
+  esac
+}
+
+video_process() {
+    action="$1"
+    video_title="$2"
+    channel_name="$3"
+    video_url=$(video_url "$channel_name" "$video_title")
+
+    case "$action" in
+        WATCH)
+            mpv "$video_url"
+            ;;
+        DOWNLOAD)
+            local channel_download_dir="$DOWNLOAD_DIR/$channel_name"
+            mkdir -p "$channel_download_dir"
+            yt-dlp -o "$channel_download_dir/%(title)s.%(ext)s" "$video_url"
+            notify-send "Downloading has finished."
+            ;;
+    esac
+}
+
+get_all_videos() {
+  sort_option="$1"
+  all_videos_file="$DATA_DIR/all_videos.tsv"
+
+  rm -f "$all_videos_file"
+  while IFS= read -r line
+  do
+    channel_name="${line%%=*}"
+    cat "$DATA_DIR/$channel_name.tsv" >> "$all_videos_file"
+  done < "$CHANNEL_LIST"
+
+  sort_videos "$all_videos_file" "$sort_option"
+}
+
+browse_all_channels() {
+  while true; do
+    video_title=$(get_all_videos | DMENU 20 "Choose a video or enter @@sv or @@sd")
+
+    [ -z "$video_title" ] && break || {
+      [ "$video_title" = "@@sv" -o "$video_title" = "@@sd" ] &&
+      sort_option="$video_title" && video_title=$(get_all_videos "$sort_option" | DMENU 20 "Choose a video")
+    }
+
+    [ -n "$video_title" -a "$video_title" != "@@sv" -a "$video_title" != "@@sd" ] && {
+      while read -r line; do
+        channel_name="${line%%=*}"
+        grep -qF "$video_title" "${DATA_DIR}/${channel_name}.tsv" && break
+      done < "$CHANNEL_LIST"
+
+      video_action_menu "$video_title" "$channel_name"
+    }
+  done
+}
+
+category_menu() {
+  while true; do
+    category=$(echo "$(cut -d= -f1 "$CATEGORY_LIST")" | DMENU 12 "Choose a category")
+    [ -z "$category" ] && return
+
+    channel_menu "$category"
+  done
+}
+
+channel_menu() {
+  category="$1"
+  IFS="|"
+
+  channels=$(sed -n "s/^${category}=\(.*\)$/\1/p" "$CATEGORY_LIST")
+  set -- $channels
+
+  while true; do
+    channel_name=$(printf '%s\n' "$@" | DMENU 20 "Choose a channel")
+    [ -z "$channel_name" ] && return
+
+    video_menu "$channel_name"
+  done
+}
+
+video_menu() {
+  channel_name="$1"
+
+  while true; do
+    video_title=$(get_videos "$channel_name" | DMENU 20 "Choose a video")
+    [ -z "$video_title" ] && return
+    [ "$video_title" = "@@sv" -o "$video_title" = "@@sd" ] && {
+      sort_option="$video_title"
+      video_title=$(get_videos "$channel_name" "$sort_option" | DMENU 20 "Choose a video")
+    }
+
+    video_action_menu "$video_title" "$channel_name"
+  done
+}
+
+video_action_menu() {
+  video_title="$1"
+  channel_name="$2"
+
+  while [ -n "$video_title" ] && [ "$video_title" != "@@sv" ] && [ "$video_title" != "@@sd" ]; do
+    action=$(rofi_action)
+
+    case $action in
+      WATCH)
+	video_process WATCH "$video_title" "$channel_name"
+        ;;
+      DOWNLOAD)
+        video_process DOWNLOAD "$video_title" "$channel_name" && notify-send "Downloading has finished."
+        ;;
+      "SEND TO A LIST")
+        list_name=$(find "$CUSTOM_LIST_DIR" -maxdepth 1 -type f -exec basename {} \; | DMENU 10 "Choose a list")
+        [ -n "$list_name" ] && add_to_list "$video_title" "$channel_name" "$list_name" &&
+		notify-send ""$video_title" is added to the list: "$list_name""
+        ;;
+      *)
+        return
+        ;;
+    esac
+  done
+}
+
+main_menu() {
+  options=" #### ALL CHANNELS ####
+ #### CATEGORIES ####
+ #### CUSTOM LISTS ####
+$(cut -d= -f1 "$CHANNEL_LIST")"
+
+  echo "$options" | DMENU 20 "Choose an Option or a Category"
+}
+
+while true; do
+
+  main_choice=$(main_menu)
+
+  [ -z "$main_choice" ] && exit
+
+  case "$main_choice" in
+    *ALL\ CHANNELS*) browse_all_channels       ;;
+    *CATEGORIES*   ) category_menu             ;;
+    *CUSTOM\ LISTS*) custom_list_menu          ;;
+                  *) video_menu "$main_choice" ;;
+  esac
+done