Merge remote-tracking branch 'origin/dev' into dev

1 files changed, 13 insertions, 5 deletions

diff --git a/alias b/alias
index 96c6984..4148b61 100644
--- a/alias
+++ b/alias
@@ -75,10 +75,11 @@ alias ports='sudo lsof -i -Pn | grep LISTEN'
 .() {
   source ${@:-$HOME/.$(basename $SHELL)rc}
 }
-alias ll='ls -alh'
+alias ll='ls -lh'
+alias lla='ls -lha'
 llw() { which $1 | xargs ls -alh; }
 alias hg='history | grep'
-alias rmrf='[[ `pwd` =~ ^$HOME.*  ]] && [[ ! $PATH =~ `pwd`  ]] && rm -rf'
+alias rmrf='[[ `pwd` =~ ^$HOME.*  ]] && rm -rf'
 alias rr='_move_to_tmp'
 alias sound="echo -ne '\a'"
 alias pst="pstree -ps $$"
@@ -250,7 +251,7 @@ cdss() {
 # about vimwiki
 alias cdw='cd ~/vimwiki'
 alias chw='tig -C ~/vimwiki'
-alias today='vim ~/vimwiki/diary/`date +'%Y-%m-%d'`.md'
+alias today='vim -c Goyo ~/vimwiki/diary/`date +'%Y-%m-%d'`.md'
 alias to='today'
 ww() { entry="${1:-guideline}"; vim ~/vimwiki/${entry%%.md}.md; }
 wg() { grep -r "$@" --exclude-dir=logseq/ ~/vimwiki; }
@@ -276,14 +277,21 @@ alias df='df -h'
 
 # docker
 alias dk='docker'
-alias dps='docker ps'
-alias dis='docker images'
 alias dc='docker-compose'
+alias dis='docker images'
+alias dps='docker ps'
+alias dpsa='docker ps -a'
 alias drm='docker rm `docker ps -aq`'
+<<<<<<< HEAD
 alias dr='docker run --rm -it'
 drsh() { docker run --rm -it --entrypoint /bin/sh $@; }
 drbash() { docker run --rm -it --entrypoint /bin/bash $@; }
 docker.tags() { curl -s -S "https://registry.hub.docker.com/v2/repositories/$@/tags/" | jq '.results[]["name"]' | sort; }
+alias drsh='docker run --rm -it --entrypoint /bin/sh $@'
+alias drbash='docker run --rm -it --entrypoint /bin/bash $@'
+docker.tags() {
+    curl -s -S "https://registry.hub.docker.com/v2/repositories/$@/tags/" | jq '.results[]["name"]' | sort
+}
 
 # Android
 alias debug='./gradlew app:installDebug && adb shell am start -n com.geothings.geobingan/.MainActivity_'