diff --git a/cursor/config/keybindings.json b/cursor/config/keybindings.json index e6cda31..a898bfa 100644 --- a/cursor/config/keybindings.json +++ b/cursor/config/keybindings.json @@ -262,10 +262,5 @@ "key": "ctrl+o", "command": "-lineBreakInsert", "when": "textInputFocus && !editorReadonly" - }, - { - "key": "alt+cmd+s", - "command": "workbench.action.toggleUnifiedSidebarFromKeyboard", - "when": "cursor.agentIdeUnification.enabled == true && !isAuxiliaryWindowFocusedContext" } ] diff --git a/script/docker-install.sh b/script/docker-install.sh index 4e24e8f..21d435a 100644 --- a/script/docker-install.sh +++ b/script/docker-install.sh @@ -1,25 +1,68 @@ -#/bin/bash +#!/bin/bash set -e -# delete old package -for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do sudo apt-get remove $pkg; done +# 引入切换脚本 +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -# Add Docker's official GPG key: -sudo apt-get update -sudo apt-get install ca-certificates curl -sudo install -m 0755 -d /etc/apt/keyrings -sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc -sudo chmod a+r /etc/apt/keyrings/docker.asc +# 根据环境变量选择安装方式 +if [ "$CN_REGION" = "1" ]; then + echo "[INFO] 国内环境,使用阿里云镜像安装 Docker" + install_docker_cn +else + echo "[INFO] 国外环境,使用官方源安装 Docker" + install_docker_intl +fi -# Add the repository to Apt sources: -echo \ - "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ - $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | - sudo tee /etc/apt/sources.list.d/docker.list >/dev/null -sudo apt-get update +echo "[INFO] Docker 安装完成,请重新登录或运行: source ~/.config/fish/config.fish" -sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin +################################################################# +# 国内安装(使用阿里云镜像) +install_docker_cn() { + for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do + sudo apt-get remove -y $pkg 2>/dev/null || true + done + + sudo apt-get update + sudo apt-get install -y ca-certificates curl gnupg + + sudo install -m 0755 -d /etc/apt/keyrings + sudo curl -fsSL https://mirrors.aliyun.com/docker-ce/linux/debian/gpg -o /etc/apt/keyrings/docker.asc + sudo chmod a+r /etc/apt/keyrings/docker.asc + + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://mirrors.aliyun.com/docker-ce/linux/debian \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | + sudo tee /etc/apt/sources.list.d/docker.list >/dev/null + + sudo apt-get update + sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + + sudo usermod -aG docker $USER +} + +################################################################# +# 国外安装(使用官方源) +install_docker_intl() { + for pkg in docker.io docker-doc docker-compose podman-docker containerd runc; do + sudo apt-get remove -y $pkg 2>/dev/null || true + done + + sudo apt-get update + sudo apt-get install -y ca-certificates curl gnupg + + sudo install -m 0755 -d /etc/apt/keyrings + sudo curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc + sudo chmod a+r /etc/apt/keyrings/docker.asc + + echo \ + "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \ + $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | + sudo tee /etc/apt/sources.list.d/docker.list >/dev/null + + sudo apt-get update + sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + + sudo usermod -aG docker $USER +} -# add to docker group -sudo usermod -aG docker $USER diff --git a/script/toggle-region.sh b/script/toggle-region.sh new file mode 100644 index 0000000..3f1b0a0 --- /dev/null +++ b/script/toggle-region.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# 切换 CN_REGION 环境变量 +# cn ↔ intl 切换 + +if [ "$CN_REGION" = "1" ]; then + export CN_REGION=0 + echo "[INFO] Region switched to: 0 (国外)" +else + export CN_REGION=1 + echo "[INFO] Region switched to: 1 (国内)" +fi +