From 1d358cda1716acda64a3ab74b6f31d6773a0569b Mon Sep 17 00:00:00 2001
From: Jake Jarvis <jake@jarv.is>
Date: Sun, 15 Sep 2019 09:38:20 -0400
Subject: [PATCH] git=hub and youtube-dl aliases

---
 git/.gitconfig  | 11 +++++++----
 setup.sh        |  2 +-
 zsh/aliases.zsh | 11 +++++++++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 380b4eb..3cd7789 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -10,15 +10,18 @@
 	gpgsign = true
 [push]
 	default = current
-[pull]
-	rebase = true
 [core]
 	editor = nano
 	excludesfile = ~/.gitignore_global
 [filter "lfs"]
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
 	required = true
+	smudge = git-lfs smudge -- %f
 	clean = git-lfs clean -- %f
+	process = git-lfs filter-process
 [github]
 	user = jakejarvis
+[pull]
+	rebase = true
+[hub]
+	host = github.com
+	host = git.jarv.is
diff --git a/setup.sh b/setup.sh
index 50d5aaa..cb26362 100755
--- a/setup.sh
+++ b/setup.sh
@@ -33,7 +33,7 @@ chsh -s $(which zsh)
 # Set up symbolic links for ZSH and Git pointing to this cloned repo
 ln -s $HOME/.dotfiles/zsh/.zshrc $HOME/.zshrc
 ln -s $HOME/.dotfiles/git/.gitconfig $HOME/.gitconfig
-ln -s $HOME/.dotfiles/zsh/git/.gitignore_global $HOME/.gitignore_global
+ln -s $HOME/.dotfiles/git/.gitignore_global $HOME/.gitignore_global
 
 # Set macOS defaults
 # Needs to be last since this will restart everything when done
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 3314186..e06a5b4 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -51,6 +51,9 @@ alias ripmenu="sudo killall SystemUIServer NotificationCenter"
 alias finder="open -a Finder ./"
 alias vs="code ./"
 
+# required: https://github.com/github/hub
+# `brew install hub`
+alias git="hub"
 alias gc="git commit -m"  # + commit message
 alias gca="git add . && git commit -m"  # + commit message
 alias gs="git status -sb"
@@ -64,7 +67,12 @@ alias glo="git pull origin"  # + branch name
 alias gb="git checkout"  # + branch name
 alias gbn="git checkout -b"  # + branch name
 alias grm="git rebase -i origin/master"
+alias gsub="git submodule update --recursive --remote"
 alias gundo="git reset --soft HEAD~1"
+alias gf="hub fork --remote-name=origin"
+alias gpr="hub pull-request"
+alias gsync="hub sync"
+alias gopen="hub browse"
 
 alias dc="docker-compose"
 
@@ -76,4 +84,7 @@ alias watchos="open /Applications/Xcode.app/Contents/Developer/Applications/Simu
 
 alias pubkey="more ~/.ssh/id_rsa.pub | pbcopy | echo '=> Public key copied to clipboard.'"
 
+alias ytdl="youtube-dl -f bestvideo+bestaudio"
+alias ytmp3="youtube-dl -f bestaudio -x --audio-format mp3 --audio-quality 320K"
+
 alias weather="curl -4 https://wttr.in/Boston"