Merge bd2c5eeec1 into 483f7fd7f3

2024-11-24 10:37:03 +08:00 · 2024-04-26 12:18:29 +00:00 · 2024-04-26 12:18:29 +00:00 · db0220d03c
commit db0220d03c
parent 483f7fd7f3 bd2c5eeec1
16 changed files with 162 additions and 72 deletions
--- a/.gitconfig2
+++ b/.gitconfig2
@ -9,6 +9,8 @@
    quotepath = false  # chinese chars
 [push]
    autoSetupRemote = true
+[pull]
+    ff = only
 [branch]
    # Show most recently changed branches first.
    sort = -committerdate
--- a/.github/workflows/gitee_sync.yml
+++ b/.github/workflows/gitee_sync.yml
@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: DictXiong/dotfiles
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/DictXiong
        dst: gitee/dictxiong
--- a/.github/workflows/gitee_sync_dependencies.yml
+++ b/.github/workflows/gitee_sync_dependencies.yml
@ -8,7 +8,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: ohmyzsh repo
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/ohmyzsh
        dst: gitee/dictxiong
@ -25,7 +25,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: zsh-users repos
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/zsh-users
        dst: gitee/dictxiong
@ -42,7 +42,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: zdharma-continuum repos
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/zdharma-continuum
        dst: gitee/dictxiong
@ -59,7 +59,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: thewtex/tmux-mem-cpu-load
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/thewtex
        dst: gitee/dictxiong
@ -76,7 +76,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: tmux-plugins
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/tmux-plugins
        dst: gitee/dictxiong
@ -87,13 +87,13 @@ jobs:
        clone_style: "https"
        debug: true
        force_update: true
-        static_list: "tpm,tmux-resurrect"
+        static_list: "tpm,tmux-resurrect,tmux-yank"
        timeout: '600s'
  vundle-vim:
    runs-on: ubuntu-20.04
    steps:
    - name: VundleVim/Vundle-vim
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/VundleVim
        dst: gitee/dictxiong
@ -110,7 +110,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: joshdick/onedark-vim
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/joshdick
        dst: gitee/dictxiong
@ -127,7 +127,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: junegunn/fzf
-      uses: Yikun/hub-mirror-action@v1.3
+      uses: Yikun/hub-mirror-action@v1.4
      with:
        src: github/junegunn
        dst: gitee/dictxiong
--- a/.tmux.conf2
+++ b/.tmux.conf2
@ -1,5 +1,6 @@
 set -g prefix ^a
-set -g mouse off
+set -g mouse on
+set -g set-clipboard on
 set -g default-terminal "xterm-256color"
 set -g history-limit 10000

--- a/.vimrc2
+++ b/.vimrc2
@ -14,8 +14,8 @@ set cursorline
 set syntax=on
 set autoindent
 set smartindent
-set tabstop=4
 set expandtab "spaces instead of tabs
+set tabstop=4 softtabstop=4 shiftwidth=4
 set backspace=indent,eol,start
 set number "line numbers
 set history=1000
--- a/.zshrc2
+++ b/.zshrc2
@ -16,6 +16,7 @@ export GPG_TTY=$(tty)
 export LESS_TERMCAP_md=$'\E[01;33m'
 # env for dfs
 if [[ -f ~/.config/dotfiles/env ]]; then set -a; source ~/.config/dotfiles/env; set +a; fi
+export DFS_OS_TYPE="$("$DOTFILES/tools/common.sh" get_os_type)"

 # antigen
 if [[ "$DFS_NO_WALL" == "1" ]]; then
@ -102,6 +103,10 @@ fi
 alias "pls"='sudo $(fc -ln -1)'
 alias "se"='sudo -sE'
 alias "sl"='sudo zsh -l'
+alias "cps"='rsync -avh --info=progress2'
+alias "mvs"='rsync -avh --info=progress2 --remove-source-files'
+if [[ "$DFS_OS_TYPE" == "linux" ]]; then alias "ping"='ping -n'; alias "ping6"='ping6 -n'; fi
+if [[ "$DFS_OS_TYPE" == "msys" ]]; then alias "tmux"='script -qO /dev/null -c "tmux -u"'; fi
 alias "pbd"='ping baidu.com'
 alias "p114"='ping 114.114.114.114'
 alias "p666"='ping6 2001:da8::666'
@ -110,9 +115,6 @@ alias "cbds"='curl https://www.baidu.com'
 alias "gdebug"='git add -A; git commit --allow-empty -m "bug fix ($(date))"'
 alias "ls"='ls --color=tty'
 alias "l"='ls -lAGh --time-style="+%y-%m-%d %H:%M"'
-if [[ -x $(command -v trash) ]]; then
-    alias "rm"="echo use the full path i.e. '/bin/rm'\; consider using trash"
-fi
 gbes() { git for-each-ref --sort=-committerdate refs/heads refs/remotes --format="%(authordate:format:%y-%m-%d.%a %H:%M %z)|%(color:red)%(objectname:short)|%(color:yellow)%(refname:short)%(color:reset)|%(color:reset)%(authorname): %(color:green)%(subject)" --color=always | column -ts"|" | less -FX }
 sagt() { eval "$($DOTFILES/tools/sagent.sh $@)" }

--- a/install.sh
+++ b/install.sh
@ -202,10 +202,11 @@ install_crontab()
 {
    if [[ -x $(command -v crontab) ]]; then
        fmt_note "installing \"$CRON_JOB\" to crontab ..."
-        if ! crontab -l 1>/dev/null 2>&1; then
-            echo -n | crontab -
+        if [[ -z "$(crontab -l 2>/dev/null || true)" ]]; then
+            echo "$CRON_JOB" | crontab -
+        elif !( crontab -l | grep -qxF "${CRON_JOB}"); then
+            ( crontab -l; echo "$CRON_JOB" ) | crontab -
        fi
-        ( crontab -l | grep -vxF "${CRON_JOB}" | grep -v "no crontab for"; echo "$CRON_JOB" ) | crontab -
    else
        fmt_warning "crontab does not exist. skipping ..."
    fi
@ -330,7 +331,7 @@ for i in ${GOT_OPTS[@]}; do
        -a|--auto ) INSTALL_DEP=1 ;;
        -H|--hist|--history ) store_hist=1 ;;
        -x ) store_config=1 ;;
-        --no-ssh ) unset HOME_SYMLINKS_SRC[0]; unset HOME_SYMLINKS_DST[0] ;;
+        --no-auth-info ) HOME_SYMLINKS_SRC=(); HOME_SYMLINKS_DST=() ;;
        * ) fmt_fatal "unknown option \"$i\"" ;;
    esac
 done
--- a/riot-config.sh
+++ b/riot-config.sh
@ -0,0 +1,56 @@
+#!/bin/false
+
+# remotes
+j.remote() {
+    remote=ssh.beardic.cn
+    RET_PORT=${RET_PORT:-24022}
+    RET_USERNAME=${RET_USERNAME:-root}
+    RET_TRUST_SERVER=1
+}
+
+nasp.remote() {
+    remote=nasp.fit
+    RET_PORT=${RET_PORT:-36022}
+    RET_USERNAME=${RET_USERNAME:-ssh}
+    RET_TRUST_SERVER=1
+}
+
+# domains
+.domain() {
+    RET_USERNAME=${RET_USERNAME:-root}
+}
+
+i.domain() {
+    RET_HOSTNAME=$host.ibd.ink
+    RET_PORT=${RET_PORT:-12022}
+    RET_USERNAME=${RET_USERNAME:-root}
+    RET_TRUST_SERVER=1
+}
+
+42.domain() {
+    RET_HOSTNAME=$host.i.bd.dn42
+    RET_PORT=${RET_PORT:-12022}
+    RET_USERNAME=${RET_USERNAME:-root}
+    RET_TRUST_SERVER=1
+}
+
+x.domain() {
+    RET_HOSTNAME=ssh.beardic.cn
+    local tmp=$(sha256sum <<< "$host" | tr -cd "[:digit:]")
+    tmp=${tmp:0:4}
+    RET_PORT=$((10#$tmp+36000))
+    RET_USERNAME=root
+    RET_TRUST_SERVER=1
+}
+
+nasp.domain() {
+    RET_HOSTNAME=$host
+    RET_PORT=${RET_PORT:-12022}
+    RET_USERNAME=${RET_USERNAME:-dictxiong}
+    RET_JUMP_SERVER="ssh@nasp.fit:36022"
+    RET_TRUST_SERVER=1
+}
+
+default.domain() {
+    i.domain
+}
--- a/scripts/doll
+++ b/scripts/doll
@ -21,5 +21,5 @@ if [[ -z "$IMAGE" ]]; then
    fmt_fatal "image not found"
 else
    fmt_note "--> ${IMAGE_META[@]}"
-    $SUDO docker run ${2:+"--name"} $2 -itd $IMAGE sh
+    $SUDO docker run ${2:+"--name"} $2 -itd --restart=unless-stopped $IMAGE sh
 fi
--- a/scripts/riot
+++ b/scripts/riot
@ -4,6 +4,19 @@ THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/../tools/common.sh"
 RIOT_TRUST_CLIENT=${RIOT_TRUST_CLIENT:-${DFS_TRUST:-0}}
 RIOT_TRUST_SERVER=${RIOT_TRUST_SERVER:-0}
+RIOT_EXTRA_OPTIONS=""
+
+# config
+RIOT_CONFIG_FILES=(
+    "$DOTFILES/riot-config.sh"
+    "$HOME/.config/riot-config.sh"
+    "riot-config.sh"
+)
+for file in "${RIOT_CONFIG_FILES[@]}"; do
+    if [[ -f "$file" ]]; then
+        source "$file"
+    fi
+done

 # check if port number valid
 check_port() {
@ -29,14 +42,6 @@ get_server_meta() {
    RET_JUMP_SERVER=""  # optional
    # body
    local remote="$1"
-    # shortcuts
-    if [[ "$remote" == "i" ]]; then
-        remote="sir0.ibd"
-    elif [[ "$remote" == "x" ]]; then
-        remote="bj1.ibd"
-    elif [[ "$remote" == "j" ]]; then
-        remote="sir0.ibd:36122"
-    fi
    # if in the form user@...
    if [[ "$remote" == *@* ]]; then
        RET_USERNAME=${remote%%@*}
@ -49,46 +54,25 @@ get_server_meta() {
        remote=${remote%:*}
        check_port $RET_PORT || fmt_fatal invalid port number \"$RET_PORT\"
    fi
+    # presets -- match remote
+    local remote_func="$remote.remote"
+    if is_function "$remote_func"; then
+        "$remote_func"
+    fi
    # presets -- match domain
+    RET_HOSTNAME=${remote}
    local domain=${remote##*.}
    local host=${remote%.*}
    # if there's no dot
    if [[ "$host" == "$domain" && "$host" != "["*"]" ]]; then
-        domain="ibd"
+        domain="default"
+    fi
+    local domain_func="$domain.domain"
+    if is_function "$domain_func"; then
+        "$domain_func"
+    elif is_function ".domain"; then
+        ".domain"
    fi
-    case $domain in
-        i|ibd )
-            RET_HOSTNAME=$host.ibd.ink
-            RET_PORT=${RET_PORT:-12022}
-            RET_USERNAME=${RET_USERNAME:-root}
-            RET_TRUST_SERVER=1
-            ;;
-        nasp )
-            RET_HOSTNAME=$host
-            RET_PORT=${RET_PORT:-12022}
-            RET_USERNAME=${RET_USERNAME:-dictxiong}
-            RET_JUMP_SERVER="ssh@nasp.ob.ac.cn:36022"
-            RET_TRUST_SERVER=1
-            ;;
-        x|proxied )
-            RET_HOSTNAME=proxy.beardic.cn
-            local tmp=$(sha256sum <<< "$host" | tr -cd "[:digit:]")
-            tmp=${tmp:0:4}
-            RET_PORT=$((10#$tmp+36000))
-            RET_USERNAME=root
-            RET_TRUST_SERVER=1
-            ;;
-        box[0-9] )
-            RET_HOSTNAME=$host
-            RET_PORT=${RET_PORT:-12022}
-            RET_USERNAME=${RET_USERNAME:-root}
-            RET_JUMP_SERVER="root@$domain.ibd.ink:12022"
-            RET_TRUST_SERVER=1
-            ;;
-        * )
-            test -z "$domain" || fmt_warning "unknown domain: \"$domain\". will try as host name"
-            RET_HOSTNAME="$remote"
-    esac
 }

 parse_remote() {
@ -101,7 +85,11 @@ parse_remote() {
    USERNAME=""  # optional
    SSH_OPTIONS=""  # optional
    if [[ "$RIOT_TRUST_CLIENT" == "1" ]]; then
-        SSH_OPTIONS='-o ControlMaster=auto -o ControlPath=/tmp/sshcm-%C -o PermitLocalCommand=yes'
+        SSH_OPTIONS='-o PermitLocalCommand=yes'
+        if [[ "$(get_os_type)" != "msys" ]]; then
+            test "$DFS_DRY_RUN" = "1" || mkdir -p ~/.ssh/master-socket
+            SSH_OPTIONS="$SSH_OPTIONS -o ControlMaster=auto -o ControlPath=~/.ssh/master-socket/%C"
+        fi
    fi
    # handle input
    local remote="$1"
@ -150,7 +138,7 @@ prepare_ssh_cmd() {
    else
        local port_param='-p'
    fi
-    echo "$ssh_bin ${PORT:+$port_param} $PORT $SSH_OPTIONS $SCP_SRC $USERNAME${USERNAME:+@}$SERVER $SCP_DST ${@:2}"
+    echo "$ssh_bin ${PORT:+$port_param} $PORT $SSH_OPTIONS $RIOT_EXTRA_OPTIONS $SCP_SRC $USERNAME${USERNAME:+@}$SERVER $SCP_DST ${@:2}"
 }

 # ssh
@ -178,6 +166,18 @@ run_sshl()
    eval_or_echo $cmd
 }

+# sshd
+run_sshd()
+{
+    local port=$(get_free_port)
+
+    SSH_OPTIONS="$SSH_OPTIONS -NC -D $port"
+    local cmd="$(prepare_ssh_cmd ssh)"
+    fmt_note "-->" $cmd
+    fmt_note "  > please access localhost:$port"
+    eval_or_echo $cmd
+}
+
 # scp
 run_scp() {
    local src="$1"
@ -214,6 +214,15 @@ router() {
        exit
    fi

+    while [[ "$1" == -* ]]; do
+        RIOT_EXTRA_OPTIONS="$RIOT_EXTRA_OPTIONS $1"
+        if [[ "$1" == "-o" ]]; then
+            RIOT_EXTRA_OPTIONS="$RIOT_EXTRA_OPTIONS $2"
+            shift
+        fi
+        shift
+    done
+
    IFS=',' read -ra remotes <<< "$1"
    for remote in "${remotes[@]}"; do
        if [[ -z "$remote" ]]; then
@ -224,6 +233,9 @@ router() {
            ssh|"" )
                run_ssh ssh "${@:3}"
                ;;
+            ping|ping6 )
+                run_ssh ssh "${@:2}"
+                ;;
            zssh )
                run_ssh zssh
                ;;
@ -234,6 +246,9 @@ router() {
                test -n "$3" || fmt_fatal "no target address provided"
                run_sshl "$3"
                ;;
+            sshd )
+                run_sshd
+                ;;
            scp )
                test -n "$3" || fmt_fatal "no source path specified"
                test -n "$4" || fmt_fatal "no destination path specified"
--- a/tools/common.sh
+++ b/tools/common.sh
@ -190,6 +190,7 @@ apost_beacon()

 get_os_type()
 {
+    test -z "$DFS_OS_TYPE" || ( echo "$DFS_OS_TYPE"; return )
    local ans="unknown"
    case "$(uname -s)" in
        Darwin*)    ans="MacOS";;
@ -198,11 +199,13 @@ get_os_type()
        Linux* )    ans="Linux";;
        *)          ans="unknown";;
    esac
+    export DFS_OS_TYPE="$ans"
    echo $ans | tr '[:upper:]' '[:lower:]'
 }

 get_linux_dist()
 {
+    test -z "$DFS_LINUX_DIST" || ( echo "$DFS_LINUX_DIST"; return )
    local ans="unknown"
    if [ -f /etc/os-release ]; then
        . /etc/os-release
@ -221,6 +224,7 @@ get_linux_dist()
    else
        ans="unknown"
    fi
+    export DFS_LINUX_DIST="$ans"
    echo $ans | tr '[:upper:]' '[:lower:]'
 }

@ -258,6 +262,10 @@ get_free_port() {
    echo $port
 }

+is_function() {
+    test "$(type -t "$1")" = "function"
+}
+
 # if bash-ed, else source-d
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
    $1 "${@:2}"
--- a/tools/frigg-client.sh
+++ b/tools/frigg-client.sh
@ -103,6 +103,7 @@ update_dns()
        ip4=""
    elif [[ "$DFS_DDNS_IP4" == "auto" ]]; then
        ip4="auto"
+        api_url="https://api4.beardic.cn"
    elif [[ "$DFS_DDNS_IP4" == "api" ]]; then
        ip4=$(curl $DFS_CURL_OPTIONS -sSL "https://api.ipify.org")
    elif [[ "$DFS_DDNS_IP4" == "http"* ]]; then
--- a/tools/sagent.sh
+++ b/tools/sagent.sh
@ -25,7 +25,7 @@ find_so_file()
 create_agent()
 {
    local IFS=","
-    ssh-agent -P "${SO_PATHS[*]}"
+    ssh-agent -P "${SO_PATHS[*]},/nix/store/*"
 }

 kill_agent()
--- a/tools/test.zsh
+++ b/tools/test.zsh
@ -21,6 +21,9 @@ test -f .zshrc2
 diff -q ./.ssh/authorized_keys2 ~/.ssh/authorized_keys2
 diff -q ./.eid/authorized_certificates ~/.eid/authorized_certificates
 grep -q ".zshrc2" ~/.zshrc
+if [[ -x $(command -v crontab) ]]; then
+    crontab -l | grep -qxF "0 * * * * ${DOTFILES}/update.sh"
+fi

 # check scripts and functions
 dfs version
@ -38,8 +41,8 @@ test $(echo n | tools/common.sh ask_for_yN "test") = "0"
 test $(echo | tools/common.sh ask_for_yN "test") = "0"
 test $(echo | tools/common.sh ask_for_Yn "test") = "1"
 test $(DFS_QUIET=1 tools/common.sh ask_for_Yn "test") = "1"
-test "$(DFS_TRUST=1 riot time@is.impt:2222/yes@you-r.right/you@are.really.recht./ibd./try@it,another@host scp /tmp/ ./tmp -D 2>/dev/null)" = 'scp -P 12022 -o ControlMaster=auto -o ControlPath=/tmp/sshcm-%C -o PermitLocalCommand=yes -o ProxyJump=time@is.impt:2222,yes@you-r.right,you@are.really.recht.,ibd. -r try@it.ibd.ink:"/tmp/" "./tmp"
-scp -P 12022 -o ControlMaster=auto -o ControlPath=/tmp/sshcm-%C -o PermitLocalCommand=yes -o ForwardX11=yes -o ForwardAgent=yes -r another@host.ibd.ink:"/tmp/" "./tmp"'
+test "$(DFS_TRUST=1 riot time@is.impt:2222/yes@you-r.right/you@are.really.recht./ibd./try@it,another@host scp /tmp/ ./tmp -D 2>/dev/null)" = 'scp -P 12022 -o PermitLocalCommand=yes -o ControlMaster=auto -o ControlPath=~/.ssh/master-socket/%C -o ProxyJump=time@is.impt:2222,yes@you-r.right,you@are.really.recht.,root@ibd. -r try@it.ibd.ink:"/tmp/" "./tmp"
+scp -P 12022 -o PermitLocalCommand=yes -o ControlMaster=auto -o ControlPath=~/.ssh/master-socket/%C -o ForwardX11=yes -o ForwardAgent=yes -r another@host.ibd.ink:"/tmp/" "./tmp"'

 # check alias
 alias p114
--- a/tools/to-install.sh
+++ b/tools/to-install.sh
@ -10,8 +10,9 @@ INSTALL_COMMANDS=(\
    [v2fly]="bash <(curl -L https://raw.githubusercontent.com/v2fly/fhs-install-v2ray/master/install-release.sh) #--remove" \
    [zerotier-one]='curl -s https://install.zerotier.com | sudo bash' \
    [docker-ce]='curl -fsSL https://get.docker.com | sudo bash -s - --mirror Aliyun #--dry-run' \
-    [lemonbench]='curl -fsSL https://ilemonra.in/LemonBenchIntl | bash -s fast # or full' \
+    [lemonbench]='curl -fsSL https://raw.githubusercontent.com/LemonBench/LemonBench/main/LemonBench.sh | bash -s fast # or full' \
    [nix]='sh <(curl -L https://nixos.org/nix/install) #--daemon' \
+    [alist]='curl -fsSL "https://alist.nn.ci/v3.sh" | bash -s install' \
 )

 install()
--- a/tools/ubuntu.sh
+++ b/tools/ubuntu.sh
@ -14,11 +14,11 @@ apt_install()
 {
    apt-get update -y
    # lite
-    apt-get install -y git zsh bash tmux vim curl inetutils-ping less bsdmainutils
+    DEBIAN_FRONTEND=noninteractive apt-get install -y git zsh bash tmux vim curl iputils-ping less bsdmainutils
    # full
    if [[ -z "$DFS_LITE" || "$DFS_LITE" == "0" ]]; then
-        apt-get install -y wget dialog net-tools dnsutils netcat traceroute sudo python3 python3-pip cron openssh-client openssh-server htop gcc g++ cmake make zip
-        for i in {fzf,ripgrep,man-db}; do apt-get install -y $i; done
+        DEBIAN_FRONTEND=noninteractive apt-get install -y wget dialog net-tools dnsutils netcat traceroute sudo python3 python3-pip cron openssh-client openssh-server htop gcc g++ cmake make zip
+        for i in {fzf,ripgrep,man-db}; do DEBIAN_FRONTEND=noninteractive apt-get install -y $i; done
    fi
 }