From b88ee664bcba3bb6f030ab0741b7227b668da4ef Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Fri, 24 Jan 2020 14:28:12 -0500
Subject: [PATCH] Update aliases and vim template

---
 aliases                     | 21 +++++++++++++--------
 vim/templates/skeleton.plan |  2 +-
 vimrc                       |  3 ---
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/aliases b/aliases
index acfce88..8fff22c 100644
--- a/aliases
+++ b/aliases
@@ -91,6 +91,7 @@ alias cbr='cargo build --release'
 alias clrtmp='trash ~/tmp/*.bak && trash ~/tmp/*.swp'
 alias clrtemp='clrtmp'
 alias clipboard='xclip -selection c'
+# Cloc alias may be overridden by a private alias
 alias cloc='cloc --no3 --by-file-by-lang --skip-win-hidden'
 alias cls=clear
 alias code='cd ~/code'
@@ -149,23 +150,29 @@ alias weather='curl wttr.in/toronto'
 function dl_youtube_vid {
     local format="$1"
     local url="$2"
+    shift 2
+    local opts="$@"
+    opts+=" --all-subs --embed-subs"
     local name_format="%(upload_date)s%(title)s-youtube-%(id)s.%(ext)s"
     if [[ $format == "" ]]; then
         echo "Downloading default format"
-        youtube-dl.exe -o "$name_format" $url
+        youtube-dl.exe -o $name_format $opts $url
     else
-        youtube-dl.exe -f "$format" -o "$name_format" $url
+        youtube-dl.exe -f $format -o $name_format $opts $url
     fi
 }
 function dl_youtube_playlist {
     local format="$1"
     local url="$2"
+    shift 2
+    local opts="$@"
+    opts+=" --all-subs --embed-subs"
     local name_format="%(playlist_index)s - %(title)s-youtube-%(id)s.%(ext)s"
     if [[ $format == "" ]]; then
         echo "Downloading default format"
-        youtube-dl.exe -o "$name_format" $url
+        youtube-dl.exe -o $name_format $opts $url
     else
-        youtube-dl.exe -f "$format" -o "$name_format" $url
+        youtube-dl.exe -f $format -o $name_format $opts $url
     fi
 }
 alias yt-download='dl_youtube_vid ""'
@@ -241,7 +248,7 @@ function dl_twitch_chat {
 alias tw-download-chat='dl_twitch_chat'
 alias tw-dl='youtube-dl.exe -f "1080" -o "%(upload_date)s-%(title)s-twitch-%(id)s.%(ext)s"'
 alias tw-dl2='youtube-dl.exe -o "%(upload_date)s-%(title)s-twitch-%(id)s.%(ext)s"'
-alias tw-download='dl_twitch_vid "1080"'
+alias tw-download='dl_twitch_vid "1080p"'
 alias tw-download-60='dl_twitch_vid "1080p60"'
 alias tw-download-720='dl_twitch_vid "720p"'
 alias tw-download-720-60='dl_twitch_vid "720p60"'
@@ -304,6 +311,7 @@ alias gds='git diff --stat=160,120'
 alias gdw='git diff --color-words'
 alias gf='git fetch'
 alias gfa='git fetch --all'
+alias gfd='git fetch --prune'
 alias gfix="git commit --amend -C HEAD"
 alias gfixx="git commit --amend -C HEAD ; gp -f"
 alias gfixs="git commit -S -a --amend -C HEAD" # signed
@@ -327,10 +335,7 @@ alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'
 alias gpa='git push --all && echo "pushing tags..." && git push --tags'
 alias gpdf='gpf && gphf'
-alias gpp='echo "Pushing Upstream master to production" && git push production master'
-alias gppp='echo "Pushing to remotes first..." && git push origin master:master && git push upstream master:master && echo "Pushing upstream master to Production..." && git push production upstream/master:master'
 alias gps='git push staging'
-alias gpps='echo "Pushing Upstream master to staging" && git push staging upstream/master:master -f'
 alias gppf='gpf && git push production HEAD:production -f'
 alias gpu='git push --set-upstream origin HEAD'
 alias gpff='git pull --ff-only'
diff --git a/vim/templates/skeleton.plan b/vim/templates/skeleton.plan
index a8de408..a59c1ec 100644
--- a/vim/templates/skeleton.plan
+++ b/vim/templates/skeleton.plan
@@ -1,5 +1,5 @@
 ---------------------------------------------------------
-Michael Campagnaro's plan for <month> <day>, 2019
+Michael Campagnaro's plan for <month> <day>, 2020
 ---------------------------------------------------------
 
 ##############
diff --git a/vimrc b/vimrc
index 3ecdd1d..0acca74 100644
--- a/vimrc
+++ b/vimrc
@@ -461,9 +461,6 @@ nnoremap <leader><leader> <c-^>
 " Replace currently selected text with default register without yanking it.
 vnoremap p "_dP
 
-" Use Marked.app to preview Markdown files.
-nnoremap <leader>pp :silent !open -a Marked.app '%:p'<cr>
-
 " Switch between C++ source and header files.
 map <leader>v :e %:p:s,.h$,.X123X,:s,.cpp$,.h,:s,.X123X$,.cpp,<CR>
 "map <leader>vv :e %:p:s,.h$,.X123X,:s,.c$,.h,:s,.X123X$,.c,<CR>