QinMing · June 21, 2024 02:06 · Sep 7, 2020 · Jul 19, 2020 · Jul 4, 2020 · May 27, 2020
diff --git a/.zshrc b/.zshrc
@@ -1,59 +1,6 @@
 # Copyright (c) 2016-2018 Ming Qin (覃明) <https://github.com/QinMing>
 # Open source under MIT LICENSE.
 
-ZSH_THEME="agnoster"
-plugins=(zsh-autosuggestions git pip django docker docker-compose)
-
-# ......
-
-unsetopt AUTO_CD
-# AUTO_CD: if the command isn't found in the current directory, the shell will automatically cd into the command name, if the directory is found.
-
-alias gw=./gradlew
-alias gradlew=./gradlew
-# compdef gw=gradle
-# https://github.com/gradle/gradle-completion/issues/14#issuecomment-478816232
-
-alias l='ls -alhtr'
-alias upthis='ss u'
-alias downthis='ss d'
-alias dcp='docker-compose'
-alias docker-clean='docker system prune --volumes -f'
-alias tff='find ./*/infrastructure -maxdepth 0 | xargs -L 1 tf fmt'
-
-alias g='git'
-alias gs='git status'
-alias gl='git l'
-alias gd='git diff'
-alias gb='git branch'
-alias gck='git checkout'
-alias gp='git pull'
-
-# https://stackoverflow.com/questions/1904860/how-to-remove-unreferenced-blobs-from-my-git-repo
-alias git-clean='git -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now gc "$@"'
-
-unalias gbd || true
-gbd() {
-    # Delete local branches that squash-merged to `master`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
-    git remote prune origin &&
-    git checkout -q master &&
-    git fetch origin &&
-    git fetch --tags -f &&
-    git merge --ff-only origin/master &&
-    git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do
-        mergeBase=$(git merge-base master $branch) &&
-        [[ $(
-                git cherry master $(
-                    git commit-tree $(
-                        git rev-parse $branch^{tree}
-                    ) -p $mergeBase -m _
-                )
-            ) == "-"*
-        ]] && git branch -D $branch;
-    done;
-    git prune
-}
-
 lazy_load() {
     # Act as a stub to another shell function/command. When first run, it will load the actual function/command then execute it.
     # E.g. This made my zsh load 0.8 seconds faster by loading `nvm` when "nvm", "npm" or "node" is used for the first time
@@ -97,17 +44,3 @@ unset -f group_lazy_load
 # simple python virtual environment wrapper
 alias ve="lazy_load 've' $HOME/git/simple-virtualenv-wrapper/ve.sh ve"
 
-# If using GnuPG to sign git commits, etc, need the following.
-export GPG_TTY=$(tty)
-
-export AUTOSUGGESTION_HIGHLIGHT_COLOR='fg=cyan'  # water mark for history commands
-
-# Generated by hashicorp vault
-# autoload -U +X bashcompinit && bashcompinit
-# complete -o nospace -C /usr/local/bin/vault vault
-
-# Other applications
-# eval $(thefuck --alias)
-# eval "$(pyenv init -)"
-# export PIPENV_PYTHON=$HOME/.pyenv/shims/python
-# export VIRTUALENV_PYTHON=$HOME/.pyenv/shims/python
diff --git a/.zshrc b/.zshrc
@@ -7,6 +7,7 @@ plugins=(zsh-autosuggestions git pip django docker docker-compose)
 # ......
 
 unsetopt AUTO_CD
+# AUTO_CD: if the command isn't found in the current directory, the shell will automatically cd into the command name, if the directory is found.
 
 alias gw=./gradlew
 alias gradlew=./gradlew

diff --git a/.zshrc b/.zshrc
@@ -86,7 +86,7 @@ group_lazy_load() {
 }
 
 export NVM_DIR=~/.nvm
-group_lazy_load $HOME/.nvm/nvm.sh nvm node npm truffle gulp
+group_lazy_load $HOME/.nvm/nvm.sh nvm node npm truffle gulp yarn
 
 export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
 group_lazy_load $HOME/.rvm/scripts/rvm rvm irb rake rails

diff --git a/.zshrc b/.zshrc
@@ -8,7 +8,9 @@ plugins=(zsh-autosuggestions git pip django docker docker-compose)
 
 unsetopt AUTO_CD
 
-compdef gw=gradle
+alias gw=./gradlew
+alias gradlew=./gradlew
+# compdef gw=gradle
 # https://github.com/gradle/gradle-completion/issues/14#issuecomment-478816232
 
 alias l='ls -alhtr'

diff --git a/.zshrc b/.zshrc
@@ -16,6 +16,7 @@ alias upthis='ss u'
 alias downthis='ss d'
 alias dcp='docker-compose'
 alias docker-clean='docker system prune --volumes -f'
+alias tff='find ./*/infrastructure -maxdepth 0 | xargs -L 1 tf fmt'
 
 alias g='git'
 alias gs='git status'

diff --git a/.zshrc b/.zshrc
@@ -34,6 +34,7 @@ gbd() {
     git remote prune origin &&
     git checkout -q master &&
     git fetch origin &&
+    git fetch --tags -f &&
     git merge --ff-only origin/master &&
     git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do
         mergeBase=$(git merge-base master $branch) &&

diff --git a/.zshrc b/.zshrc
@@ -33,7 +33,7 @@ gbd() {
     # Delete local branches that squash-merged to `master`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
     git remote prune origin &&
     git checkout -q master &&
-    git fetch --all &&
+    git fetch origin &&
     git merge --ff-only origin/master &&
     git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do
         mergeBase=$(git merge-base master $branch) &&

diff --git a/.zshrc b/.zshrc
@@ -33,7 +33,8 @@ gbd() {
     # Delete local branches that squash-merged to `master`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
     git remote prune origin &&
     git checkout -q master &&
-    git pull --ff-only origin master &&
+    git fetch --all &&
+    git merge --ff-only origin/master &&
     git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do
         mergeBase=$(git merge-base master $branch) &&
         [[ $(

diff --git a/.zshrc b/.zshrc
@@ -88,11 +88,20 @@ group_lazy_load $HOME/.rvm/scripts/rvm rvm irb rake rails
 
 unset -f group_lazy_load
 
+# simple python virtual environment wrapper
 alias ve="lazy_load 've' $HOME/git/simple-virtualenv-wrapper/ve.sh ve"
 
 # If using GnuPG to sign git commits, etc, need the following.
 export GPG_TTY=$(tty)
 
+export AUTOSUGGESTION_HIGHLIGHT_COLOR='fg=cyan'  # water mark for history commands
+
+# Generated by hashicorp vault
+# autoload -U +X bashcompinit && bashcompinit
+# complete -o nospace -C /usr/local/bin/vault vault
+
 # Other applications
 # eval $(thefuck --alias)
 # eval "$(pyenv init -)"
+# export PIPENV_PYTHON=$HOME/.pyenv/shims/python
+# export VIRTUALENV_PYTHON=$HOME/.pyenv/shims/python
diff --git a/.zshrc b/.zshrc
@@ -81,7 +81,7 @@ group_lazy_load() {
 }
 
 export NVM_DIR=~/.nvm
-group_lazy_load $HOME/.nvm/nvm.sh nvm node npm truffle
+group_lazy_load $HOME/.nvm/nvm.sh nvm node npm truffle gulp
 
 export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
 group_lazy_load $HOME/.rvm/scripts/rvm rvm irb rake rails

diff --git a/.zshrc b/.zshrc
@@ -33,7 +33,7 @@ gbd() {
     # Delete local branches that squash-merged to `master`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
     git remote prune origin &&
     git checkout -q master &&
-    git merge --ff-only origin/master &&
+    git pull --ff-only origin master &&
     git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do
         mergeBase=$(git merge-base master $branch) &&
         [[ $(

diff --git a/.zshrc b/.zshrc
@@ -8,6 +8,9 @@ plugins=(zsh-autosuggestions git pip django docker docker-compose)
 
 unsetopt AUTO_CD
 
+compdef gw=gradle
+# https://github.com/gradle/gradle-completion/issues/14#issuecomment-478816232
+
 alias l='ls -alhtr'
 alias upthis='ss u'
 alias downthis='ss d'

diff --git a/.zshrc b/.zshrc
@@ -11,22 +11,40 @@ unsetopt AUTO_CD
 alias l='ls -alhtr'
 alias upthis='ss u'
 alias downthis='ss d'
+alias dcp='docker-compose'
+alias docker-clean='docker system prune --volumes -f'
+
 alias g='git'
 alias gs='git status'
 alias gl='git l'
 alias gd='git diff'
 alias gb='git branch'
-alias gbd='git checkout -q master && git remote prune origin && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base master $branch) && [[ $(git cherry master $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && git branch -D $branch; done; git prune'
-# Delete local branches that squash-merged to `master`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
-
 alias gck='git checkout'
 alias gp='git pull'
-alias dcp='docker-compose'
-alias docker-clean='docker system prune --volumes -f'
 
 # https://stackoverflow.com/questions/1904860/how-to-remove-unreferenced-blobs-from-my-git-repo
 alias git-clean='git -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now gc "$@"'
 
+unalias gbd || true
+gbd() {
+    # Delete local branches that squash-merged to `master`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
+    git remote prune origin &&
+    git checkout -q master &&
+    git merge --ff-only origin/master &&
+    git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do
+        mergeBase=$(git merge-base master $branch) &&
+        [[ $(
+                git cherry master $(
+                    git commit-tree $(
+                        git rev-parse $branch^{tree}
+                    ) -p $mergeBase -m _
+                )
+            ) == "-"*
+        ]] && git branch -D $branch;
+    done;
+    git prune
+}
+
 lazy_load() {
     # Act as a stub to another shell function/command. When first run, it will load the actual function/command then execute it.
     # E.g. This made my zsh load 0.8 seconds faster by loading `nvm` when "nvm", "npm" or "node" is used for the first time

diff --git a/.zshrc b/.zshrc
@@ -71,3 +71,7 @@ alias ve="lazy_load 've' $HOME/git/simple-virtualenv-wrapper/ve.sh ve"
 
 # If using GnuPG to sign git commits, etc, need the following.
 export GPG_TTY=$(tty)
+
+# Other applications
+# eval $(thefuck --alias)
+# eval "$(pyenv init -)"
diff --git a/.zshrc b/.zshrc
@@ -68,3 +68,6 @@ group_lazy_load $HOME/.rvm/scripts/rvm rvm irb rake rails
 unset -f group_lazy_load
 
 alias ve="lazy_load 've' $HOME/git/simple-virtualenv-wrapper/ve.sh ve"
+
+# If using GnuPG to sign git commits, etc, need the following.
+export GPG_TTY=$(tty)
diff --git a/.zshrc b/.zshrc
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Ming Qin (覃明) <https://github.com/QinMing>
+# Copyright (c) 2016-2018 Ming Qin (覃明) <https://github.com/QinMing>
 # Open source under MIT LICENSE.
 
 ZSH_THEME="agnoster"

diff --git a/.zshrc b/.zshrc
@@ -25,7 +25,7 @@ alias dcp='docker-compose'
 alias docker-clean='docker system prune --volumes -f'
 
 # https://stackoverflow.com/questions/1904860/how-to-remove-unreferenced-blobs-from-my-git-repo
-alias git-gc-all='git -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now gc "$@"'
+alias git-clean='git -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now gc "$@"'
 
 lazy_load() {
     # Act as a stub to another shell function/command. When first run, it will load the actual function/command then execute it.
@@ -68,6 +68,3 @@ group_lazy_load $HOME/.rvm/scripts/rvm rvm irb rake rails
 unset -f group_lazy_load
 
 alias ve="lazy_load 've' $HOME/git/simple-virtualenv-wrapper/ve.sh ve"
-
-#alias makedocker=". '/Applications/Docker/Docker Quickstart Terminal.app/Contents/Resources/Scripts/start.sh'"
-#eval "$(docker-machine env default)"
diff --git a/.zshrc b/.zshrc
@@ -22,7 +22,7 @@ alias gbd='git checkout -q master && git remote prune origin && git for-each-ref
 alias gck='git checkout'
 alias gp='git pull'
 alias dcp='docker-compose'
-alias docker-clean='docker volume ls -qf dangling=true | xargs docker volume rm'
+alias docker-clean='docker system prune --volumes -f'
 
 # https://stackoverflow.com/questions/1904860/how-to-remove-unreferenced-blobs-from-my-git-repo
 alias git-gc-all='git -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now gc "$@"'

diff --git a/.zshrc b/.zshrc
@@ -16,8 +16,8 @@ alias gs='git status'
 alias gl='git l'
 alias gd='git diff'
 alias gb='git branch'
-alias gbd='git checkout -q develop && git remote prune origin && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base develop $branch) && [[ $(git cherry develop $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && git branch -D $branch; done; git prune'
-# Delete local branches that squash-merged to `develop`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
+alias gbd='git checkout -q master && git remote prune origin && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base master $branch) && [[ $(git cherry master $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && git branch -D $branch; done; git prune'
+# Delete local branches that squash-merged to `master`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
 
 alias gck='git checkout'
 alias gp='git pull'

diff --git a/.zshrc b/.zshrc
@@ -16,7 +16,7 @@ alias gs='git status'
 alias gl='git l'
 alias gd='git diff'
 alias gb='git branch'
-alias gbd='git checkout -q develop && git remote prune origin && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base develop $branch) && [[ $(git cherry develop $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && git branch -D $branch; done'
+alias gbd='git checkout -q develop && git remote prune origin && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base develop $branch) && [[ $(git cherry develop $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && git branch -D $branch; done; git prune'
 # Delete local branches that squash-merged to `develop`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
 
 alias gck='git checkout'

diff --git a/.zshrc b/.zshrc
@@ -16,7 +16,7 @@ alias gs='git status'
 alias gl='git l'
 alias gd='git diff'
 alias gb='git branch'
-alias gbd='git checkout -q develop && git remote prune origin && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base master $branch) && [[ $(git cherry master $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && git branch -D $branch; done'
+alias gbd='git checkout -q develop && git remote prune origin && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base develop $branch) && [[ $(git cherry develop $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && git branch -D $branch; done'
 # Delete local branches that squash-merged to `develop`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
 
 alias gck='git checkout'

diff --git a/.zshrc b/.zshrc
@@ -16,6 +16,9 @@ alias gs='git status'
 alias gl='git l'
 alias gd='git diff'
 alias gb='git branch'
+alias gbd='git checkout -q develop && git remote prune origin && git for-each-ref refs/heads/ "--format=%(refname:short)" | while read branch; do mergeBase=$(git merge-base master $branch) && [[ $(git cherry master $(git commit-tree $(git rev-parse $branch^{tree}) -p $mergeBase -m _)) == "-"* ]] && git branch -D $branch; done'
+# Delete local branches that squash-merged to `develop`. Forked from https://github.com/not-an-aardvark/git-delete-squashed
+
 alias gck='git checkout'
 alias gp='git pull'
 alias dcp='docker-compose'

diff --git a/.zshrc b/.zshrc
@@ -57,7 +57,7 @@ group_lazy_load() {
 }
 
 export NVM_DIR=~/.nvm
-group_lazy_load $HOME/.nvm/nvm.sh nvm node npm
+group_lazy_load $HOME/.nvm/nvm.sh nvm node npm truffle
 
 export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
 group_lazy_load $HOME/.rvm/scripts/rvm rvm irb rake rails

diff --git a/.zshrc b/.zshrc
@@ -2,7 +2,7 @@
 # Open source under MIT LICENSE.
 
 ZSH_THEME="agnoster"
-plugins=(git pip docker docker-compose django)
+plugins=(zsh-autosuggestions git pip django docker docker-compose)
 
 # ......
 

diff --git a/.zshrc b/.zshrc
@@ -16,6 +16,7 @@ alias gs='git status'
 alias gl='git l'
 alias gd='git diff'
 alias gb='git branch'
+alias gck='git checkout'
 alias gp='git pull'
 alias dcp='docker-compose'
 alias docker-clean='docker volume ls -qf dangling=true | xargs docker volume rm'

diff --git a/.zshrc b/.zshrc
@@ -18,6 +18,7 @@ alias gd='git diff'
 alias gb='git branch'
 alias gp='git pull'
 alias dcp='docker-compose'
+alias docker-clean='docker volume ls -qf dangling=true | xargs docker volume rm'
 
 # https://stackoverflow.com/questions/1904860/how-to-remove-unreferenced-blobs-from-my-git-repo
 alias git-gc-all='git -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now gc "$@"'

diff --git a/.zshrc b/.zshrc
@@ -19,6 +19,9 @@ alias gb='git branch'
 alias gp='git pull'
 alias dcp='docker-compose'
 
+# https://stackoverflow.com/questions/1904860/how-to-remove-unreferenced-blobs-from-my-git-repo
+alias git-gc-all='git -c gc.reflogExpire=0 -c gc.reflogExpireUnreachable=0 -c gc.rerereresolved=0 -c gc.rerereunresolved=0 -c gc.pruneExpire=now gc "$@"'
+
 lazy_load() {
     # Act as a stub to another shell function/command. When first run, it will load the actual function/command then execute it.
     # E.g. This made my zsh load 0.8 seconds faster by loading `nvm` when "nvm", "npm" or "node" is used for the first time

diff --git a/.zshrc b/.zshrc
@@ -60,6 +60,6 @@ group_lazy_load $HOME/.rvm/scripts/rvm rvm irb rake rails
 unset -f group_lazy_load
 
 alias ve="lazy_load 've' $HOME/git/simple-virtualenv-wrapper/ve.sh ve"
-alias makedocker=". '/Applications/Docker/Docker Quickstart Terminal.app/Contents/Resources/Scripts/start.sh'"
 
+#alias makedocker=". '/Applications/Docker/Docker Quickstart Terminal.app/Contents/Resources/Scripts/start.sh'"
 #eval "$(docker-machine env default)"
diff --git a/.zshrc b/.zshrc
@@ -2,7 +2,7 @@
 # Open source under MIT LICENSE.
 
 ZSH_THEME="agnoster"
-plugins=(git pip docker django)
+plugins=(git pip docker docker-compose django)
 
 # ......
 

diff --git a/.zshrc b/.zshrc
@@ -8,17 +8,16 @@ plugins=(git pip docker django)
 
 unsetopt AUTO_CD
 
-alias l="ls -alhtr"
-
-alias upthis="ss u"
-alias downthis="ss d"
-
-alias g="git"
-alias gs="git status"
-alias gl="git l"
-alias gd="git diff"
-alias gb="git branch"
-alias gp="git pull"
+alias l='ls -alhtr'
+alias upthis='ss u'
+alias downthis='ss d'
+alias g='git'
+alias gs='git status'
+alias gl='git l'
+alias gd='git diff'
+alias gb='git branch'
+alias gp='git pull'
+alias dcp='docker-compose'
 
 lazy_load() {
     # Act as a stub to another shell function/command. When first run, it will load the actual function/command then execute it.