From a7fcc5f937e846c36243e3f9c2219b8c4e0107d9 Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Fri, 16 Oct 2015 01:11:24 -0400 Subject: [PATCH] Update aliases --- .gitignore | 1 + zsh/aliases | 38 +++++++++++++++++--------------------- zsh/functions | 26 ++++++++++++++++++++++++++ zshrc | 1 + 4 files changed, 45 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index ffe9657..b6633fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ vim/.netrwhist +vim/bundle/* diff --git a/zsh/aliases b/zsh/aliases index c923ce9..b83e349 100644 --- a/zsh/aliases +++ b/zsh/aliases @@ -10,7 +10,8 @@ elif [[ $platform == 'Darwin' ]]; then fi alias c='cd' -alias cd-='cd -' +alias c-='cd -' +alias cd-='echo "Use c- instead"' alias ..='cd ../' alias ...='cd ../..' alias cd..='cd ..' @@ -34,9 +35,7 @@ alias cls=clear alias code='cd ~/code' alias cpr='cp -r' alias cw='compass watch' -alias da='dartanalyzer' -alias dc='dart --checked' -alias dd='dartdoc' +alias dot='cd ~/.' alias dr='cd ~/Dropbox' alias duh='du -csh' alias functions='vim ~/.dotfiles/zsh/functions' @@ -49,6 +48,8 @@ alias ho='heroku open' alias hc='heroku config' alias hca='heroku config:add' alias hcu='heroku config:unset' +alias hcr='heroku config:unset' +alias hl='heroku logs -t -n 5000' alias irb='irb --readline -r irb/completion' alias lcc='lein clean' alias lca='lein cljsbuild auto dev' @@ -84,7 +85,6 @@ alias reload='source ~/.zshrc' alias s='cd ~/.ssh' alias sc='vim ~/.ssh/config' alias t='tree' -alias tail-logs='heroku logs -t' alias u='cd ..' alias v='vim' alias vi='vim' @@ -132,33 +132,31 @@ alias gfo='git fetch origin' alias gfm='git fetch origin master' alias gfup='git fetch upstream' alias gh="source ~/.githelpers && show_git_head" -alias gl='gll -25' +alias gla='git lg --all' +alias gl='git lg -30' +alias gll='git lg' alias gli='git show --pretty="format:" --name-only' -alias gll="source ~/.githelpers && pretty_git_log" -alias gla='gll --all' alias glog='git log' -alias glogf='git log --follow' alias gm='git merge' alias gmnoff='git merge --no-ff' alias gmff='git merge --ff-only' +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 && echo "pushing tags..." && git push --tags' alias gpd='git push && git push heroku master' alias gpdf='gpf && gphf' -alias gpp='echo "Pushing Upstream master to production" && git push production upstream/master:master' +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 gph='echo "pushing $(git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3) to Heroku master" && git push heroku HEAD:master' alias gphf='git push heroku master --force' -alias gpf='git push -f' -alias gpu='git push -u origin' -alias gpup='git push upstream master' +alias gpu='git push --set-upstream origin HEAD' alias gpff='git pull --ff-only' -alias gpl='git pull' +alias gpl='echo "you may want to use gpff instead" ; git pull' alias gplup='git pull upstream master' alias gpo='git push origin' alias gpom='git push origin master' @@ -169,13 +167,11 @@ alias grb='git rebase' alias grba='git rebase --abort' alias grbc='git rebase --continue' alias grbi='git rebase -i' -alias grbm='git fetch origin master && git rebase master' -alias grbmi='git fetch origin master && git rebase master -i' +alias grbm='git rebase master' +alias grbmi='git rebase master -i' alias grbo='git fetch origin master && git rebase origin/master' -alias grbmo="echo 'use grbo instead'" -alias grbu='git fetch upstream master && git rebase upstream/master' -alias grbup='echo "use grbu"' -alias grbupm='echo "use grbu"' +alias grboi='git fetch origin master && git rebase origin/master -i' +alias grbum='git fetch upstream master && git rebase upstream/master' alias gre='git remote' alias grea='git remote add' alias greao='git remote add origin' @@ -206,6 +202,7 @@ alias gx='git reset --hard' alias gxx='git reset --hard HEAD~1 && git pull --ff-only' # git stats alias gstats="echo 'Total commits: $(git rev-list HEAD --count)'; echo '\nAuthor breakdown:'; git shortlog | grep -E '^[^ ]'" +alias gwip="git add . && git commit -m \"WIP\"" # Notes alias notes='cd ~/.personal-files/documents' @@ -218,7 +215,6 @@ alias dot='cd ~/.dotfiles' alias work='cd ~/.personal-files/work' alias brain='cd ~/.personal-files/brain' - # Work alias dh='git push heroku-staging master -f' diff --git a/zsh/functions b/zsh/functions index cc25482..79ac6ef 100644 --- a/zsh/functions +++ b/zsh/functions @@ -6,6 +6,32 @@ function activate_virtualenv() { fi } +function play { +# Skip DASH manifest for speed purposes. This might actually disable +# being able to specify things like 'bestaudio' as the requested format, +# but try anyway. +# Get the best audio that isn't WebM, because afplay doesn't support it. +# Use "$*" so that quoting the requested song isn't necessary. +youtube-dl --default-search=ytsearch: \ + --youtube-skip-dash-manifest \ + --output="${TMPDIR:-/tmp/}%(title)s-%(id)s.%(ext)s" \ + --restrict-filenames \ + --format="bestaudio[ext!=webm]" \ + --exec=afplay "$*" +} + +function mp3 { +# Get the best audio, convert it to MP3, and save it to the current +# directory. +youtube-dl --default-search=ytsearch: \ + --restrict-filenames \ + --format=bestaudio \ + --extract-audio \ + --format="bestaudio[ext!=webm]" \ + --audio-quality=1 "$*" \ + --exec=afplay "$*" +} + function git-new-remote-tracking { git checkout -b $1 && git push -u origin $1 } diff --git a/zshrc b/zshrc index 45c38c0..ba1fa5e 100644 --- a/zshrc +++ b/zshrc @@ -87,3 +87,4 @@ export ANSIBLE_LIBRARY=${ANSIBLE_DIR}/library export MANPATH=${ANSIBLE_DIR}/docs/man:${MANPATH} export ANSIBLE_HOSTS=~/.ansible_hosts export LEIN_FAST_TRAMPOLINE=y +export ANDROID_HOME=/usr/local/opt/android-sdk