Update mouse and OS

[khome.git] / home / lib / login_functions.sh

diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index 4517697..45460f4 100644 (file)
--- a/home/lib/login_functions.sh
+++ b/home/lib/login_functions.sh
@@ -206,12 +206,22 @@ void_pkgs() {
 
 # Colorful man
 man() {
-    LESS_TERMCAP_md=$'\e[01;31m' \
+    # mb: begin blink
+    # md: begin bold
+    # me: end   bold, blink and underline
+    #
+    # so: begin standout (reverse video)
+    # se: end   standout
+    #
+    # us: begin underline
+    # ue: end   underline
+
+    LESS_TERMCAP_md=$'\e[01;30m' \
     LESS_TERMCAP_me=$'\e[0m' \
-    LESS_TERMCAP_se=$'\e[0m' \
     LESS_TERMCAP_so=$'\e[01;44;33m' \
+    LESS_TERMCAP_se=$'\e[0m' \
+    LESS_TERMCAP_us=$'\e[01;33m' \
     LESS_TERMCAP_ue=$'\e[0m' \
-    LESS_TERMCAP_us=$'\e[01;32m' \
     command man "$@"
 }
 
@@ -227,21 +237,29 @@ howto() {
     cat "$(find  ~/Archives/Documents/HOWTOs -mindepth 1 -maxdepth 1 | sort | fzf)"
 }
 
-yt() {
-    local _yt_uri
-    local _yt_id
-    local _yt_title
-    local _yt_dir
-
-    _yt_uri="$1"
-    _yt_id=$(youtube-dl --get-id "$_yt_uri")
-    _yt_title=$(youtube-dl --get-title "$_yt_uri")
-    _yt_dir="${DIR_YOUTUBE}/individual-videos/${_yt_title}--${_yt_id}"
-
-    mkdir -p "$_yt_dir"
-    cd "$_yt_dir" || kill -INT $$
-    echo "$_yt_uri" > 'uri'
-    youtube-dl -c --write-description --write-info-json "$_yt_uri"
+_yt() {
+    local -r base_dir="$1"
+    local -r opts="$2"
+    local -r uri="$3"
+
+    local -r id=$(youtube-dlc --get-id "$uri")
+    local -r title=$(youtube-dlc --get-title "$uri" | sed 's/[^A-Za-z0-9._-]/_/g')
+    local -r dir="${base_dir}/${title}--${id}"
+
+    mkdir -p "$dir"
+    cd "$dir" || kill -INT $$
+    echo "$uri" > 'uri'
+    youtube-dlc $opts -c --write-description --write-info-json "$uri"
+}
+
+yt_audio() {
+    local -r uri="$1"
+    _yt "${DIR_YOUTUBE_AUDIO}/individual" '-f 140' "$uri"
+}
+
+yt_video() {
+    local -r uri="$1"
+    _yt "${DIR_YOUTUBE_VIDEO}/individual" "$uri"
 }
 
 gh_fetch_repos() {
@@ -284,9 +302,11 @@ $(date '+%F %A')
 Morning report
 --------------
 
-### Previous
+### Prev
+
+### Curr
 
-### Current
+### Next
 
 ### Blockers
 
@@ -317,7 +337,7 @@ weather() {
         '') _weather_location="$WEATHER_LOCATION";;
          *) _weather_location="$1"
     esac
-    curl "http://wttr.in/$_weather_location"
+    curl "http://wttr.in/$_weather_location?format=v2"
 }
 
 bt_devs_paired() {