From 0452e8413309db16634e7b8e3188c90da8700b02 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <typebrook@gmail.com>
Date: Fri, 15 Apr 2022 08:59:35 +0800
Subject: Update

---
 alias | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'alias')

diff --git a/alias b/alias
index 9f5bc4f..e537867 100644
--- a/alias
+++ b/alias
@@ -73,7 +73,8 @@ fd() { echo /proc/$$/fd; ls -l /proc/$$/fd; }
 port() { sudo lsof -i :$1; }
 alias ports='sudo lsof -i -Pn | grep LISTEN'
 alias src="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'
@@ -274,11 +275,11 @@ 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`'
-alias dr='docker run --rm -it'
 alias drsh='docker run --rm -it --entrypoint /bin/sh $@'
 alias drbash='docker run --rm -it --entrypoint /bin/bash $@'
 docker.tags() {
-- 
cgit v1.2.3-70-g09d2


From 5f94532c5a7603e8b79d0d755de95220185aed38 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <typebrook@gmail.com>
Date: Fri, 15 Apr 2022 11:54:57 +0800
Subject: Update

---
 alias | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'alias')

diff --git a/alias b/alias
index e537867..28050a5 100644
--- a/alias
+++ b/alias
@@ -77,7 +77,7 @@ 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 $$"
-- 
cgit v1.2.3-70-g09d2


From 38a86b051449b1004e8e098c8c831ae974e5102b Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <typebrook@gmail.com>
Date: Fri, 15 Apr 2022 22:05:06 +0800
Subject: Update

---
 alias              | 2 +-
 tools/init/sync.sh | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'alias')

diff --git a/alias b/alias
index 28050a5..2e080a9 100644
--- a/alias
+++ b/alias
@@ -249,7 +249,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; }
diff --git a/tools/init/sync.sh b/tools/init/sync.sh
index 04af87e..ebed33a 100755
--- a/tools/init/sync.sh
+++ b/tools/init/sync.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# If git is working in other process, then don't sync again
+! pidof git && exit 0
+
 # my repo
 sync() {
   { cd $1 && [[ -n $(git remote -v) ]] || return ; } 2>/dev/null
-- 
cgit v1.2.3-70-g09d2