[debug] support nixos; fix ci (#41)

* support for nixos * fix ci
2024-11-24 03:57:00 +08:00 · 2023-07-26 21:18:24 +08:00 · 2023-07-26 21:18:24 +08:00 · 5fb7ff0833
commit 5fb7ff0833
parent 39b8dfce82
19 changed files with 129 additions and 134 deletions
--- a/.github/workflows/gitee_sync.yml
+++ b/.github/workflows/gitee_sync.yml
@ -8,17 +8,17 @@ jobs:
  dotfiles:
    runs-on: ubuntu-20.04
    steps:
-    - name: DictXiong/dotfiles  # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: DictXiong/dotfiles
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/DictXiong  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/DictXiong
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: user
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "dotfiles"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"
+        debug: true
+        force_update: true
+        static_list: "dotfiles"
+        timeout: '600s'
--- a/.github/workflows/gitee_sync_dependencies.yml
+++ b/.github/workflows/gitee_sync_dependencies.yml
@ -7,136 +7,136 @@ jobs:
  ohmyzsh:
    runs-on: ubuntu-20.04
    steps:
-    - name: ohmyzsh repo  # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: ohmyzsh repo
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/ohmyzsh  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/ohmyzsh
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: org
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "ohmyzsh"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"  # https/ssh
+        debug: true  # print all commands
+        force_update: true
+        static_list: "ohmyzsh"
+        timeout: '600s'
  zsh-users:
    runs-on: ubuntu-20.04
    steps:
-    - name: zsh-users repos  # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: zsh-users repos
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/zsh-users  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/zsh-users
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: org
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "antigen,zsh-syntax-highlighting,zsh-autosuggestions,zsh-completions"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"
+        debug: true
+        force_update: true
+        static_list: "antigen,zsh-syntax-highlighting,zsh-autosuggestions,zsh-completions"
+        timeout: '600s'
  zdharma-continuum:
    runs-on: ubuntu-20.04
    steps:
-    - name: zdharma-continuum repos  # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: zdharma-continuum repos
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/zdharma-continuum  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/zdharma-continuum
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: org
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "fast-syntax-highlighting"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"
+        debug: true
+        force_update: true
+        static_list: "fast-syntax-highlighting"
+        timeout: '600s'
  tmux-mem-cpu-load:
    runs-on: ubuntu-20.04
    steps:
-    - name: thewtex/tmux-mem-cpu-load  # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: thewtex/tmux-mem-cpu-load
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/thewtex  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/thewtex
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: user
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "tmux-mem-cpu-load"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"
+        debug: true
+        force_update: true
+        static_list: "tmux-mem-cpu-load"
+        timeout: '600s'
  tmux-plugins:
    runs-on: ubuntu-20.04
    steps:
-    - name: tmux-plugins # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: tmux-plugins
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/tmux-plugins  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/tmux-plugins
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: org
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "tpm,tmux-resurrect"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"
+        debug: true
+        force_update: true
+        static_list: "tpm,tmux-resurrect"
+        timeout: '600s'
  vundle-vim:
    runs-on: ubuntu-20.04
    steps:
-    - name: VundleVim/Vundle-vim # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: VundleVim/Vundle-vim
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/VundleVim  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/VundleVim
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: org
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "Vundle.vim"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"
+        debug: true
+        force_update: true
+        static_list: "Vundle.vim"
+        timeout: '600s'
  onedark-vim:
    runs-on: ubuntu-20.04
    steps:
-    - name: joshdick/onedark-vim # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: joshdick/onedark-vim
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/joshdick  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/joshdick
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: user
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "onedark.vim"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"
+        debug: true
+        force_update: true
+        static_list: "onedark.vim"
+        timeout: '600s'
  fzf:
    runs-on: ubuntu-20.04
    steps:
-    - name: junegunn/fzf # 名字随便起
-      uses: Yikun/hub-mirror-action@v1.2  # 使用Yikun/hub-mirror-action
+    - name: junegunn/fzf
+      uses: Yikun/hub-mirror-action@v1.3
      with:
-        src: github/junegunn  # 源端账户名(github)
-        dst: gitee/dictxiong  # 目的端账户名(gitee)
-        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}  # SSH密钥对中的私钥
-        dst_token:  ${{ secrets.GITEE_TOKEN }}  # Gitee账户的私人令牌
+        src: github/junegunn
+        dst: gitee/dictxiong
+        dst_key: ${{ secrets.GITEE_PRIVATE_KEY }}
+        dst_token:  ${{ secrets.GITEE_TOKEN }}
        src_account_type: user
-        dst_account_type: user  # 账户类型
-        clone_style: "https"  # 使用https方式进行clone，也可以使用ssh
-        debug: true  # 启用后会显示所有执行命令
-        force_update: true  # 启用后，强制同步，即强制覆盖目的端仓库
-        static_list: "fzf"  # 静态同步列表，在此填写需要同步的仓库名称，可填写多个
-        timeout: '600s'  # git超时设置，超时后会自动重试git操作
+        dst_account_type: user
+        clone_style: "https"
+        debug: true
+        force_update: true
+        static_list: "fzf"
+        timeout: '600s'
--- a/.update.sh
+++ b/.update.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 THIS_FILE=$(basename "${BASH_SOURCE}")
--- a/install.sh
+++ b/install.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/tools/common.sh"
--- a/scripts/dogo
+++ b/scripts/dogo
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/../tools/common.sh"
--- a/scripts/doll
+++ b/scripts/doll
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/../tools/common.sh"
--- a/scripts/pbin
+++ b/scripts/pbin
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/../tools/common.sh"
--- a/scripts/riot
+++ b/scripts/riot
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # connect to iot services
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/../tools/common.sh"
--- a/tools/alpine.sh
+++ b/tools/alpine.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/common.sh"
--- a/tools/append_zsh_hist.sh
+++ b/tools/append_zsh_hist.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/common.sh"
--- a/tools/common.sh
+++ b/tools/common.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR_COMMON_SH=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 export DOTFILES=$( cd "$THIS_DIR_COMMON_SH/.." && pwd )
--- a/tools/frigg-client.sh
+++ b/tools/frigg-client.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
@ -162,4 +162,4 @@ router()
    esac
 }

-router "${GOT_OPTS[@]}"
+router "${GOT_OPTS[@]}"
--- a/tools/get.dotfiles.cn
+++ b/tools/get.dotfiles.cn
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 ARG=""
 GOT_OPTS=()
--- a/tools/macos.sh
+++ b/tools/macos.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/common.sh"
--- a/tools/msys2.sh
+++ b/tools/msys2.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/common.sh"
--- a/tools/sagent.sh
+++ b/tools/sagent.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 export DFS_COLOR=1
@ -7,7 +7,7 @@ source "$THIS_DIR/common.sh"

 find_so_file()
 {
-    local SO_PATHS=( "/usr/lib64/opensc-pkcs11.so" "/usr/local/lib/opensc-pkcs11.so" )
+    local SO_PATHS=( "/usr/lib64/opensc-pkcs11.so" "/usr/local/lib/opensc-pkcs11.so" "/run/current-system/sw/lib/opensc-pkcs11.so" )
    local SO_FILE
    for SO_FILE in ${SO_PATHS[*]}; do
        if [[ -f "$SO_FILE" ]]; then
@ -19,12 +19,7 @@ find_so_file()

 create_agent()
 {
-    local SO_FILE=$(find_so_file)
-    if [[ -n "$SO_FILE" ]]; then
-        fmt_note "opensc-pkcs11.so found"
-        SO_FILE="-P $SO_FILE"
-    fi
-    ssh-agent $SO_FILE
+    ssh-agent -P "/usr/lib64/*,/usr/local/lib/*,/nix/store/*"
 }

 kill_agent()
@ -106,4 +101,4 @@ route()
    esac
 }

-route "$@"
+route "$@"
--- a/tools/test-getopts.sh
+++ b/tools/test-getopts.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -ex
 OPTS='-a -bcl --color --arg1=1 --arg2 2 " 1 2" yes'
 TARGET_OPTS='-a -b -c --arg1 1 --arg2 2  1 2 yes'
--- a/tools/to-install.sh
+++ b/tools/to-install.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash

 declare -A INSTALL_COMMANDS
 INSTALL_COMMANDS=(\
--- a/tools/ubuntu.sh
+++ b/tools/ubuntu.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
 source "$THIS_DIR/common.sh"