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

6 files changed, 73 insertions, 7 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_'
diff --git a/misc/openbox/rc.xml b/misc/openbox/rc.xml
index 4584121..d0ab52e 100644
--- a/misc/openbox/rc.xml
+++ b/misc/openbox/rc.xml
@@ -930,6 +930,12 @@
         <y>center</y>
       </position>
     </application>
+    <application title="alacritty">
+      <position force="yes">
+        <x>center</x>
+        <y>center</y>
+      </position>
+    </application>
     <!--
   # this is an example with comments through out. use these to make your
   # own rules, but without the comments of course.
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
diff --git a/tools/unix/fdswap b/tools/unix/fdswap
new file mode 100755
index 0000000..251cdea
--- /dev/null
+++ b/tools/unix/fdswap
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# fdswap
+# 
+# Orignal author: ingvarha
+# ref: https://ingvarha.wordpress.com/2010/07/10/changing-a-process-file-descriptor-on-the-fly/
+
+if [ "$2" = "" ]; then
+<<HELP cat
+Usage: ${0##*/} /path/to/oldfile /path/to/newfile [pids]
+Example: ${0##*/} /var/log/daemon.log /var/log/newvolume/daemon.log 1234
+Example: ${0##*/} /dev/pts/53 /dev/null 2345
+HELP
+  exit 0
+fi
+
+if ! gdb --version &>/dev/null; then
+  echo "Unable to find gdb."
+  exit 1
+fi
+
+src="$1"; dst="$2"; shift; shift 
+pids=$* 
+
+for pid in ${pids:=$( /sbin/fuser $src | cut -d ':' -f 2 )}; 
+do
+  echo "src=$src, dst=$dst"
+  echo "$src has $pid using it" 
+  cmd=$(mktemp)
+  { 
+    echo "attach $pid" 
+    echo 'call (int)open("'$dst'", 66, 0666)'
+    for ufd in $(LANG=C ls -l /proc/$pid/fd | \
+    grep "$src"\$ | awk ' { print $9; } '); 
+    do echo 'call (int)dup2($1,'"$ufd"')'; done 
+    echo 'call (int)close($1)'
+    echo 'detach'; echo 'quit' 
+    sleep 5
+  } | tee /dev/tty >$cmd
+  gdb -x $cmd
+done
diff --git a/zsh/_wi.sh b/zsh/_wi.sh
index d99518b..f33d0ae 100644
--- a/zsh/_wi.sh
+++ b/zsh/_wi.sh
@@ -1,7 +1,11 @@
 #compdef wi
 
 function _wi() {
-    compadd -S '' $(cd ~/vimwiki && find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d')
+    compadd -S '' $(
+      cd ~/vimwiki && \
+      find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | \
+      sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d; s/.md$//'
+    )
 }
 
 _wi
diff --git a/zsh/_ww.sh b/zsh/_ww.sh
index d998099..2a1e323 100644
--- a/zsh/_ww.sh
+++ b/zsh/_ww.sh
@@ -1,7 +1,11 @@
 #compdef ww
 
 function _ww() {
-    compadd -S '' $(cd ~/vimwiki && find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d')
+    compadd -S '' $(
+      cd ~/vimwiki && \
+      find -not -path "./logseq/*" -name '*.md' -printf "%f\n" | \
+      sed -E '/^[0-9]{4}-[0-9]{2}-[0-9]{2}/d; s/.md$//'
+    )
 }
 
 _ww