Compare commits
@@ -0,0 +1,50 @@
|
|||||||
|
name: upstream-sync
|
||||||
|
|
||||||
|
on:
|
||||||
|
schedule:
|
||||||
|
- cron: "0 3 * * *"
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
sync:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: quattro
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Fetch upstream and open sync PR
|
||||||
|
env:
|
||||||
|
TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
API: ${{ github.server_url }}/api/v1
|
||||||
|
REPO: ${{ github.repository }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
git config user.name "omarchycn-sync"
|
||||||
|
git config user.email "sync@noreply.git.zacharyzhang.com"
|
||||||
|
git remote add upstream https://github.com/basecamp/omarchy.git
|
||||||
|
git fetch upstream quattro
|
||||||
|
UP=$(git rev-parse upstream/quattro)
|
||||||
|
echo "upstream quattro: $UP"
|
||||||
|
if git merge-base --is-ancestor "$UP" HEAD; then
|
||||||
|
echo "Already up to date with upstream"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
BR="sync/upstream-${UP:0:8}"
|
||||||
|
if git ls-remote --exit-code --heads origin "$BR" > /dev/null; then
|
||||||
|
echo "Sync branch $BR already exists, PR pending review"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
# Trial merge only to report conflict status in the PR body
|
||||||
|
MERGE="clean"
|
||||||
|
if ! git merge --no-commit --no-ff "upstream/quattro" > /dev/null 2>&1; then
|
||||||
|
MERGE="CONFLICTS (resolve manually)"
|
||||||
|
fi
|
||||||
|
git merge --abort 2> /dev/null || true
|
||||||
|
# Branch points at upstream HEAD so the PR always gets created
|
||||||
|
git push origin "$UP:refs/heads/$BR"
|
||||||
|
curl -sS --fail-with-body -X POST \
|
||||||
|
-H "Authorization: token $TOKEN" -H "Content-Type: application/json" \
|
||||||
|
"$API/repos/$REPO/pulls" \
|
||||||
|
-d "{\"base\":\"quattro\",\"head\":\"$BR\",\"title\":\"Sync upstream omarchy ${UP:0:8}\",\"body\":\"Automated sync of basecamp/omarchy quattro @ $UP. Trial merge: $MERGE. Review, run ./test/all, then merge.\"}"
|
||||||
@@ -2,3 +2,7 @@
|
|||||||
# Python bytecode (orchestrator)
|
# Python bytecode (orchestrator)
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|
||||||
|
# Local working documents
|
||||||
|
OmarchyCN PRD.md
|
||||||
|
OmarchyCN-TASKS.md
|
||||||
|
|||||||
@@ -11,13 +11,29 @@ matching guide before starting:
|
|||||||
- [`agents/skills/visual-verification.md`](agents/skills/visual-verification.md) - verifying any change with a visual effect in the running UI
|
- [`agents/skills/visual-verification.md`](agents/skills/visual-verification.md) - verifying any change with a visual effect in the running UI
|
||||||
- [`agents/skills/migrations.md`](agents/skills/migrations.md) - creating or changing migrations under `migrations/`
|
- [`agents/skills/migrations.md`](agents/skills/migrations.md) - creating or changing migrations under `migrations/`
|
||||||
|
|
||||||
|
# OmarchyCN Layer
|
||||||
|
|
||||||
|
This fork carries the OmarchyCN China-integration layer on top of upstream `basecamp/omarchy`:
|
||||||
|
|
||||||
|
- `bin/omarchycn` routes to `omarchy cn <command>`; all cn commands are `bin/omarchy-cn-*` and follow the upstream bin conventions (metadata, helpers, `$OMARCHY_PATH` — sole exception: the overlay installer bootstraps by resolving its own checkout)
|
||||||
|
- `cn/` holds the data layer: `mirrors.json`, `dev-mirrors.json`, `apps.json`, `registry/` (AI providers/harnesses/compatibility), `fcitx5/`, `fontconfig/`, `keys/`, `lib/` (sourced helpers), `release` (cn release number)
|
||||||
|
- cn migrations live in `cn/migrations/*.sh`, run by `omarchy-cn-update` with per-file completion markers under `~/.local/state/omarchycn/`
|
||||||
|
- Packaging: `packages/omarchy-pkgs-cn.patch` must be applied to the sibling `omarchy-pkgs` checkout so `omarchy-dev` ships `cn/`; keyring in `packages/omarchycn-keyring/`
|
||||||
|
- ISO: `packages/omarchy-iso-cn.patch` must be applied to the sibling `omarchy-iso` checkout — Chinese installer (cage+foot graphical console with English VT fallback) and live-env packages
|
||||||
|
- Release process: `docs/release-checklist.md`; signing: `docs/release-signing.md`; pacman repo: `docs/pacman-repo.md`
|
||||||
|
- Chinese-first defaults: OmarchyCN ships Simplified Chinese as the default UX. User-visible strings in `default/omarchy/omarchy-menu.jsonc` (all labels), `default/hypr/bindings/*.lua` (bind descriptions, including the generated workspace/group/panel loops), `bin/omarchy-menu-keybindings` (its merge list and priority patterns must match the shipped Chinese descriptions), `bin/omarchy-update-confirm`, and `install/user/first-run/*` notifications are Chinese with brand names kept in English; menu search stays reachable in English through leaf ids. When syncing upstream, translate new strings in these files and resolve string conflicts toward our Chinese text.
|
||||||
|
- Default set changes vs upstream: `install/omarchy-base.packages` adds fcitx5-rime/chinese-addons/configtool and drops aether/libreoffice-fresh/obs-studio; the Basecamp/Discord/HEY/Google/WhatsApp/X launchers, their webapp keybindings, the whatsapp-slim extension, and the HEY mailto handler are removed (preinstall add/remove lists, launcher.hides, chromium flags, and mimeapps stay in sync); `install/user/cn-chinese.sh` seeds IME/font config on zh_CN systems
|
||||||
|
- AI: `cn/registry/` drives providers (DeepSeek/Kimi/Z.AI/MiniMax) with zero-code adapters; `omarchy-default-agent` also accepts kimi (official installer script, not mise) and deepcode (mise npm); the Default Agent menu carries them plus an AI Hub combo entry
|
||||||
|
- Upstream sync: `.gitea/workflows/upstream-sync.yml` opens a PR per upstream change; keep upstream file edits minimal and inventoried (currently: one `GROUP_DESCRIPTIONS[cn]` line in `bin/omarchy`, the localized menu/bindings/update/first-run surfaces above, the western-app removals above, a rewritten `README.md` (known recurring sync conflict, resolve toward ours), `AGENTS.md` additions, and two `.gitignore` lines)
|
||||||
|
- cn tests: `test/shell.d/omarchycn-test.sh`, `test/shell.d/omarchycn-ai-test.sh`; localized UI expectations live in the upstream suites (menu, keybindings-menu, hyprland-default-config, binding-conflicts, clock, screenrecording, update-disk-space)
|
||||||
|
|
||||||
# Documentation Layout
|
# Documentation Layout
|
||||||
|
|
||||||
Three documentation trees, split by genre and audience:
|
Three documentation trees, split by genre and audience:
|
||||||
|
|
||||||
- `agents/skills/` - task procedure ("do this when doing X"), for anyone working on the codebase
|
- `agents/skills/` - task procedure ("do this when doing X"), for anyone working on the codebase
|
||||||
- `docs/` - reference on how the system is shaped (file layout, update pipeline, theming, shell architecture), for anyone working on the codebase; skills link here for depth
|
- `docs/` - reference on how the system is shaped (file layout, update pipeline, theming, shell architecture), for anyone working on the codebase; skills link here for depth
|
||||||
- `manual/` - end-user documentation for using Omarchy, published; never codebase internals
|
- `manual/` - end-user documentation for using Omarchy, published; never codebase internals. Chinese user manual for the cn layer lives in `manual/zh-cn/`
|
||||||
|
|
||||||
# Style
|
# Style
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
# 行为准则
|
||||||
|
|
||||||
|
参与 OmarchyCN 社区(issue、PR、讨论)时:
|
||||||
|
|
||||||
|
- 尊重他人,就事论事,不进行人身攻击、骚扰或歧视
|
||||||
|
- 欢迎新手提问,回答保持耐心
|
||||||
|
- 技术分歧用证据和代码说话
|
||||||
|
- 不发布垃圾信息、广告或与项目无关的内容
|
||||||
|
|
||||||
|
违反者由维护者视情节警告、删除内容或封禁账号。
|
||||||
|
举报渠道见 [SECURITY.md](SECURITY.md) 中的联系方式。
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
# 贡献指南
|
||||||
|
|
||||||
|
## 仓库结构
|
||||||
|
|
||||||
|
- 上游 Omarchy 代码尽量不动;OmarchyCN 改动集中在 `bin/omarchy-cn-*`、`bin/omarchycn`、`cn/`、`install/cn/`
|
||||||
|
- 上游代码定期与 `basecamp/omarchy` 同步:同步 PR 由维护者或 CI 工作流发起,人工审查合并
|
||||||
|
|
||||||
|
## 提交规范
|
||||||
|
|
||||||
|
- 遵循 [AGENTS.md](AGENTS.md) 的全部代码与命令约定(Bash 5、`[[ ]]`/`(( ))`、两空格缩进、`#!/bin/bash`)
|
||||||
|
- 提交保持原子:一个提交只做一件事
|
||||||
|
- 涉及系统修改的命令必须支持 `--dry-run`,写配置前先备份
|
||||||
|
|
||||||
|
## 测试
|
||||||
|
|
||||||
|
- CLI 与 shell 改动跑 `./test/all`
|
||||||
|
- OmarchyCN 新增测试放在 `test/shell.d/*-test.sh`
|
||||||
|
|
||||||
|
## 提交流程
|
||||||
|
|
||||||
|
1. Fork 或在 issue 中讨论
|
||||||
|
2. 提交 PR 到 `quattro` 分支,说明动机与验证方式
|
||||||
|
3. 通过 CI 与代码审查后合并
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
OmarchyCN
|
||||||
|
|
||||||
|
Copyright (c) 2026 Zachary Zhang / OmarchyCN Community
|
||||||
|
|
||||||
|
本发行版基于 Omarchy(https://github.com/basecamp/omarchy),
|
||||||
|
Copyright (c) 2025 David Heinemeier Hansson,MIT License。
|
||||||
|
上游文件保留其原始版权与许可证声明(见 LICENSE)。
|
||||||
|
|
||||||
|
OmarchyCN 原创代码(bin/omarchy-cn-*、cn/、install/cn/ 及相关文档)
|
||||||
|
采用 MIT License 发布。
|
||||||
|
|
||||||
|
OmarchyCN is an independent community distribution based on Omarchy.
|
||||||
|
OmarchyCN is not affiliated with or endorsed by Basecamp, 37signals,
|
||||||
|
or the Omarchy maintainers.
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
# OmarchyCN 执行任务清单
|
|
||||||
|
|
||||||
进度真相文件。按顺序执行,禁止跳项。每项完成后勾选并记录结果。
|
|
||||||
|
|
||||||
范围裁剪:本轮交付 = 用户目标三项(公开仓库 + 基线 ISO + Gitea Release),即 PRD M0 中的
|
|
||||||
Canonical Repo 与「未修改功能的基线 ISO」两项。M0 其余项(上游同步 MR 自动化、Release Key
|
|
||||||
与签名体系、法务/治理文档)以及 M1–M5 功能章节均不在本轮范围。本轮校验产物为 SHA-256
|
|
||||||
checksum,不含 PGP 签名(PRD §15.1 签名体系属后续 M0 收尾项)。
|
|
||||||
|
|
||||||
- [x] T1 复核 PRD 全文(§1–28),确认本轮交付物 = 公开仓库 + 基线 ISO + Release(M0 部分交付)
|
|
||||||
- [x] T2 探测 git.zacharyzhang.com Gitea API:版本、token 身份、release 附件大小上限
|
|
||||||
- [x] T3 通过 API 创建公开仓库 omarchycn
|
|
||||||
- [x] T4 提交 PRD 与本清单到 quattro 分支,推送全部历史到 Gitea
|
|
||||||
- [x] T5 准备 WSL 构建环境:克隆 omacom-io/omarchy-iso 与 omacom-io/omarchy-pkgs,按其 bin 脚本要求装依赖
|
|
||||||
- [x] T6 构建基线 ISO:./bin/omarchy-iso-make --no-boot-offer --local-source ../omarchy ../omarchy-pkgs
|
|
||||||
- [x] T7 校验 ISO:生成 SHA-256;WSL 有 /dev/kvm,尽可能做 QEMU UEFI 启动冒烟测试
|
|
||||||
- [ ] T8 创建 Gitea Release(tag 4.0.0.alpha-cn.1):ISO 传 generic package registry,release 附 sha256 与下载链接
|
|
||||||
- [ ] T9 输出最终核对表:仓库 URL、Release URL、逐条验收结果
|
|
||||||
|
|
||||||
## 执行记录
|
|
||||||
|
|
||||||
(每项完成后在此追加一行:任务号、结果、产物路径/URL)
|
|
||||||
|
|
||||||
- T1 完成:PRD §1–28 全文已复核。本轮交付=M0 部分交付(Canonical Repo + 基线 ISO + SHA-256 校验产物)。
|
|
||||||
- T2 完成:Gitea 1.27.1,token=ZacharyZhang-NY(admin)。附件限制 100MB 且不允许 .iso;release asset API 无 external_url。
|
|
||||||
已验证 generic package registry 可上传(201)。策略:ISO 传 generic registry,release 附 sha256(.txt) 与下载链接。
|
|
||||||
如需 ISO 直接作为 release 附件,需管理员改服务器 app.ini 的 [attachment] ALLOWED_TYPES/MAX_SIZE。
|
|
||||||
- T3 完成:https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn (public,默认分支 quattro)。
|
|
||||||
- T4 完成:quattro 全历史已推送,HEAD=2c8a6874(含 PRD 与本清单)。
|
|
||||||
- T5 完成:WSL Ubuntu 24.04 装 docker.io 29.1.3(systemd 托管,active);~/omarchycn-build 下
|
|
||||||
三个 checkout:omarchy(quattro 5fa312e0,克隆自本地)、omarchy-iso(quattro)、omarchy-pkgs(master)。
|
|
||||||
构建命令按 omarchy-iso-make 实际要求:--keep-pkg-cache 跳过交互 sudo,--no-boot-offer 跳过 gum。
|
|
||||||
- T6 完成:release/omarchy-2026.08.24-x86_64-local.iso(5.8G,含离线镜像仓库),mkarchiso Done,EXIT=0。
|
|
||||||
- T7 完成:SHA-256=1d5421d1427cf97c0950c766778380c0543f180c9062e0a7c06f99b457dd8300(.sha256 已落盘)。
|
|
||||||
QEMU 8.2 + OVMF + KVM 冒烟测试通过:UEFI 启动进入安装器欢迎屏(Press Return to Start Install),
|
|
||||||
QMP screendump 三张截图确认。曾出现两次环境故障并已修根因:WSL 随最后一个客户端退出导致 nohup QEMU
|
|
||||||
被杀(改为前台任务保活);/dev/kvm 权限(用户加入 kvm 组)。
|
|
||||||
@@ -1,80 +1,44 @@
|
|||||||
# Omarchy
|
# OmarchyCN
|
||||||
|
|
||||||
Omarchy is a beautiful, modern & opinionated Linux distribution by DHH.
|
面向中国开发者的 [Omarchy](https://omarchy.org) 下游发行版:完整保留 Omarchy 的 Arch + Hyprland 桌面体验,为中国网络环境、中文使用习惯与国内 AI 服务做系统级增强。
|
||||||
|
|
||||||
Read more at [omarchy.org](https://omarchy.org).
|
当前版本 `4.0.0.alpha-cn.1`(基于上游 `quattro` 分支构建的基线 ISO)。
|
||||||
|
|
||||||
## The Omarchy Manual
|
## 特性
|
||||||
|
|
||||||
The manual lives in [`manual/`](manual/), which is its authoritative source. It's
|
继承自 Omarchy:
|
||||||
mirrored to [learn.omacom.io](https://learn.omacom.io/2/the-omarchy-manual), where
|
|
||||||
its screenshots are also hosted.
|
|
||||||
|
|
||||||
- [Welcome to Omarchy!](manual/01-welcome-to-omarchy.md)
|
- Hyprland 动态平铺桌面 + Quickshell 顶栏、菜单与系统面板,键盘驱动工作流
|
||||||
|
- `omarchy` CLI 与 `Super + Space` 系统菜单,CLI 与 GUI 同构
|
||||||
|
- 内置主题系统与一键换肤,终端 / 编辑器 / 桌面配色统一
|
||||||
|
- AI coding agent 桌面集成(Claude Code、Codex、OpenCode 等,`mise` 按需安装)
|
||||||
|
- Btrfs + Snapper 更新前快照与系统回滚
|
||||||
|
- archiso 离线安装镜像,支持无人值守安装与双系统引导
|
||||||
|
|
||||||
**The Basics**
|
OmarchyCN 增强(开发中,按路线图逐步交付):
|
||||||
|
|
||||||
- [Getting Started](manual/02-getting-started.md)
|
- **中国镜像管理**:Arch / npm / pip / Cargo / Go 等软件源测速、自动选择与故障切换
|
||||||
- [Coming From Mac or Windows](manual/03-coming-from-mac-or-windows.md)
|
- **中文环境开箱即用**:zh_CN locale、思源黑体 / 宋体字体栈、高分屏分数缩放预设
|
||||||
- [Navigation](manual/04-navigation.md)
|
- **中文输入法**:Fcitx5 + Rime 预配置,Wayland / GTK / Qt / Electron 全栈兼容,快捷键冲突自动处理
|
||||||
- [The top bar](manual/05-the-top-bar.md)
|
- **AI Hub**:Kimi、DeepSeek、Z.AI/GLM 一等 Provider 支持,与 Claude Code、Codex、OpenCode、Kimi Code、Deep Code 等 Harness 的统一配置向导、凭据安全存储与连接诊断
|
||||||
- [Themes](manual/06-themes.md)
|
- **国内应用中心**:微信、QQ、飞书、钉钉、腾讯会议、WPS 等应用的可信安装入口
|
||||||
- [Hotkeys](manual/07-hotkeys.md)
|
- **Overlay 安装器**:在现有 Omarchy 上叠加 OmarchyCN,全程可逆、可卸载
|
||||||
- [Unified Clipboard & History](manual/08-unified-clipboard-history.md)
|
- **统一诊断**:`omarchycn doctor` 覆盖网络、镜像、输入法、显示与 AI 配置
|
||||||
- [Reminders](manual/09-reminders.md)
|
|
||||||
- [Notices](manual/10-notices.md)
|
|
||||||
- [Text Extraction & Dictation](manual/11-text-extraction-dictation.md)
|
|
||||||
- [Screenshots & Recording](manual/12-screenshots-recording.md)
|
|
||||||
- [Toggles, idle & screensaver](manual/13-toggles-idle-screensaver.md)
|
|
||||||
- [Omarchy CLI](manual/14-omarchy-cli.md)
|
|
||||||
|
|
||||||
**The Applications**
|
## 下载与安装
|
||||||
|
|
||||||
- [Terminal](manual/15-terminal.md)
|
从 [Releases](https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn/releases) 页面下载 ISO 与 `SHA256SUMS.txt`,校验后写入 U 盘,UEFI 启动安装:
|
||||||
- [Neovim](manual/16-neovim.md)
|
|
||||||
- [AI](manual/17-ai.md)
|
|
||||||
- [Development Tools](manual/18-development-tools.md)
|
|
||||||
- [Shell Tools](manual/19-shell-tools.md)
|
|
||||||
- [Shell Functions](manual/20-shell-functions.md)
|
|
||||||
- [TUIs](manual/21-tuis.md)
|
|
||||||
- [GUIs](manual/22-guis.md)
|
|
||||||
- [Browsers](manual/23-browsers.md)
|
|
||||||
- [Commercial apps/services](manual/24-commercial-apps-services.md)
|
|
||||||
- [Web Apps](manual/25-web-apps.md)
|
|
||||||
- [Gaming](manual/26-gaming.md)
|
|
||||||
- [Filling out PDFs](manual/27-filling-out-pdfs.md)
|
|
||||||
- [Windows VM](manual/28-windows-vm.md)
|
|
||||||
- [Other Packages](manual/29-other-packages.md)
|
|
||||||
|
|
||||||
**Configuration**
|
```bash
|
||||||
|
sha256sum -c SHA256SUMS.txt
|
||||||
|
```
|
||||||
|
|
||||||
- [Updates](manual/30-updates.md)
|
## 上游文档
|
||||||
- [Dotfiles](manual/31-dotfiles.md)
|
|
||||||
- [Shell plugins](manual/32-shell-plugins.md)
|
|
||||||
- [Monitors](manual/33-monitors.md)
|
|
||||||
- [Keyboard, Mouse, Trackpad](manual/34-keyboard-mouse-trackpad.md)
|
|
||||||
- [Networking](manual/35-networking.md)
|
|
||||||
- [System sleep](manual/36-system-sleep.md)
|
|
||||||
- [Hardware authentication](manual/37-hardware-authentication.md)
|
|
||||||
- [Fonts](manual/38-fonts.md)
|
|
||||||
- [Backgrounds](manual/39-backgrounds.md)
|
|
||||||
- [Prompt](manual/40-prompt.md)
|
|
||||||
- [Branding](manual/41-branding.md)
|
|
||||||
- [Common tweaks](manual/42-common-tweaks.md)
|
|
||||||
- [Extra themes](manual/43-extra-themes.md)
|
|
||||||
- [Making your own theme](manual/44-making-your-own-theme.md)
|
|
||||||
|
|
||||||
**The Rest**
|
Omarchy 完整英文手册在 [`manual/`](manual/) 目录,亦见 [learn.omacom.io](https://learn.omacom.io/2/the-omarchy-manual)。
|
||||||
|
|
||||||
- [Mac support](manual/45-mac-support.md)
|
## 声明与许可证
|
||||||
- [Troubleshooting](manual/46-troubleshooting.md)
|
|
||||||
- [FAQ](manual/47-faq.md)
|
|
||||||
- [System snapshots](manual/48-system-snapshots.md)
|
|
||||||
- [Security](manual/49-security.md)
|
|
||||||
- [Omarchy on...](manual/50-omarchy-on.md)
|
|
||||||
- [Dual Boot Install](manual/51-dual-boot-install.md)
|
|
||||||
- [Unattended Installs](manual/52-unattended-installs.md)
|
|
||||||
|
|
||||||
## License
|
OmarchyCN is an independent community distribution based on Omarchy. OmarchyCN is not affiliated with or endorsed by Basecamp, 37signals, or the Omarchy maintainers.
|
||||||
|
|
||||||
Omarchy is released under the [MIT License](https://opensource.org/licenses/MIT).
|
代码沿用上游 [MIT License](LICENSE),保留 Omarchy 原始版权声明。
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
# 安全政策
|
||||||
|
|
||||||
|
## 报告漏洞
|
||||||
|
|
||||||
|
请勿在公开 issue 中披露安全漏洞。发送邮件至:
|
||||||
|
|
||||||
|
**zhangyanghaha0407@outlook.com**(主题注明 [OmarchyCN Security])
|
||||||
|
|
||||||
|
请附:影响版本、复现步骤、影响面评估。我们在 72 小时内确认,修复后在
|
||||||
|
Release Notes 中致谢(除非你要求匿名)。
|
||||||
|
|
||||||
|
## 范围
|
||||||
|
|
||||||
|
- OmarchyCN 软件包、ISO、安装与更新脚本、Registry 与签名链路
|
||||||
|
- 上游 Omarchy / Arch / Hyprland 的漏洞请报给对应上游项目
|
||||||
|
|
||||||
|
## 签名验证
|
||||||
|
|
||||||
|
Release 产物的 PGP 公钥与验证方法见 [docs/release-signing.md](docs/release-signing.md)。
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=Basecamp
|
|
||||||
Exec=omarchy-launch-webapp https://launchpad.37signals.com
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=basecamp
|
|
||||||
StartupNotify=true
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=Discord
|
|
||||||
Exec=omarchy-launch-webapp https://discord.com/channels/@me
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=omarchy-discord
|
|
||||||
StartupNotify=true
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=Google Contacts
|
|
||||||
Exec=omarchy-launch-webapp https://contacts.google.com/
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=google-contacts
|
|
||||||
StartupNotify=true
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=Google Maps
|
|
||||||
Exec=omarchy-launch-webapp https://maps.google.com
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=google-maps
|
|
||||||
StartupNotify=true
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=Google Messages
|
|
||||||
Exec=omarchy-launch-webapp https://messages.google.com/web/conversations
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=google-messages
|
|
||||||
StartupNotify=true
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=Google Photos
|
|
||||||
Exec=omarchy-launch-webapp https://photos.google.com/
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=google-photos
|
|
||||||
StartupNotify=true
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=HEY
|
|
||||||
Exec=omarchy-webapp-handler-hey %u
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=hey
|
|
||||||
StartupNotify=true
|
|
||||||
MimeType=x-scheme-handler/mailto
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=WhatsApp
|
|
||||||
Exec=omarchy-launch-webapp https://web.whatsapp.com/
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=whatsapp
|
|
||||||
StartupNotify=true
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
[Desktop Entry]
|
|
||||||
Version=1.0
|
|
||||||
Name=X
|
|
||||||
Exec=omarchy-launch-webapp https://x.com/
|
|
||||||
Terminal=false
|
|
||||||
Type=Application
|
|
||||||
Icon=x
|
|
||||||
StartupNotify=true
|
|
||||||
|
Before Width: | Height: | Size: 147 KiB |
|
Before Width: | Height: | Size: 20 KiB |
|
Before Width: | Height: | Size: 21 KiB |
|
Before Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 196 KiB |
|
Before Width: | Height: | Size: 33 KiB |
|
Before Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 22 KiB |
@@ -39,6 +39,7 @@ GROUP_DESCRIPTIONS[capture]="Screenshots and screen recording"
|
|||||||
GROUP_DESCRIPTIONS[channel]="Omarchy release channel management"
|
GROUP_DESCRIPTIONS[channel]="Omarchy release channel management"
|
||||||
GROUP_DESCRIPTIONS[clipboard]="Clipboard helpers"
|
GROUP_DESCRIPTIONS[clipboard]="Clipboard helpers"
|
||||||
GROUP_DESCRIPTIONS[cmd]="Command and shortcut helpers"
|
GROUP_DESCRIPTIONS[cmd]="Command and shortcut helpers"
|
||||||
|
GROUP_DESCRIPTIONS[cn]="OmarchyCN China environment integration"
|
||||||
GROUP_DESCRIPTIONS[config]="System configuration helpers"
|
GROUP_DESCRIPTIONS[config]="System configuration helpers"
|
||||||
GROUP_DESCRIPTIONS[debug]="Diagnostics and support logs"
|
GROUP_DESCRIPTIONS[debug]="Diagnostics and support logs"
|
||||||
GROUP_DESCRIPTIONS[finalize]="Finalize user setup"
|
GROUP_DESCRIPTIONS[finalize]="Finalize user setup"
|
||||||
|
|||||||
@@ -99,6 +99,14 @@ pi)
|
|||||||
command=(pi)
|
command=(pi)
|
||||||
[[ -n ${prompt:-} ]] && command+=("$prompt")
|
[[ -n ${prompt:-} ]] && command+=("$prompt")
|
||||||
;;
|
;;
|
||||||
|
kimi)
|
||||||
|
command=(kimi)
|
||||||
|
[[ -n ${prompt:-} ]] && command+=(--prompt "$prompt")
|
||||||
|
;;
|
||||||
|
deepcode)
|
||||||
|
command=(deepcode)
|
||||||
|
[[ -n ${prompt:-} ]] && command+=("$prompt")
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Unsupported default agent: $agent" >&2
|
echo "Unsupported default agent: $agent" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -0,0 +1,81 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Map an AI profile onto Omarchy's default agent and hotkey
|
||||||
|
# omarchy:args=[profile]
|
||||||
|
# omarchy:examples=omarchycn ai default | omarchycn ai default work
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/ai.sh"
|
||||||
|
|
||||||
|
profile="${1:-$(cn_ai_current_profile)}"
|
||||||
|
|
||||||
|
if [[ ! -f $CN_AI_PROFILE_DIR/$profile.toml ]]; then
|
||||||
|
echo "No such profile: $profile" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
harness=$(cn_ai_profile_field "$profile" harness)
|
||||||
|
provider=$(cn_ai_profile_field "$profile" provider)
|
||||||
|
model=$(cn_ai_profile_field "$profile" model)
|
||||||
|
|
||||||
|
# Only harnesses whose provider config persists in their own files can back
|
||||||
|
# the upstream hotkey; opencode is session-env only, natives self-auth
|
||||||
|
case "$harness" in
|
||||||
|
claude-code) agent="claude" ;;
|
||||||
|
codex) agent="codex" ;;
|
||||||
|
*)
|
||||||
|
echo "$harness 无法映射为上游默认 Agent;用 omarchycn ai launch $profile 启动" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
command=$(cn_ai_harness_field "$harness" command)
|
||||||
|
if omarchy-cmd-missing "$command"; then
|
||||||
|
install=$(cn_ai_harness_field "$harness" install)
|
||||||
|
echo "Installing $harness: $install"
|
||||||
|
$install
|
||||||
|
fi
|
||||||
|
|
||||||
|
key=$(omarchy-cn-ai-secret get "$provider")
|
||||||
|
|
||||||
|
case "$harness" in
|
||||||
|
claude-code)
|
||||||
|
# Persist provider env in Claude Code's own settings so the upstream
|
||||||
|
# Super+Shift+Ctrl+A -> omarchy-agent path launches fully configured
|
||||||
|
settings="$HOME/.claude/settings.json"
|
||||||
|
mkdir -p "${settings%/*}"
|
||||||
|
base=$(cn_ai_endpoint "$provider" anthropic)
|
||||||
|
fast=$(cn_ai_fast_model "$provider")
|
||||||
|
current="{}"
|
||||||
|
if [[ -s $settings ]]; then
|
||||||
|
current=$(cat "$settings")
|
||||||
|
cp "$settings" "$settings.omarchycn-bak-$(date +%Y%m%d-%H%M%S)"
|
||||||
|
fi
|
||||||
|
# Key reaches jq via environment, never the argument list
|
||||||
|
rm -f "$settings.omarchycn-new"
|
||||||
|
(
|
||||||
|
umask 077
|
||||||
|
CN_AI_KEY="$key" jq --arg base "$base" --arg model "$model" --arg fast "$fast" \
|
||||||
|
'.env = (.env // {}) + {
|
||||||
|
ANTHROPIC_BASE_URL: $base,
|
||||||
|
ANTHROPIC_AUTH_TOKEN: env.CN_AI_KEY,
|
||||||
|
ANTHROPIC_API_KEY: env.CN_AI_KEY,
|
||||||
|
ANTHROPIC_MODEL: $model,
|
||||||
|
ANTHROPIC_DEFAULT_SONNET_MODEL: $model,
|
||||||
|
ANTHROPIC_DEFAULT_OPUS_MODEL: $model,
|
||||||
|
ANTHROPIC_DEFAULT_HAIKU_MODEL: $fast
|
||||||
|
}' <<<"$current" > "$settings.omarchycn-new"
|
||||||
|
)
|
||||||
|
mv "$settings.omarchycn-new" "$settings"
|
||||||
|
;;
|
||||||
|
codex)
|
||||||
|
cn_ai_render_codex_config "$provider" "$model" "$key"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
agent_file="$HOME/.config/omarchy/defaults/agent"
|
||||||
|
mkdir -p "${agent_file%/*}"
|
||||||
|
printf '%s\n' "$agent" > "$agent_file"
|
||||||
|
|
||||||
|
echo "默认 Agent: $agent($profile: $provider x $model)"
|
||||||
|
echo "快捷键 Super+Shift+Ctrl+A 或 'omarchy agent' 将以该配置启动"
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Check AI harness installation, credentials, and endpoint health
|
||||||
|
# omarchy:examples=omarchycn ai doctor
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/ai.sh"
|
||||||
|
|
||||||
|
failures=0
|
||||||
|
|
||||||
|
profile=$(cn_ai_current_profile 2>/dev/null || true)
|
||||||
|
if [[ -z $profile ]]; then
|
||||||
|
echo "INFO ai: 未设置默认 Profile (omarchycn ai profile use <name>)"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "INFO ai: current profile $profile"
|
||||||
|
|
||||||
|
if [[ ! -f $CN_AI_PROFILE_DIR/$profile.toml ]]; then
|
||||||
|
echo "FAIL ai: 默认 Profile $profile 的文件不存在 (omarchycn ai profile list)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
harness=$(cn_ai_profile_field "$profile" harness)
|
||||||
|
provider=$(cn_ai_profile_field "$profile" provider)
|
||||||
|
command=$(cn_ai_harness_field "$harness" command)
|
||||||
|
proto=$(cn_ai_harness_field "$harness" protocol)
|
||||||
|
|
||||||
|
if omarchy-cmd-present "$command"; then
|
||||||
|
echo "PASS ai: harness $harness installed ($command)"
|
||||||
|
else
|
||||||
|
install=$(cn_ai_harness_field "$harness" install)
|
||||||
|
if [[ $install == doc:* ]]; then
|
||||||
|
echo "WARN ai: harness $harness 未安装,需手动安装: ${install#doc:}"
|
||||||
|
else
|
||||||
|
echo "WARN ai: harness $harness 未安装,首次 launch 时自动安装"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $proto == "native" ]]; then
|
||||||
|
echo "INFO ai: $harness 自管鉴权,跳过 OmarchyCN Key 检查"
|
||||||
|
elif omarchy-cn-ai-secret get "$provider" > /dev/null 2>&1; then
|
||||||
|
echo "PASS ai: $provider API Key stored"
|
||||||
|
else
|
||||||
|
echo "FAIL ai: $provider API Key 未存储 (omarchycn ai secret set $provider)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $proto != "native" ]]; then
|
||||||
|
base=$(cn_ai_endpoint "$provider" "$proto")
|
||||||
|
host=$(sed -E 's|https?://([^/]+).*|\1|' <<<"$base")
|
||||||
|
if getent hosts "$host" > /dev/null 2>&1; then
|
||||||
|
echo "PASS ai: endpoint DNS resolves ($host)"
|
||||||
|
else
|
||||||
|
echo "FAIL ai: endpoint DNS 无法解析 ($host)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit $((failures > 0 ? 1 : 0))
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Launch the AI harness configured by a profile
|
||||||
|
# omarchy:args=[profile]
|
||||||
|
# omarchy:examples=omarchycn ai launch | omarchycn ai launch work
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/ai.sh"
|
||||||
|
|
||||||
|
profile="${1:-$(cn_ai_current_profile)}"
|
||||||
|
|
||||||
|
if [[ ! -f $CN_AI_PROFILE_DIR/$profile.toml ]]; then
|
||||||
|
echo "No such profile: $profile" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
harness=$(cn_ai_profile_field "$profile" harness)
|
||||||
|
provider=$(cn_ai_profile_field "$profile" provider)
|
||||||
|
model=$(cn_ai_profile_field "$profile" model)
|
||||||
|
command=$(cn_ai_harness_field "$harness" command)
|
||||||
|
config_method=$(cn_ai_harness_field "$harness" config_method)
|
||||||
|
|
||||||
|
if omarchy-cmd-missing "$command"; then
|
||||||
|
install=$(cn_ai_harness_field "$harness" install)
|
||||||
|
if [[ $install == doc:* ]]; then
|
||||||
|
echo "$harness 未安装,安装方法见官方文档: ${install#doc:}" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Installing $harness: $install"
|
||||||
|
$install
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$config_method" in
|
||||||
|
env)
|
||||||
|
key=$(omarchy-cn-ai-secret get "$provider")
|
||||||
|
if [[ $harness == "codex" ]]; then
|
||||||
|
cn_ai_render_codex_config "$provider" "$model" "$key"
|
||||||
|
exec "$command"
|
||||||
|
fi
|
||||||
|
env_exports=$(cn_ai_render_env "$harness" "$provider" "$model" "$key")
|
||||||
|
eval "$env_exports"
|
||||||
|
exec "$command"
|
||||||
|
;;
|
||||||
|
native)
|
||||||
|
# Native harnesses (kimi-code, deep-code) manage their own auth
|
||||||
|
exec "$command"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown config method: $config_method" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Create an AI profile binding a harness, provider, and model
|
||||||
|
# omarchy:args=<name> <harness> <provider> <model|default-coding|fast>
|
||||||
|
# omarchy:examples=omarchycn ai profile create work claude-code deepseek default-coding
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/ai.sh"
|
||||||
|
|
||||||
|
name="${1:?usage: omarchycn ai profile create <name> <harness> <provider> <model>}"
|
||||||
|
harness="${2:?missing harness}"
|
||||||
|
provider="${3:?missing provider}"
|
||||||
|
model="${4:?missing model}"
|
||||||
|
|
||||||
|
if [[ ! $name =~ ^[a-z0-9-]+$ ]]; then
|
||||||
|
echo "Profile name must be lowercase alphanumeric/dashes: $name" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cn_ai_harness_field "$harness" command > /dev/null || {
|
||||||
|
echo "Unknown harness: $harness (known: $(cn_ai_harness_ids | tr '\n' ' '))" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
jq -e --arg p "$provider" '.providers[$p]' "$CN_AI_PROVIDERS" > /dev/null || {
|
||||||
|
echo "Unknown provider: $provider (known: $(cn_ai_provider_ids | tr '\n' ' '))" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
level=$(cn_ai_combo_level "$harness" "$provider")
|
||||||
|
if [[ $level == "unsupported" ]]; then
|
||||||
|
echo "Combo $harness x $provider is not in the compatibility matrix" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
allowlist=$(cn_ai_combo_models "$harness" "$provider")
|
||||||
|
if [[ -n $allowlist ]]; then
|
||||||
|
# Combo-restricted model set (e.g. codex uses its own catalog slugs)
|
||||||
|
if ! grep -qxF "$model" <<<"$allowlist"; then
|
||||||
|
echo "Model $model not supported for $harness x $provider" >&2
|
||||||
|
echo "Supported: $(tr '\n' ' ' <<<"$allowlist")" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
resolved=$(cn_ai_model_by_alias "$provider" "$model" 2>/dev/null || true)
|
||||||
|
if [[ -n $resolved ]]; then
|
||||||
|
model="$resolved"
|
||||||
|
elif ! cn_ai_models "$provider" | grep -qxF "$model"; then
|
||||||
|
echo "Unknown model for $provider: $model" >&2
|
||||||
|
echo "Available: $(cn_ai_models "$provider" | tr '\n' ' ')" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
model_proto=$(cn_ai_model_protocol "$provider" "$model")
|
||||||
|
harness_proto=$(cn_ai_harness_field "$harness" protocol)
|
||||||
|
if [[ -n $model_proto && $model_proto != "$harness_proto" ]]; then
|
||||||
|
echo "Model $model speaks $model_proto, but $harness needs $harness_proto" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$CN_AI_PROFILE_DIR"
|
||||||
|
cat > "$CN_AI_PROFILE_DIR/$name.toml" <<EOF
|
||||||
|
schema_version = 1
|
||||||
|
name = "$name"
|
||||||
|
harness = "$harness"
|
||||||
|
provider = "$provider"
|
||||||
|
model = "$model"
|
||||||
|
secret_ref = "omarchycn://ai/$provider"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "Profile $name: $harness x $provider x $model (compat: $level)"
|
||||||
|
if ! omarchy-cn-ai-secret get "$provider" > /dev/null 2>&1; then
|
||||||
|
echo "提示: 尚未存储 $provider 的 API Key,运行: omarchycn ai secret set $provider"
|
||||||
|
fi
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=List AI profiles and the current default
|
||||||
|
# omarchy:examples=omarchycn ai profile list
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/ai.sh"
|
||||||
|
|
||||||
|
current=""
|
||||||
|
if [[ -f $CN_AI_CURRENT ]]; then
|
||||||
|
current=$(<"$CN_AI_CURRENT")
|
||||||
|
fi
|
||||||
|
|
||||||
|
found="false"
|
||||||
|
for f in "$CN_AI_PROFILE_DIR"/*.toml; do
|
||||||
|
[[ -f $f ]] || continue
|
||||||
|
found="true"
|
||||||
|
name="${f##*/}"
|
||||||
|
name="${name%.toml}"
|
||||||
|
marker=" "
|
||||||
|
[[ $name == "$current" ]] && marker="*"
|
||||||
|
printf '%s %-14s %s x %s x %s\n' "$marker" "$name" \
|
||||||
|
"$(cn_ai_profile_field "$name" harness)" \
|
||||||
|
"$(cn_ai_profile_field "$name" provider)" \
|
||||||
|
"$(cn_ai_profile_field "$name" model)"
|
||||||
|
done
|
||||||
|
|
||||||
|
if [[ $found == "false" ]]; then
|
||||||
|
echo "No profiles (create: omarchycn ai profile create <name> <harness> <provider> <model>)"
|
||||||
|
fi
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Set the default AI profile
|
||||||
|
# omarchy:args=<name>
|
||||||
|
# omarchy:examples=omarchycn ai profile use work
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/ai.sh"
|
||||||
|
|
||||||
|
name="${1:?usage: omarchycn ai profile use <name>}"
|
||||||
|
|
||||||
|
if [[ ! -f $CN_AI_PROFILE_DIR/$name.toml ]]; then
|
||||||
|
echo "No such profile: $name (see: omarchycn ai profile list)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
mkdir -p "${CN_AI_CURRENT%/*}"
|
||||||
|
echo "$name" > "$CN_AI_CURRENT"
|
||||||
|
echo "Default AI profile: $name"
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Store, read, or delete AI provider API keys
|
||||||
|
# omarchy:args=<set|get|rm> <provider>
|
||||||
|
# omarchy:examples=omarchycn ai secret set deepseek | omarchycn ai secret get deepseek
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
action="${1:?usage: omarchycn ai secret <set|get|rm> <provider>}"
|
||||||
|
provider="${2:?usage: omarchycn ai secret <set|get|rm> <provider>}"
|
||||||
|
|
||||||
|
if [[ ! $provider =~ ^[a-z0-9-]+$ ]]; then
|
||||||
|
echo "Invalid provider name: $provider" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
FILE_DIR="$HOME/.local/state/omarchycn/secrets"
|
||||||
|
FILE_PATH="$FILE_DIR/$provider"
|
||||||
|
|
||||||
|
secret_service_ok() {
|
||||||
|
omarchy-cmd-present secret-tool && secret-tool search service omarchycn > /dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
pass_ok() {
|
||||||
|
omarchy-cmd-present pass && pass ls > /dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$action" in
|
||||||
|
set)
|
||||||
|
if [[ -t 0 ]]; then
|
||||||
|
read -rs -p "API key for $provider: " key
|
||||||
|
echo
|
||||||
|
else
|
||||||
|
IFS= read -r key || true
|
||||||
|
fi
|
||||||
|
if [[ -z $key ]]; then
|
||||||
|
echo "Empty key refused" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if secret_service_ok; then
|
||||||
|
printf '%s' "$key" | secret-tool store --label "OmarchyCN AI: $provider" service omarchycn key "ai/$provider"
|
||||||
|
# Purge stale copies in lower-priority backends so get never falls
|
||||||
|
# through to an outdated key; a failed purge fails the set.
|
||||||
|
# Existence check is decryption-free (store file on disk).
|
||||||
|
if pass_ok && [[ -f ${PASSWORD_STORE_DIR:-$HOME/.password-store}/omarchycn/ai/$provider.gpg ]]; then
|
||||||
|
if ! pass rm -f "omarchycn/ai/$provider" > /dev/null; then
|
||||||
|
echo "存储成功但 pass 中的旧副本清除失败,请手动执行: pass rm omarchycn/ai/$provider" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
rm -f "$FILE_PATH"
|
||||||
|
echo "Stored in Secret Service (secret-tool)"
|
||||||
|
elif pass_ok; then
|
||||||
|
printf '%s\n' "$key" | pass insert -m -f "omarchycn/ai/$provider" > /dev/null
|
||||||
|
rm -f "$FILE_PATH"
|
||||||
|
echo "Stored in pass (omarchycn/ai/$provider)"
|
||||||
|
else
|
||||||
|
mkdir -p "$FILE_DIR"
|
||||||
|
chmod 700 "$FILE_DIR"
|
||||||
|
rm -f "$FILE_PATH"
|
||||||
|
(umask 177 && printf '%s' "$key" > "$FILE_PATH")
|
||||||
|
echo "Stored in $FILE_PATH (0600 file fallback — 安装 libsecret 或 pass 可获得更安全的存储)"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
get)
|
||||||
|
if secret_service_ok && secret-tool lookup service omarchycn key "ai/$provider" 2>/dev/null; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
if pass_ok && pass show "omarchycn/ai/$provider" 2>/dev/null; then
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
if [[ -f $FILE_PATH ]]; then
|
||||||
|
cat "$FILE_PATH"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
echo "No secret stored for $provider (run: omarchycn ai secret set $provider)" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
rm)
|
||||||
|
removed=0
|
||||||
|
if secret_service_ok && secret-tool clear service omarchycn key "ai/$provider" 2>/dev/null; then
|
||||||
|
removed=1
|
||||||
|
fi
|
||||||
|
if pass_ok && pass rm -f "omarchycn/ai/$provider" > /dev/null 2>&1; then
|
||||||
|
removed=1
|
||||||
|
fi
|
||||||
|
if [[ -f $FILE_PATH ]]; then
|
||||||
|
rm -f "$FILE_PATH"
|
||||||
|
removed=1
|
||||||
|
fi
|
||||||
|
if omarchy-cmd-present secret-tool && ! secret_service_ok; then
|
||||||
|
echo "Secret Service 不可达,无法确认其中的副本已清除;服务恢复后重新执行 rm" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if (( removed == 0 )); then
|
||||||
|
echo "No secret stored for $provider" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Secret for $provider removed"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown action: $action (expected set, get, or rm)" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Interactive wizard: pick harness, provider, model, store key, test
|
||||||
|
# omarchy:examples=omarchycn ai setup
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/ai.sh"
|
||||||
|
|
||||||
|
if [[ ! -t 0 ]]; then
|
||||||
|
echo "omarchycn ai setup 需要交互终端;非交互场景用 omarchycn ai profile create" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
harness=$(cn_ai_harness_ids | gum choose --header "选择 Harness")
|
||||||
|
|
||||||
|
# Only combos whose adapter actually renders at launch
|
||||||
|
mapfile -t providers < <(jq -r --arg h "$harness" \
|
||||||
|
'.combos[$h] | to_entries[] | select(.value.adapter) | .key' "$CN_AI_COMPAT")
|
||||||
|
if (( ${#providers[@]} == 0 )); then
|
||||||
|
echo "兼容矩阵中没有 $harness 的可用 Provider 组合" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
provider=$(printf '%s\n' "${providers[@]}" | gum choose --header "选择 Provider(兼容级别见 docs)")
|
||||||
|
|
||||||
|
harness_proto=$(cn_ai_harness_field "$harness" protocol)
|
||||||
|
allowlist=$(cn_ai_combo_models "$harness" "$provider")
|
||||||
|
if [[ -n $allowlist ]]; then
|
||||||
|
model=$(gum choose --header "选择模型" <<<"$allowlist")
|
||||||
|
else
|
||||||
|
# Hide models bound to a different wire protocol than the harness speaks
|
||||||
|
model=$(jq -r --arg p "$provider" --arg hp "$harness_proto" \
|
||||||
|
'.providers[$p].models[] | select((.protocol // $hp) == $hp) | .id' \
|
||||||
|
"$CN_AI_PROVIDERS" | gum choose --header "选择模型")
|
||||||
|
fi
|
||||||
|
|
||||||
|
default_name="$harness-$provider"
|
||||||
|
name=$(gum input --header "Profile 名称" --value "$default_name")
|
||||||
|
|
||||||
|
proto=$(cn_ai_harness_field "$harness" protocol)
|
||||||
|
if [[ $proto == "native" ]]; then
|
||||||
|
omarchy-cn-ai-profile-create "$name" "$harness" "$provider" "$model"
|
||||||
|
omarchy-cn-ai-profile-use "$name"
|
||||||
|
echo "$harness 自管鉴权:首次启动时按其官方流程登录/配置"
|
||||||
|
echo "完成。启动: omarchycn ai launch"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! omarchy-cn-ai-secret get "$provider" > /dev/null 2>&1; then
|
||||||
|
key=$(gum input --password --header "$provider API Key(获取: $(jq -r --arg p "$provider" '.providers[$p].key_url' "$CN_AI_PROVIDERS"))")
|
||||||
|
printf '%s' "$key" | omarchy-cn-ai-secret set "$provider"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Keep any existing profile intact until the new config proves itself
|
||||||
|
profile_file="$CN_AI_PROFILE_DIR/$name.toml"
|
||||||
|
if [[ -f $profile_file ]]; then
|
||||||
|
cp "$profile_file" "$profile_file.omarchycn-prev"
|
||||||
|
fi
|
||||||
|
|
||||||
|
omarchy-cn-ai-profile-create "$name" "$harness" "$provider" "$model"
|
||||||
|
|
||||||
|
if gum confirm "运行连接测试?"; then
|
||||||
|
if ! omarchy-cn-ai-test "$name"; then
|
||||||
|
if [[ -f $profile_file.omarchycn-prev ]]; then
|
||||||
|
mv "$profile_file.omarchycn-prev" "$profile_file"
|
||||||
|
echo "测试未通过,已恢复原 Profile $name" >&2
|
||||||
|
else
|
||||||
|
rm -f "$profile_file"
|
||||||
|
echo "测试未通过,Profile $name 未保留" >&2
|
||||||
|
fi
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f "$profile_file.omarchycn-prev"
|
||||||
|
omarchy-cn-ai-profile-use "$name"
|
||||||
|
|
||||||
|
if [[ $harness == "claude-code" || $harness == "codex" ]]; then
|
||||||
|
if gum confirm "设为系统默认 Agent(Super+Shift+Ctrl+A)?"; then
|
||||||
|
omarchy-cn-ai-default "$name"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo "完成。启动: omarchycn ai launch"
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Test connectivity, auth, and model availability for an AI profile
|
||||||
|
# omarchy:args=[profile]
|
||||||
|
# omarchy:examples=omarchycn ai test | omarchycn ai test work
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/ai.sh"
|
||||||
|
|
||||||
|
profile="${1:-$(cn_ai_current_profile)}"
|
||||||
|
|
||||||
|
if [[ ! -f $CN_AI_PROFILE_DIR/$profile.toml ]]; then
|
||||||
|
echo "No such profile: $profile" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
harness=$(cn_ai_profile_field "$profile" harness)
|
||||||
|
provider=$(cn_ai_profile_field "$profile" provider)
|
||||||
|
model=$(cn_ai_profile_field "$profile" model)
|
||||||
|
proto=$(cn_ai_harness_field "$harness" protocol)
|
||||||
|
# Codex speaks the Responses API (wire_api=responses), not chat/completions
|
||||||
|
[[ $harness == "codex" ]] && proto="openai-responses"
|
||||||
|
failures=0
|
||||||
|
|
||||||
|
if [[ $proto == "native" ]]; then
|
||||||
|
echo "INFO ai-test: $harness 自管鉴权,本测试仅覆盖 env/config 型 Harness"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Endpoint override for mock-server tests
|
||||||
|
base="${OMARCHYCN_AI_TEST_BASE_URL:-$(cn_ai_endpoint "$provider" "${proto%-responses}")}"
|
||||||
|
echo "INFO ai-test: $profile ($harness x $provider x $model) -> $base"
|
||||||
|
|
||||||
|
if ! key=$(omarchy-cn-ai-secret get "$provider" 2>/dev/null); then
|
||||||
|
echo "FAIL ai-test: 未存储 $provider 的 API Key (omarchycn ai secret set $provider)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
body=$(mktemp)
|
||||||
|
trap 'rm -f "$body"' EXIT
|
||||||
|
|
||||||
|
case "$proto" in
|
||||||
|
anthropic)
|
||||||
|
code=$(curl -sS -o "$body" -w '%{http_code}' -m 30 --connect-timeout 8 \
|
||||||
|
-X POST "${base%/}/v1/messages" \
|
||||||
|
-H "x-api-key: $key" -H "authorization: Bearer $key" \
|
||||||
|
-H "anthropic-version: 2023-06-01" -H "content-type: application/json" \
|
||||||
|
-d "{\"model\":\"$model\",\"max_tokens\":8,\"messages\":[{\"role\":\"user\",\"content\":\"ping\"}]}" || true)
|
||||||
|
;;
|
||||||
|
openai)
|
||||||
|
code=$(curl -sS -o "$body" -w '%{http_code}' -m 30 --connect-timeout 8 \
|
||||||
|
-X POST "${base%/}/chat/completions" \
|
||||||
|
-H "Authorization: Bearer $key" -H "content-type: application/json" \
|
||||||
|
-d "{\"model\":\"$model\",\"max_tokens\":8,\"messages\":[{\"role\":\"user\",\"content\":\"ping\"}]}" || true)
|
||||||
|
;;
|
||||||
|
openai-responses)
|
||||||
|
code=$(curl -sS -o "$body" -w '%{http_code}' -m 30 --connect-timeout 8 \
|
||||||
|
-X POST "${base%/}/responses" \
|
||||||
|
-H "Authorization: Bearer $key" -H "content-type: application/json" \
|
||||||
|
-d "{\"model\":\"$model\",\"input\":\"ping\",\"max_output_tokens\":16}" || true)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "FAIL ai-test: unknown protocol $proto"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
[[ -z $code ]] && code=000
|
||||||
|
|
||||||
|
case "$code" in
|
||||||
|
200)
|
||||||
|
echo "PASS ai-test: 连接、鉴权与模型调用成功 (HTTP 200)"
|
||||||
|
;;
|
||||||
|
401 | 403)
|
||||||
|
echo "FAIL ai-test: 鉴权失败 (HTTP $code),检查 API Key"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
;;
|
||||||
|
404 | 400 | 422)
|
||||||
|
echo "FAIL ai-test: 端点可达但请求被拒 (HTTP $code),可能是模型名问题"
|
||||||
|
head -c 200 "$body" 2>/dev/null && echo
|
||||||
|
failures=$((failures + 1))
|
||||||
|
;;
|
||||||
|
000)
|
||||||
|
echo "FAIL ai-test: 无法连接 $base (DNS/TLS/网络)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "FAIL ai-test: HTTP $code"
|
||||||
|
head -c 200 "$body" 2>/dev/null && echo
|
||||||
|
failures=$((failures + 1))
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
rm -f $body
|
||||||
|
exit $((failures > 0 ? 1 : 0))
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Install a China app from the catalog with source confirmation
|
||||||
|
# omarchy:args=<app-id> [--yes]
|
||||||
|
# omarchy:examples=omarchycn app install wechat | omarchycn app install tencent-docs
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
APPS_JSON="$OMARCHY_PATH/cn/apps.json"
|
||||||
|
|
||||||
|
app="${1:?usage: omarchycn app install <app-id> (see: omarchycn app list)}"
|
||||||
|
yes="${2:-}"
|
||||||
|
|
||||||
|
entry=$(jq -e --arg a "$app" '.apps[$a]' "$APPS_JSON") || {
|
||||||
|
echo "Unknown app: $app (see: omarchycn app list)" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
name=$(jq -r '.name' <<<"$entry")
|
||||||
|
source_type=$(jq -r '.source' <<<"$entry")
|
||||||
|
license=$(jq -r '.license' <<<"$entry")
|
||||||
|
|
||||||
|
if [[ $license == "proprietary" && $yes != "--yes" ]]; then
|
||||||
|
pkg=$(jq -r '.package' <<<"$entry")
|
||||||
|
echo "$name 为专有软件,来源: AUR/$pkg(构建脚本公开,二进制来自厂商)"
|
||||||
|
if [[ -t 0 ]]; then
|
||||||
|
gum confirm "确认安装?" || exit 1
|
||||||
|
else
|
||||||
|
echo "非交互环境需显式加 --yes 确认专有软件安装" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$source_type" in
|
||||||
|
aur)
|
||||||
|
omarchy-pkg-aur-add "$(jq -r '.package' <<<"$entry")"
|
||||||
|
;;
|
||||||
|
webapp)
|
||||||
|
omarchy-webapp-install "$name" "$(jq -r '.url' <<<"$entry")" "$(jq -r '.icon' <<<"$entry")"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown source type: $source_type" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
echo "$name 安装完成"
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=List China app catalog entries and their sources
|
||||||
|
# omarchy:examples=omarchycn app list
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
APPS_JSON="$OMARCHY_PATH/cn/apps.json"
|
||||||
|
|
||||||
|
printf '%-14s %-10s %-8s %-12s %s\n' "ID" "NAME" "SOURCE" "LICENSE" "PACKAGE/URL"
|
||||||
|
jq -r '.apps | to_entries[] |
|
||||||
|
[.key, .value.name, .value.source, .value.license, (.value.package // .value.url)] | @tsv' \
|
||||||
|
"$APPS_JSON" |
|
||||||
|
while IFS=$'\t' read -r id name source license ref; do
|
||||||
|
printf '%-14s %-10s %-8s %-12s %s\n' "$id" "$name" "$source" "$license" "$ref"
|
||||||
|
done
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Show or set the OmarchyCN release channel
|
||||||
|
# omarchy:args=[stable|beta|nightly]
|
||||||
|
# omarchy:examples=omarchycn channel | omarchycn channel beta
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
CHANNEL_FILE="$HOME/.config/omarchycn/channel"
|
||||||
|
|
||||||
|
if (( $# == 0 )); then
|
||||||
|
if [[ -f $CHANNEL_FILE ]]; then
|
||||||
|
cat "$CHANNEL_FILE"
|
||||||
|
else
|
||||||
|
echo "beta (default)"
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
case "$1" in
|
||||||
|
stable | beta | nightly)
|
||||||
|
mkdir -p "${CHANNEL_FILE%/*}"
|
||||||
|
echo "$1" > "$CHANNEL_FILE"
|
||||||
|
echo "Channel: $1"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown channel: $1 (stable|beta|nightly)" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Apply china or official registry profile to development tools
|
||||||
|
# omarchy:args=<china|official> [--target npm,pip,cargo,go,gem,docker]
|
||||||
|
# omarchy:examples=omarchycn dev-mirror apply china | omarchycn dev-mirror apply official --target npm,pip
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/dev-mirror.sh"
|
||||||
|
|
||||||
|
profile="${1:?usage: omarchycn dev-mirror apply <china|official> [--target a,b]}"
|
||||||
|
shift
|
||||||
|
|
||||||
|
if [[ $profile != "china" && $profile != "official" ]]; then
|
||||||
|
echo "Unknown profile: $profile (expected china or official)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
targets=("${CN_DM_TARGETS[@]}")
|
||||||
|
if [[ ${1:-} == "--target" ]]; then
|
||||||
|
IFS=',' read -ra targets <<<"${2:?--target needs a comma-separated list}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
stamp=$(date +%Y%m%d-%H%M%S)
|
||||||
|
|
||||||
|
for target in "${targets[@]}"; do
|
||||||
|
if [[ ! " ${CN_DM_TARGETS[*]} " == *" $target "* ]]; then
|
||||||
|
echo "Unknown target: $target (known: ${CN_DM_TARGETS[*]})" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
url=$(cn_dm_url "$target" "$profile")
|
||||||
|
cn_dm_backup "$(cn_dm_config_file "$target")" "$stamp"
|
||||||
|
"cn_dm_set_$target" "$url"
|
||||||
|
echo "$target -> ${url:-<default>}"
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "Backups (if any): $CN_DM_BACKUP_ROOT/$stamp"
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Check reachability of each configured development registry
|
||||||
|
# omarchy:examples=omarchycn dev-mirror doctor
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/dev-mirror.sh"
|
||||||
|
|
||||||
|
failures=0
|
||||||
|
|
||||||
|
for target in "${CN_DM_TARGETS[@]}"; do
|
||||||
|
current=$("cn_dm_get_$target")
|
||||||
|
if [[ -z $current ]]; then
|
||||||
|
echo "INFO $target: using tool default"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Reduce to a probe-able https URL
|
||||||
|
probe="${current#sparse+}"
|
||||||
|
probe="${probe%%,*}"
|
||||||
|
if curl -sSf -o /dev/null -m 8 --connect-timeout 5 "$probe" 2>/dev/null; then
|
||||||
|
echo "PASS $target: $current"
|
||||||
|
elif curl -sS -o /dev/null -m 8 --connect-timeout 5 -w '%{http_code}' "$probe" 2>/dev/null | grep -qE '^[34]'; then
|
||||||
|
# Registry roots often answer 3xx/404 to bare GET while the service works
|
||||||
|
echo "PASS $target: $current"
|
||||||
|
else
|
||||||
|
echo "FAIL $target: $current unreachable"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
exit $((failures > 0 ? 1 : 0))
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Show configured registry for each development ecosystem
|
||||||
|
# omarchy:examples=omarchycn dev-mirror list
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/dev-mirror.sh"
|
||||||
|
|
||||||
|
printf '%-8s %-52s %s\n' "TARGET" "CURRENT" "CONFIG"
|
||||||
|
|
||||||
|
for target in "${CN_DM_TARGETS[@]}"; do
|
||||||
|
current=$("cn_dm_get_$target")
|
||||||
|
printf '%-8s %-52s %s\n' "$target" "${current:-<default>}" "$(cn_dm_config_file "$target")"
|
||||||
|
done
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Point one development ecosystem at a custom registry URL
|
||||||
|
# omarchy:args=<target> <url>
|
||||||
|
# omarchy:examples=omarchycn dev-mirror set npm https://registry.example.com
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/dev-mirror.sh"
|
||||||
|
|
||||||
|
target="${1:?usage: omarchycn dev-mirror set <target> <url>}"
|
||||||
|
url="${2:?usage: omarchycn dev-mirror set <target> <url>}"
|
||||||
|
|
||||||
|
if [[ ! " ${CN_DM_TARGETS[*]} " == *" $target "* ]]; then
|
||||||
|
echo "Unknown target: $target (known: ${CN_DM_TARGETS[*]})" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cn_dm_backup "$(cn_dm_config_file "$target")" "$(date +%Y%m%d-%H%M%S)"
|
||||||
|
"cn_dm_set_$target" "$url"
|
||||||
|
echo "$target -> $url"
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Apply a display scale preset with 15s revert confirmation
|
||||||
|
# omarchy:args=<1.0|1.25|1.5|1.6|1.75|2.0>
|
||||||
|
# omarchy:examples=omarchycn display scale 1.6
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
preset="${1:?usage: omarchycn display scale <1.0|1.25|1.5|1.6|1.75|2.0>}"
|
||||||
|
|
||||||
|
case "$preset" in
|
||||||
|
1.0 | 1.25 | 1.5 | 1.6 | 1.75 | 2.0) ;;
|
||||||
|
*)
|
||||||
|
echo "Unknown preset: $preset (supported: 1.0 1.25 1.5 1.6 1.75 2.0)" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
monitors="$HOME/.config/hypr/monitors.lua"
|
||||||
|
if [[ ! -f $monitors ]]; then
|
||||||
|
omarchy-refresh-config hypr/monitors.lua
|
||||||
|
fi
|
||||||
|
|
||||||
|
gdk=$(printf '%.0f' "$preset")
|
||||||
|
backup="$monitors.omarchycn-prev"
|
||||||
|
cp "$monitors" "$backup"
|
||||||
|
|
||||||
|
sed -i -E \
|
||||||
|
-e "s|^local omarchy_monitor_scale = .*|local omarchy_monitor_scale = $preset|" \
|
||||||
|
-e "s|^local omarchy_gdk_scale = .*|local omarchy_gdk_scale = $gdk|" \
|
||||||
|
"$monitors"
|
||||||
|
|
||||||
|
if ! grep -q "omarchy_monitor_scale = $preset" "$monitors" ||
|
||||||
|
! grep -q "omarchy_gdk_scale = $gdk" "$monitors"; then
|
||||||
|
mv "$backup" "$monitors"
|
||||||
|
echo "monitors.lua lacks the omarchy scale lines; reverted, edit it manually" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Monitor scale: $preset, GDK scale: $gdk"
|
||||||
|
|
||||||
|
if [[ -z ${HYPRLAND_INSTANCE_SIGNATURE:-} ]]; then
|
||||||
|
rm -f "$backup"
|
||||||
|
echo "当前不在 Hyprland 会话内,重登录后生效"
|
||||||
|
elif ! hyprctl reload > /dev/null 2>&1; then
|
||||||
|
mv "$backup" "$monitors"
|
||||||
|
echo "hyprctl reload 失败,已恢复原配置" >&2
|
||||||
|
exit 1
|
||||||
|
elif [[ -t 0 ]]; then
|
||||||
|
echo "15 秒内按 y 保留新缩放,超时或按其他键自动恢复"
|
||||||
|
if read -r -t 15 -n 1 answer && [[ $answer == "y" ]]; then
|
||||||
|
rm -f "$backup"
|
||||||
|
echo "已保留"
|
||||||
|
else
|
||||||
|
mv "$backup" "$monitors"
|
||||||
|
hyprctl reload > /dev/null 2>&1
|
||||||
|
echo "已恢复原缩放"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
omarchy-notification-send "OmarchyCN" "缩放已改为 $preset;如异常执行: mv $backup $monitors && hyprctl reload" 2> /dev/null || true
|
||||||
|
echo "无终端交互:已应用;恢复命令: mv $backup $monitors && hyprctl reload"
|
||||||
|
fi
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Check network, pacman mirror, and dev registries; --fix fails over mirrors
|
||||||
|
# omarchy:args=[network|mirror|dev-mirror] [--fix]
|
||||||
|
# omarchy:examples=omarchycn doctor | omarchycn doctor mirror --fix
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/mirror.sh"
|
||||||
|
|
||||||
|
module="all"
|
||||||
|
fix="false"
|
||||||
|
for arg in "$@"; do
|
||||||
|
case "$arg" in
|
||||||
|
all | network | mirror | dev-mirror | ime) module="$arg" ;;
|
||||||
|
--fix) fix="true" ;;
|
||||||
|
*)
|
||||||
|
echo "Unknown argument: $arg" >&2
|
||||||
|
exit 2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
failures=0
|
||||||
|
|
||||||
|
check_network() {
|
||||||
|
local host
|
||||||
|
for host in mirrors.tuna.tsinghua.edu.cn archlinux.org; do
|
||||||
|
if getent hosts "$host" > /dev/null 2>&1; then
|
||||||
|
echo "PASS network: DNS resolves $host"
|
||||||
|
else
|
||||||
|
echo "FAIL network: cannot resolve $host"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if curl -sSf -o /dev/null -m 8 --connect-timeout 5 https://www.baidu.com 2>/dev/null; then
|
||||||
|
echo "PASS network: HTTPS reachable (baidu.com)"
|
||||||
|
else
|
||||||
|
echo "FAIL network: HTTPS unreachable (baidu.com)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_mirror() {
|
||||||
|
local primary speed ttfb age
|
||||||
|
|
||||||
|
primary=$(grep -sE '^Server' "$CN_MIRRORLIST" | head -1 | sed -E 's/^Server = //; s|/\$repo/os/\$arch/?$||' || true)
|
||||||
|
if [[ -z $primary ]]; then
|
||||||
|
echo "FAIL mirror: no Server entries in $CN_MIRRORLIST"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "INFO mirror: primary $primary"
|
||||||
|
read -r speed ttfb age < <(cn_mirror_probe "$primary")
|
||||||
|
if (( speed > 0 )) && [[ $age != "stale" ]]; then
|
||||||
|
echo "PASS mirror: primary healthy ($((speed / 1024)) KB/s, sync age ${age}s)"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "FAIL mirror: primary unhealthy (speed=$speed age=$age)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
|
||||||
|
if [[ $fix == "true" && -f $CN_PROFILE_FILE && $(<"$CN_PROFILE_FILE") == "china" ]]; then
|
||||||
|
echo "INFO mirror: re-applying china profile (auto-failover)"
|
||||||
|
if omarchy-cn-mirror-apply china; then
|
||||||
|
failures=$((failures - 1))
|
||||||
|
omarchy-notification-send "OmarchyCN" "pacman 镜像已自动切换" 2> /dev/null || true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
check_dev_mirror() {
|
||||||
|
omarchy-cn-dev-mirror-doctor || failures=$((failures + 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
check_ime() {
|
||||||
|
omarchy-cn-ime-status || failures=$((failures + 1))
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$module" in
|
||||||
|
network) check_network ;;
|
||||||
|
mirror) check_mirror ;;
|
||||||
|
dev-mirror) check_dev_mirror ;;
|
||||||
|
ime) check_ime ;;
|
||||||
|
all)
|
||||||
|
check_network
|
||||||
|
check_mirror
|
||||||
|
check_dev_mirror
|
||||||
|
check_ime
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if (( failures > 0 )); then
|
||||||
|
echo "Doctor: $failures failure(s)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "Doctor: all checks passed"
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Install CJK fonts and the OmarchyCN fontconfig priority
|
||||||
|
# omarchy:examples=omarchycn font apply
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
omarchy-pkg-add noto-fonts-cjk noto-fonts-emoji
|
||||||
|
|
||||||
|
conf_dir="$HOME/.config/fontconfig/conf.d"
|
||||||
|
mkdir -p "$conf_dir"
|
||||||
|
cp "$OMARCHY_PATH/cn/fontconfig/64-omarchycn-cjk.conf" "$conf_dir/"
|
||||||
|
fc-cache -f > /dev/null
|
||||||
|
|
||||||
|
echo "CJK fonts installed, fontconfig priority applied ($conf_dir/64-omarchycn-cjk.conf)"
|
||||||
|
omarchy-cn-font-status
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Check Chinese font availability and fallback correctness
|
||||||
|
# omarchy:examples=omarchycn font status
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
failures=0
|
||||||
|
|
||||||
|
for family in "Noto Sans CJK SC" "Noto Serif CJK SC" "Noto Sans Mono CJK SC"; do
|
||||||
|
matched=$(fc-match --format '%{family}' "$family")
|
||||||
|
if [[ $matched == *"$family"* ]]; then
|
||||||
|
echo "PASS font: $family"
|
||||||
|
else
|
||||||
|
echo "FAIL font: $family missing (got: $matched)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
zh_sans=$(fc-match --format '%{family}' sans-serif:lang=zh-cn)
|
||||||
|
if [[ $zh_sans == *"CJK SC"* ]]; then
|
||||||
|
echo "PASS fallback: zh-cn sans-serif -> $zh_sans"
|
||||||
|
else
|
||||||
|
echo "FAIL fallback: zh-cn sans-serif -> $zh_sans (expected SC variant)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Untagged requests (Chromium/Electron path) must reach SC before JP/KR
|
||||||
|
untagged=$(fc-match --sort sans-serif | grep -m1 -oE 'CJK (SC|JP|TC|KR|HK)' || true)
|
||||||
|
if [[ $untagged == "CJK SC" ]]; then
|
||||||
|
echo "PASS fallback: untagged CJK -> SC"
|
||||||
|
else
|
||||||
|
echo "FAIL fallback: untagged CJK -> ${untagged:-none} (expected SC)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit $((failures > 0 ? 1 : 0))
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Install Fcitx5 Rime and Chinese addons with a default profile
|
||||||
|
# omarchy:examples=omarchycn ime apply
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
omarchy-pkg-add fcitx5-rime fcitx5-chinese-addons fcitx5-configtool
|
||||||
|
|
||||||
|
profile_dir="$HOME/.config/fcitx5"
|
||||||
|
mkdir -p "$profile_dir"
|
||||||
|
|
||||||
|
if [[ -f $profile_dir/profile && "$(<"$profile_dir/profile")" != "$(<"$OMARCHY_PATH/cn/fcitx5/profile")" ]]; then
|
||||||
|
backup_dir="$HOME/.local/state/omarchycn/backups/ime/$(date +%Y%m%d-%H%M%S)"
|
||||||
|
mkdir -p "$backup_dir"
|
||||||
|
cp "$profile_dir/profile" "$backup_dir/profile"
|
||||||
|
echo "Existing profile backed up to $backup_dir"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cp "$OMARCHY_PATH/cn/fcitx5/profile" "$profile_dir/profile"
|
||||||
|
|
||||||
|
if systemctl --user is-active omarchy-fcitx5.service > /dev/null 2>&1; then
|
||||||
|
systemctl --user restart omarchy-fcitx5.service
|
||||||
|
echo "Fcitx5 restarted with Rime profile"
|
||||||
|
else
|
||||||
|
echo "Fcitx5 profile installed (takes effect at next graphical session)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
omarchy-cn-ime-status
|
||||||
@@ -0,0 +1,63 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Set the input method toggle key, migrating the menu key if needed
|
||||||
|
# omarchy:args=<ctrl-space|super-space>
|
||||||
|
# omarchy:examples=omarchycn ime hotkey ctrl-space | omarchycn ime hotkey super-space
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
choice="${1:?usage: omarchycn ime hotkey <ctrl-space|super-space>}"
|
||||||
|
fcitx_config="$HOME/.config/fcitx5/config"
|
||||||
|
bindings="$HOME/.config/hypr/bindings.lua"
|
||||||
|
|
||||||
|
# Replace or append the [Hotkey/TriggerKeys] section in fcitx5 global config
|
||||||
|
set_trigger() {
|
||||||
|
local key="$1"
|
||||||
|
|
||||||
|
mkdir -p "${fcitx_config%/*}"
|
||||||
|
touch "$fcitx_config"
|
||||||
|
awk '
|
||||||
|
/^\[Hotkey\/TriggerKeys\]$/ { skip = 1; next }
|
||||||
|
/^\[/ { skip = 0 }
|
||||||
|
!skip { print }
|
||||||
|
' "$fcitx_config" > "$fcitx_config.omarchycn-tmp"
|
||||||
|
printf '[Hotkey/TriggerKeys]\n0=%s\n' "$key" >> "$fcitx_config.omarchycn-tmp"
|
||||||
|
mv "$fcitx_config.omarchycn-tmp" "$fcitx_config"
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_menu_migration() {
|
||||||
|
if [[ -f $bindings ]]; then
|
||||||
|
sed -i '/^-- OmarchyCN ime hotkey begin$/,/^-- OmarchyCN ime hotkey end$/d' "$bindings"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$choice" in
|
||||||
|
ctrl-space)
|
||||||
|
set_trigger "Control+space"
|
||||||
|
remove_menu_migration
|
||||||
|
echo "输入法切换键: Ctrl+Space(Omarchy 菜单保持 Super+Space)"
|
||||||
|
;;
|
||||||
|
super-space)
|
||||||
|
set_trigger "Super+space"
|
||||||
|
mkdir -p "${bindings%/*}"
|
||||||
|
touch "$bindings"
|
||||||
|
remove_menu_migration
|
||||||
|
cat >> "$bindings" <<'EOF'
|
||||||
|
-- OmarchyCN ime hotkey begin
|
||||||
|
hl.unbind("SUPER + SPACE")
|
||||||
|
hl.unbind("SUPER + ALT + SPACE")
|
||||||
|
o.bind("SUPER + ALT + SPACE", "Omarchy menu", "omarchy-menu toggle")
|
||||||
|
-- OmarchyCN ime hotkey end
|
||||||
|
EOF
|
||||||
|
echo "输入法切换键: Super+Space"
|
||||||
|
echo "Omarchy 菜单已迁移至 Super+Alt+Space(写入 $bindings)"
|
||||||
|
echo "原 Super+Alt+Space 的 Apps 菜单让位,可从根菜单进入或自行改绑"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown hotkey choice: $choice (expected ctrl-space or super-space)" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if systemctl --user is-active omarchy-fcitx5.service > /dev/null 2>&1; then
|
||||||
|
systemctl --user restart omarchy-fcitx5.service
|
||||||
|
fi
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Check Fcitx5 Rime installation and configuration
|
||||||
|
# omarchy:examples=omarchycn ime status
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
failures=0
|
||||||
|
|
||||||
|
for pkg in fcitx5 fcitx5-gtk fcitx5-qt fcitx5-rime fcitx5-chinese-addons; do
|
||||||
|
if pacman -Q "$pkg" > /dev/null 2>&1; then
|
||||||
|
echo "PASS ime: $pkg installed"
|
||||||
|
else
|
||||||
|
echo "FAIL ime: $pkg missing"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if grep -sq '^Name=rime$' "$HOME/.config/fcitx5/profile"; then
|
||||||
|
echo "PASS ime: rime in fcitx5 profile"
|
||||||
|
else
|
||||||
|
echo "FAIL ime: rime not in fcitx5 profile (run: omarchycn ime apply)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
if grep -sq '^DefaultIM=rime$' "$HOME/.config/fcitx5/profile"; then
|
||||||
|
echo "PASS ime: rime is the default input method"
|
||||||
|
else
|
||||||
|
echo "FAIL ime: DefaultIM is not rime"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
env_file="/usr/share/omarchy/default/environment.d/10-omarchy-fcitx.conf"
|
||||||
|
if [[ -f $env_file ]] || [[ -f $OMARCHY_PATH/default/environment.d/10-omarchy-fcitx.conf ]]; then
|
||||||
|
echo "PASS ime: fcitx environment file present"
|
||||||
|
else
|
||||||
|
echo "FAIL ime: fcitx environment file missing"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
trigger=$(grep -sA2 '^\[Hotkey/TriggerKeys\]' "$HOME/.config/fcitx5/config" | grep -sE '^0=' | cut -d= -f2- || true)
|
||||||
|
if [[ $trigger == "Super+space" ]] && ! grep -sq 'OmarchyCN ime hotkey begin' "$HOME/.config/hypr/bindings.lua"; then
|
||||||
|
echo "FAIL ime: Super+space 与 Omarchy 菜单冲突 (run: omarchycn ime hotkey super-space)"
|
||||||
|
failures=$((failures + 1))
|
||||||
|
else
|
||||||
|
echo "PASS ime: trigger key ${trigger:-Control+space (fcitx5 default)}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if pgrep -x fcitx5 > /dev/null 2>&1; then
|
||||||
|
echo "PASS ime: fcitx5 running"
|
||||||
|
else
|
||||||
|
echo "INFO ime: fcitx5 not running (headless session?)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit $((failures > 0 ? 1 : 0))
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Install or remove the OmarchyCN layer on an existing Omarchy
|
||||||
|
# omarchy:args=[--uninstall]
|
||||||
|
# omarchy:examples=omarchy-cn-install-overlay | omarchy-cn-install-overlay --uninstall
|
||||||
|
# Bootstraps onto a foreign OMARCHY_PATH, so it resolves its own checkout root.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SRC=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)
|
||||||
|
DEST="${OMARCHY_PATH:?OMARCHY_PATH must point at the target Omarchy install}"
|
||||||
|
MANIFEST="$HOME/.local/state/omarchycn/overlay-manifest"
|
||||||
|
|
||||||
|
run_in() {
|
||||||
|
local root="$1"
|
||||||
|
shift
|
||||||
|
if [[ -w $root ]]; then
|
||||||
|
"$@"
|
||||||
|
else
|
||||||
|
sudo "$@"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
valid_entry() {
|
||||||
|
[[ $1 == "cn" || $1 =~ ^bin/(omarchycn|omarchy-cn-[a-z0-9-]+)$ ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
MENU_EXT="$HOME/.config/omarchy/extensions/omarchy-menu.jsonc"
|
||||||
|
MENU_MARKER="// OmarchyCN overlay menu extension"
|
||||||
|
|
||||||
|
# Comments-only files (upstream ships such a template) hold no user content
|
||||||
|
menu_ext_has_user_content() {
|
||||||
|
[[ -f $MENU_EXT ]] || return 1
|
||||||
|
grep -qF "$MENU_MARKER" "$MENU_EXT" && return 1
|
||||||
|
[[ -n $(grep -vE '^[[:space:]]*(//.*)?$' "$MENU_EXT" | tr -d '[:space:]{}') ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
install_menu_extension() {
|
||||||
|
if menu_ext_has_user_content; then
|
||||||
|
echo "跳过菜单扩展:$MENU_EXT 已有用户内容,请手动合并 default/omarchy/omarchy-menu.jsonc 的 OmarchyCN 段"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
mkdir -p "${MENU_EXT%/*}"
|
||||||
|
{
|
||||||
|
echo "$MENU_MARKER"
|
||||||
|
echo "{"
|
||||||
|
sed -n '/^ \/\/ OmarchyCN$/,$p' "$SRC/default/omarchy/omarchy-menu.jsonc" | sed '$d'
|
||||||
|
echo "}"
|
||||||
|
} > "$MENU_EXT"
|
||||||
|
echo "OmarchyCN 菜单扩展已写入 $MENU_EXT"
|
||||||
|
}
|
||||||
|
|
||||||
|
remove_menu_extension() {
|
||||||
|
if [[ -f $MENU_EXT ]] && grep -qF "$MENU_MARKER" "$MENU_EXT"; then
|
||||||
|
rm -f "$MENU_EXT"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
uninstall() {
|
||||||
|
if [[ ! -f $MANIFEST ]]; then
|
||||||
|
echo "No overlay manifest at $MANIFEST" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
local dest="" rel=""
|
||||||
|
dest=$(grep -m1 '^dest=' "$MANIFEST" | cut -d= -f2-)
|
||||||
|
if [[ -z $dest || ! -d $dest ]]; then
|
||||||
|
echo "Manifest has no valid dest= record" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Validate every entry before deleting anything
|
||||||
|
while IFS= read -r rel; do
|
||||||
|
[[ $rel == source=* || $rel == dest=* ]] && continue
|
||||||
|
if ! valid_entry "$rel"; then
|
||||||
|
echo "Refusing suspicious manifest entry: $rel (nothing deleted)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done < "$MANIFEST"
|
||||||
|
|
||||||
|
while IFS= read -r rel; do
|
||||||
|
[[ $rel == source=* || $rel == dest=* ]] && continue
|
||||||
|
if [[ $rel == "cn" ]]; then
|
||||||
|
run_in "$dest" rm -rf "$dest/cn"
|
||||||
|
else
|
||||||
|
run_in "$dest" rm -f "$dest/$rel"
|
||||||
|
fi
|
||||||
|
done < "$MANIFEST"
|
||||||
|
|
||||||
|
remove_menu_extension
|
||||||
|
rm -f "$MANIFEST"
|
||||||
|
echo "OmarchyCN overlay removed from $dest"
|
||||||
|
}
|
||||||
|
|
||||||
|
install() {
|
||||||
|
if [[ ! -f $DEST/version || ! -x $DEST/bin/omarchy ]]; then
|
||||||
|
echo "No Omarchy install found at $DEST" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if [[ $SRC == "$DEST" ]]; then
|
||||||
|
echo "Source checkout and target are the same tree; nothing to overlay" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Reinstall: remove the previous overlay first so upgrades leave no residue
|
||||||
|
if [[ -f $MANIFEST ]]; then
|
||||||
|
uninstall
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -e $DEST/cn ]]; then
|
||||||
|
echo "Refusing to take over unmanaged $DEST/cn" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
local f rel entries=()
|
||||||
|
for f in "$SRC/bin/omarchycn" "$SRC"/bin/omarchy-cn-*; do
|
||||||
|
rel="bin/${f##*/}"
|
||||||
|
if [[ -e $DEST/$rel ]]; then
|
||||||
|
echo "Refusing to overwrite unmanaged $DEST/$rel" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
entries+=("$rel")
|
||||||
|
done
|
||||||
|
|
||||||
|
# Manifest is the intent record, published BEFORE copying: if a copy fails
|
||||||
|
# midway, a rerun sees the manifest, uninstalls the partial state, retries.
|
||||||
|
mkdir -p "${MANIFEST%/*}"
|
||||||
|
{
|
||||||
|
echo "source=$SRC"
|
||||||
|
echo "dest=$DEST"
|
||||||
|
echo "cn"
|
||||||
|
printf '%s\n' "${entries[@]}"
|
||||||
|
} > "$MANIFEST"
|
||||||
|
|
||||||
|
run_in "$DEST" cp -r "$SRC/cn" "$DEST/cn"
|
||||||
|
for rel in "${entries[@]}"; do
|
||||||
|
run_in "$DEST" cp "$SRC/$rel" "$DEST/$rel"
|
||||||
|
done
|
||||||
|
|
||||||
|
install_menu_extension
|
||||||
|
echo "OmarchyCN overlay installed into $DEST (${#entries[@]} commands)"
|
||||||
|
echo "Verify: omarchy cn version"
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ ${1:-} == "--uninstall" ]]; then
|
||||||
|
uninstall
|
||||||
|
else
|
||||||
|
install
|
||||||
|
fi
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Generate zh_CN.UTF-8 and en_US.UTF-8 locales
|
||||||
|
# omarchy:examples=omarchycn locale apply
|
||||||
|
# omarchy:requires-sudo=true
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
for loc in zh_CN en_US; do
|
||||||
|
if ! grep -qE "^${loc}\.UTF-8 UTF-8" /etc/locale.gen; then
|
||||||
|
echo "${loc}.UTF-8 UTF-8" | sudo tee -a /etc/locale.gen > /dev/null
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
sudo locale-gen
|
||||||
|
|
||||||
|
for loc in zh_CN en_US; do
|
||||||
|
if ! locale -a | grep -qiE "^${loc}\.utf-?8$"; then
|
||||||
|
echo "FAIL locale: ${loc}.UTF-8 not generated" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "PASS locale: ${loc}.UTF-8"
|
||||||
|
done
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Apply a mirror profile or pin one mirror for pacman
|
||||||
|
# omarchy:args=<china|official|mirror-id>
|
||||||
|
# omarchy:examples=omarchycn mirror apply china | omarchycn mirror apply official | omarchycn mirror apply tuna
|
||||||
|
# omarchy:requires-sudo=true
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/mirror.sh"
|
||||||
|
|
||||||
|
target="${1:?usage: omarchycn mirror apply <china|official|mirror-id>}"
|
||||||
|
|
||||||
|
case "$target" in
|
||||||
|
china)
|
||||||
|
echo "Benchmarking China mirrors..."
|
||||||
|
mapfile -t cn_ids < <(cn_mirror_ids_by_region cn)
|
||||||
|
mapfile -t ranked < <(cn_mirror_rank "${cn_ids[@]}")
|
||||||
|
if (( ${#ranked[@]} == 0 )); then
|
||||||
|
echo "No healthy China mirror reachable; keeping current mirrorlist" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
# Primary + up to two backups
|
||||||
|
cn_mirror_write_list china "${ranked[@]:0:3}"
|
||||||
|
;;
|
||||||
|
official)
|
||||||
|
cn_mirror_write_list official geo worldwide
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
url=$(cn_mirror_url "$target")
|
||||||
|
if [[ -z $url ]]; then
|
||||||
|
echo "Unknown mirror id: $target (see: omarchycn mirror benchmark)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
cn_mirror_write_list "pin:$target" "$target"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Benchmark Arch mirrors for speed, latency, and sync freshness
|
||||||
|
# omarchy:examples=omarchycn mirror benchmark
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/mirror.sh"
|
||||||
|
|
||||||
|
printf '%-11s %-22s %12s %8s %10s\n' "ID" "NAME" "SPEED" "TTFB" "SYNC"
|
||||||
|
|
||||||
|
for id in $(cn_mirror_ids); do
|
||||||
|
url=$(cn_mirror_url "$id")
|
||||||
|
read -r speed ttfb age < <(cn_mirror_probe "$url")
|
||||||
|
|
||||||
|
if (( speed > 0 )); then
|
||||||
|
speed_h="$((speed / 1024)) KB/s"
|
||||||
|
else
|
||||||
|
speed_h="FAIL"
|
||||||
|
fi
|
||||||
|
case "$age" in
|
||||||
|
stale) sync_h="STALE" ;;
|
||||||
|
unknown) sync_h="?" ;;
|
||||||
|
*) sync_h="$((age / 60))m ago" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
printf '%-11s %-22s %12s %7ss %10s\n' "$id" "$(cn_mirror_name "$id")" "$speed_h" "${ttfb:0:5}" "$sync_h"
|
||||||
|
done
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Pin pacman to a single mirror
|
||||||
|
# omarchy:args=<mirror-id>
|
||||||
|
# omarchy:examples=omarchycn mirror pin tuna
|
||||||
|
# omarchy:requires-sudo=true
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
exec omarchy-cn-mirror-apply "${1:?usage: omarchycn mirror pin <mirror-id>}"
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Restore the most recent mirrorlist backup
|
||||||
|
# omarchy:examples=omarchycn mirror restore
|
||||||
|
# omarchy:requires-sudo=true
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/mirror.sh"
|
||||||
|
|
||||||
|
backups=("$CN_MIRRORLIST".omarchycn-bak-*)
|
||||||
|
if [[ ! -e ${backups[0]} ]]; then
|
||||||
|
echo "No OmarchyCN mirrorlist backups found" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
latest="${backups[-1]}"
|
||||||
|
sudo cp "$latest" "$CN_MIRRORLIST"
|
||||||
|
rm -f "$CN_PROFILE_FILE"
|
||||||
|
echo "Restored $CN_MIRRORLIST from ${latest##*/}"
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Show current pacman mirror profile and servers
|
||||||
|
# omarchy:examples=omarchycn mirror status
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/mirror.sh"
|
||||||
|
|
||||||
|
if [[ -f $CN_PROFILE_FILE ]]; then
|
||||||
|
echo "Profile: $(<"$CN_PROFILE_FILE")"
|
||||||
|
else
|
||||||
|
echo "Profile: not managed by OmarchyCN"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Mirrorlist: $CN_MIRRORLIST"
|
||||||
|
echo "Servers:"
|
||||||
|
grep -E '^Server' "$CN_MIRRORLIST" | sed 's/^/ /'
|
||||||
|
|
||||||
|
backups=("$CN_MIRRORLIST".omarchycn-bak-*)
|
||||||
|
if [[ -e ${backups[0]} ]]; then
|
||||||
|
echo "Backups: ${#backups[@]} (latest: ${backups[-1]##*/})"
|
||||||
|
fi
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Restore development registry configs from a backup stamp
|
||||||
|
# omarchy:args=<stamp>
|
||||||
|
# omarchy:examples=omarchycn restore config 20260824-184243
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/dev-mirror.sh"
|
||||||
|
|
||||||
|
stamp="${1:?usage: omarchycn restore config <stamp> (see: omarchycn restore list)}"
|
||||||
|
dir="$CN_DM_BACKUP_ROOT/$stamp"
|
||||||
|
|
||||||
|
if [[ ! -d $dir ]]; then
|
||||||
|
echo "No backup at $dir" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
restored=0
|
||||||
|
for target in "${CN_DM_TARGETS[@]}"; do
|
||||||
|
dest=$(cn_dm_config_file "$target")
|
||||||
|
src="$dir/${dest##*/}"
|
||||||
|
if [[ -f $src && $dest != /etc/* ]]; then
|
||||||
|
mkdir -p "${dest%/*}"
|
||||||
|
cp "$src" "$dest"
|
||||||
|
echo "restored $target: $dest"
|
||||||
|
restored=$((restored + 1))
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if (( restored == 0 )); then
|
||||||
|
echo "Nothing restored from $dir (system files like docker are not auto-restored)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=List OmarchyCN configuration backups
|
||||||
|
# omarchy:examples=omarchycn restore list
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
source "$OMARCHY_PATH/cn/lib/dev-mirror.sh"
|
||||||
|
|
||||||
|
echo "Dev-mirror backups ($CN_DM_BACKUP_ROOT):"
|
||||||
|
if [[ -d $CN_DM_BACKUP_ROOT ]]; then
|
||||||
|
for dir in "$CN_DM_BACKUP_ROOT"/*/; do
|
||||||
|
[[ -d $dir ]] || continue
|
||||||
|
stamp="${dir%/}"
|
||||||
|
stamp="${stamp##*/}"
|
||||||
|
echo " $stamp: $(ls "$dir" | tr '\n' ' ')"
|
||||||
|
done
|
||||||
|
else
|
||||||
|
echo " (none)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Mirrorlist backups (/etc/pacman.d):"
|
||||||
|
found="false"
|
||||||
|
for f in /etc/pacman.d/mirrorlist.omarchycn-bak-*; do
|
||||||
|
if [[ -e $f ]]; then
|
||||||
|
echo " ${f##*/}"
|
||||||
|
found="true"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
if [[ $found == "false" ]]; then
|
||||||
|
echo " (none)"
|
||||||
|
fi
|
||||||
@@ -0,0 +1,120 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=First-run wizard: language, timezone, scale, Chinese env, mirrors, apps, AI
|
||||||
|
# omarchy:examples=omarchycn setup
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
if [[ ! -t 0 ]]; then
|
||||||
|
echo "omarchycn setup 需要交互终端" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
STATE_DIR="$HOME/.local/state/omarchycn/setup-done"
|
||||||
|
mkdir -p "$STATE_DIR"
|
||||||
|
|
||||||
|
run_step() {
|
||||||
|
local step="$1" title="$2"
|
||||||
|
shift 2
|
||||||
|
|
||||||
|
if [[ -f $STATE_DIR/$step ]]; then
|
||||||
|
gum confirm "「$title」已完成,重新运行?" --default=false || return 0
|
||||||
|
elif ! gum confirm "运行「$title」?(可跳过,稍后重进)"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
echo "==> $title"
|
||||||
|
if "$@"; then
|
||||||
|
touch "$STATE_DIR/$step"
|
||||||
|
else
|
||||||
|
gum confirm "「$title」失败,继续后面的步骤?" || exit 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
step_language() {
|
||||||
|
local choice env_file="$HOME/.config/environment.d/90-omarchycn-lang.conf"
|
||||||
|
choice=$(gum choose --header "界面语言 LANG" "zh_CN.UTF-8" "en_US.UTF-8" "保持当前")
|
||||||
|
if [[ $choice == "保持当前" ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
mkdir -p "${env_file%/*}"
|
||||||
|
echo "LANG=$choice" > "$env_file"
|
||||||
|
echo "LANG=$choice 写入 $env_file(重登录生效)"
|
||||||
|
}
|
||||||
|
|
||||||
|
step_timezone() {
|
||||||
|
local choice
|
||||||
|
choice=$(gum choose --header "时区" "Asia/Shanghai" "保持当前" "手动输入")
|
||||||
|
if [[ $choice == "保持当前" ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
if [[ $choice == "手动输入" ]]; then
|
||||||
|
choice=$(timedatectl list-timezones | gum filter --header "选择时区")
|
||||||
|
fi
|
||||||
|
sudo timedatectl set-timezone "$choice"
|
||||||
|
echo "时区: $(timedatectl show -p Timezone --value)"
|
||||||
|
}
|
||||||
|
|
||||||
|
step_scale() {
|
||||||
|
local choice
|
||||||
|
choice=$(gum choose --header "显示缩放" "1.0" "1.25" "1.5" "1.6" "1.75" "2.0" "保持当前")
|
||||||
|
if [[ $choice == "保持当前" ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
omarchy-cn-display-scale "$choice"
|
||||||
|
}
|
||||||
|
|
||||||
|
step_hotkey() {
|
||||||
|
local choice
|
||||||
|
choice=$(gum choose --header "输入法切换键" "ctrl-space" "super-space")
|
||||||
|
omarchy-cn-ime-hotkey "$choice"
|
||||||
|
}
|
||||||
|
|
||||||
|
step_mirror() {
|
||||||
|
local choice
|
||||||
|
choice=$(gum choose --header "pacman 镜像策略" "china" "official")
|
||||||
|
omarchy-cn-mirror-apply "$choice"
|
||||||
|
}
|
||||||
|
|
||||||
|
step_dev_mirror() {
|
||||||
|
local choice
|
||||||
|
choice=$(gum choose --header "开发工具镜像(npm/pip/cargo/go/gem)" "china" "official")
|
||||||
|
omarchy-cn-dev-mirror-apply "$choice" --target npm,pip,cargo,go,gem
|
||||||
|
}
|
||||||
|
|
||||||
|
step_apps() {
|
||||||
|
local catalog picks app rc=0
|
||||||
|
catalog=$(omarchy-cn-app-list | tail -n +2 | awk '{print $1}') || return 1
|
||||||
|
picks=$(gum choose --no-limit --header "选择要安装的国内应用(空格多选,回车确认)" <<<"$catalog" || true)
|
||||||
|
for app in $picks; do
|
||||||
|
omarchy-cn-app-install "$app" || rc=1
|
||||||
|
done
|
||||||
|
return $rc
|
||||||
|
}
|
||||||
|
|
||||||
|
step_privacy() {
|
||||||
|
echo "隐私状态(无可配置项,如实告知):"
|
||||||
|
echo " - OmarchyCN 不含遥测代码,默认无任何数据上报"
|
||||||
|
echo " - 诊断信息仅在你手动运行 doctor 时本地生成,不上传"
|
||||||
|
gum confirm "已了解" --affirmative "了解" --negative "" || true
|
||||||
|
}
|
||||||
|
|
||||||
|
run_step language "语言 Language" step_language
|
||||||
|
run_step timezone "时区 Timezone" step_timezone
|
||||||
|
run_step scale "显示缩放 Display Scale" step_scale
|
||||||
|
run_step locale "中文 Locale 生成" omarchy-cn-locale-apply
|
||||||
|
run_step fonts "中文字体与 fallback" omarchy-cn-font-apply
|
||||||
|
run_step ime "Fcitx5 + Rime 输入法" omarchy-cn-ime-apply
|
||||||
|
run_step hotkey "输入法切换键" step_hotkey
|
||||||
|
run_step mirror "pacman 镜像" step_mirror
|
||||||
|
run_step dev-mirror "开发工具镜像" step_dev_mirror
|
||||||
|
run_step apps "国内应用" step_apps
|
||||||
|
run_step ai "AI Hub(Harness/Provider/Key)" omarchy-cn-ai-setup
|
||||||
|
run_step privacy "隐私与诊断" step_privacy
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "==> 最终检查"
|
||||||
|
if omarchy-cn-doctor all; then
|
||||||
|
echo "OmarchyCN 初始化完成。随时可用 omarchycn setup 重进任一步骤。"
|
||||||
|
else
|
||||||
|
echo "初始化步骤已执行,但诊断存在失败项(见上),修复后可重跑 omarchycn setup" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Show OmarchyCN version, paths, and configured state
|
||||||
|
# omarchy:examples=omarchycn status
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
echo "OmarchyCN $(omarchy-cn-version)"
|
||||||
|
echo "Omarchy upstream: $(<"$OMARCHY_PATH/version")"
|
||||||
|
echo "Root: $OMARCHY_PATH"
|
||||||
|
|
||||||
|
config="$HOME/.config/omarchycn"
|
||||||
|
state="$HOME/.local/state/omarchycn"
|
||||||
|
echo "User config: $config $([[ -d $config ]] && echo "(present)" || echo "(not created)")"
|
||||||
|
echo "State: $state $([[ -d $state ]] && echo "(present)" || echo "(not created)")"
|
||||||
|
|
||||||
|
if [[ -f $config/mirror-profile ]]; then
|
||||||
|
echo "Mirror profile: $(<"$config/mirror-profile")"
|
||||||
|
else
|
||||||
|
echo "Mirror profile: not configured"
|
||||||
|
fi
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Update an overlay install: pull source, reinstall, run migrations
|
||||||
|
# omarchy:examples=omarchycn update
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
MANIFEST="$HOME/.local/state/omarchycn/overlay-manifest"
|
||||||
|
MIGRATION_DONE_DIR="$HOME/.local/state/omarchycn/migrations-done"
|
||||||
|
|
||||||
|
if [[ ! -f $MANIFEST ]]; then
|
||||||
|
echo "Not an overlay install (no $MANIFEST)." >&2
|
||||||
|
echo "Package-based installs update through 'omarchy update' / pacman." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
src=$(grep -m1 '^source=' "$MANIFEST" | cut -d= -f2-)
|
||||||
|
if [[ ! -d $src/.git ]]; then
|
||||||
|
echo "Overlay source $src is not a git checkout" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
channel=$(omarchy-cn-channel)
|
||||||
|
channel=${channel%% *}
|
||||||
|
|
||||||
|
old=$(git -C "$src" rev-parse --short HEAD)
|
||||||
|
git -C "$src" fetch -q --tags origin
|
||||||
|
|
||||||
|
case "$channel" in
|
||||||
|
nightly)
|
||||||
|
git -C "$src" checkout -q quattro
|
||||||
|
git -C "$src" pull --ff-only origin quattro
|
||||||
|
;;
|
||||||
|
beta)
|
||||||
|
tag=$(git -C "$src" tag -l "*-cn.*" | sort -V | tail -1)
|
||||||
|
if [[ -z $tag ]]; then
|
||||||
|
echo "beta 通道无可用发布 tag" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
git -C "$src" checkout -q "$tag"
|
||||||
|
;;
|
||||||
|
stable)
|
||||||
|
tag=$(git -C "$src" tag -l "*-cn.*" | grep -vE "alpha|beta|rc" | sort -V | tail -1 || true)
|
||||||
|
if [[ -z $tag ]]; then
|
||||||
|
echo "当前尚无 stable 发布(omarchycn channel beta 可跟随预发布)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
git -C "$src" checkout -q "$tag"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown channel: $channel" >&2
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Never move onto a tree that predates the channel mechanism: its update
|
||||||
|
# command cannot switch back, stranding the install
|
||||||
|
if [[ ! -f $src/bin/omarchy-cn-channel ]]; then
|
||||||
|
git -C "$src" checkout -q "$old"
|
||||||
|
echo "$channel 通道的目标发布早于通道机制,已回退;请使用 nightly 或更新的发布" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
new=$(git -C "$src" rev-parse --short HEAD)
|
||||||
|
echo "Channel: $channel, source: $old -> $new"
|
||||||
|
|
||||||
|
"$src/bin/omarchy-cn-install-overlay"
|
||||||
|
|
||||||
|
# Run each not-yet-completed migration in filename order, one marker per file
|
||||||
|
if [[ -d $src/cn/migrations ]]; then
|
||||||
|
mkdir -p "$MIGRATION_DONE_DIR"
|
||||||
|
for m in "$src"/cn/migrations/*.sh; do
|
||||||
|
[[ -f $m ]] || continue
|
||||||
|
name="${m##*/}"
|
||||||
|
if [[ ! -f $MIGRATION_DONE_DIR/$name ]]; then
|
||||||
|
echo "Migration: $name"
|
||||||
|
bash -euo pipefail "$m"
|
||||||
|
touch "$MIGRATION_DONE_DIR/$name"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "OmarchyCN update complete ($(omarchy-cn-version 2>/dev/null || echo unknown))"
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# omarchy:summary=Show the OmarchyCN version
|
||||||
|
# omarchy:examples=omarchycn version
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
upstream=$(<"$OMARCHY_PATH/version")
|
||||||
|
release=$(<"$OMARCHY_PATH/cn/release")
|
||||||
|
|
||||||
|
echo "${upstream}-cn.${release}"
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# omarchy:summary=Set and launch the default coding agent
|
# omarchy:summary=Set and launch the default coding agent
|
||||||
# omarchy:args=[pi|omp|opencode|ori|claude|codex|grok|agy|copilot|crush]
|
# omarchy:args=[pi|omp|opencode|ori|claude|codex|grok|agy|copilot|crush|kimi|deepcode]
|
||||||
# omarchy:examples=omarchy default agent | omarchy default agent codex | omarchy default agent claude
|
# omarchy:examples=omarchy default agent | omarchy default agent codex | omarchy default agent kimi
|
||||||
|
|
||||||
installing=false
|
installing=false
|
||||||
if [[ ${1:-} == "--install" ]]; then
|
if [[ ${1:-} == "--install" ]]; then
|
||||||
@@ -34,25 +34,43 @@ crush) agent="crush"; name="Crush" ;;
|
|||||||
grok) agent="grok"; name="Grok"; agent_package="npm:@xai-official/grok" ;;
|
grok) agent="grok"; name="Grok"; agent_package="npm:@xai-official/grok" ;;
|
||||||
agy | antigravity | antigravity-cli | gemini | gemini-cli) agent="agy"; name="Antigravity"; agent_package="antigravity-cli" ;;
|
agy | antigravity | antigravity-cli | gemini | gemini-cli) agent="agy"; name="Antigravity"; agent_package="antigravity-cli" ;;
|
||||||
copilot | github-copilot) agent="copilot"; name="GitHub Copilot" ;;
|
copilot | github-copilot) agent="copilot"; name="GitHub Copilot" ;;
|
||||||
|
kimi | kimi-code) agent="kimi"; name="Kimi Code" ;;
|
||||||
|
deepcode | deep-code) agent="deepcode"; name="Deep Code"; agent_package="npm:@vegamo/deepcode-cli" ;;
|
||||||
*)
|
*)
|
||||||
echo "Usage: omarchy-default-agent <pi|omp|opencode|ori|claude|codex|grok|agy|copilot|crush>"
|
echo "Usage: omarchy-default-agent <pi|omp|opencode|ori|claude|codex|grok|agy|copilot|crush|kimi|deepcode>"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
agent_package=${agent_package:-$agent}
|
agent_package=${agent_package:-$agent}
|
||||||
|
|
||||||
if [[ $installing == "false" ]] && ! mise where "$agent_package" &>/dev/null; then
|
# Kimi Code installs via its official script, not mise
|
||||||
exec omarchy-launch-floating-terminal-with-presentation omarchy-default-agent --install "$agent"
|
if [[ $agent == "kimi" ]]; then
|
||||||
fi
|
if omarchy-cmd-missing kimi; then
|
||||||
|
if [[ $installing == "false" ]]; then
|
||||||
|
exec omarchy-launch-floating-terminal-with-presentation omarchy-default-agent --install kimi
|
||||||
|
fi
|
||||||
|
installer=$(mktemp)
|
||||||
|
if ! curl -fsSL https://code.kimi.com/kimi-code/install.sh -o "$installer" || ! bash "$installer"; then
|
||||||
|
rm -f "$installer"
|
||||||
|
echo "Could not install $name with the official installer" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
rm -f "$installer"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
if [[ $installing == "false" ]] && ! mise where "$agent_package" &>/dev/null; then
|
||||||
|
exec omarchy-launch-floating-terminal-with-presentation omarchy-default-agent --install "$agent"
|
||||||
|
fi
|
||||||
|
|
||||||
if ! mise use -g "$agent_package"; then
|
if ! mise use -g "$agent_package"; then
|
||||||
if [[ $installing == "true" ]]; then
|
if [[ $installing == "true" ]]; then
|
||||||
echo "Could not install $name with mise" >&2
|
echo "Could not install $name with mise" >&2
|
||||||
else
|
else
|
||||||
echo "Could not set $name as the default coding agent" >&2
|
echo "Could not set $name as the default coding agent" >&2
|
||||||
|
fi
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$(dirname "$agent_file")"
|
mkdir -p "$(dirname "$agent_file")"
|
||||||
|
|||||||
@@ -12,13 +12,10 @@ if gum confirm "Are you sure you want to restore all preinstalled web apps, TUI
|
|||||||
|
|
||||||
# Mirrors the list in omarchy-remove-preinstalls; both track omarchy-base.packages
|
# Mirrors the list in omarchy-remove-preinstalls; both track omarchy-base.packages
|
||||||
if ! omarchy-pkg-add \
|
if ! omarchy-pkg-add \
|
||||||
aether \
|
|
||||||
cliamp \
|
cliamp \
|
||||||
libreoffice-fresh \
|
|
||||||
xournalpp \
|
xournalpp \
|
||||||
pinta \
|
pinta \
|
||||||
obsidian \
|
obsidian \
|
||||||
obs-studio \
|
|
||||||
kdenlive \
|
kdenlive \
|
||||||
moonlight-qt \
|
moonlight-qt \
|
||||||
lazydocker \
|
lazydocker \
|
||||||
|
|||||||
@@ -9,10 +9,12 @@
|
|||||||
# no prompt. lazydocker needs the root-owned Docker socket, so when the group is
|
# no prompt. lazydocker needs the root-owned Docker socket, so when the group is
|
||||||
# absent, gate that access behind a polkit prompt. If the user has opted into
|
# absent, gate that access behind a polkit prompt. If the user has opted into
|
||||||
# sudoless Docker (omarchy-setup-security-sudoless-docker), the socket is already
|
# sudoless Docker (omarchy-setup-security-sudoless-docker), the socket is already
|
||||||
# reachable, so run lazydocker directly. pkexec sanitizes the environment, so
|
# reachable, so run lazydocker directly — omarchy-sudo-docker answers that for
|
||||||
# carry TERM through for the TUI to render and run lazydocker from root's PATH.
|
# this session, so the prompt stays until the reboot that grants the group.
|
||||||
if id -nG 2>/dev/null | grep -qw docker; then
|
# pkexec sanitizes the environment, so carry TERM through for the TUI to render
|
||||||
exec lazydocker
|
# and run lazydocker from root's PATH.
|
||||||
else
|
if omarchy-sudo-docker; then
|
||||||
exec pkexec /usr/bin/env TERM="${TERM:-xterm-256color}" lazydocker
|
exec pkexec /usr/bin/env TERM="${TERM:-xterm-256color}" lazydocker
|
||||||
|
else
|
||||||
|
exec lazydocker
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -338,10 +338,10 @@ static_bindings() {
|
|||||||
# for interchangeably belong on one row.
|
# for interchangeably belong on one row.
|
||||||
alternative_chord_actions() {
|
alternative_chord_actions() {
|
||||||
cat <<'ACTIONS'
|
cat <<'ACTIONS'
|
||||||
Close window
|
关闭窗口
|
||||||
Calculator
|
计算器
|
||||||
Toggle scratchpad
|
切换便签区
|
||||||
Move window to scratchpad
|
窗口移入便签区
|
||||||
ACTIONS
|
ACTIONS
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -442,58 +442,58 @@ prioritize_entries() {
|
|||||||
sub(/ \/ [^→]*→/, " →", line)
|
sub(/ \/ [^→]*→/, " →", line)
|
||||||
|
|
||||||
prio = 50
|
prio = 50
|
||||||
if (match(line, /Keybindings/)) prio = 0
|
if (match(line, /快捷键/)) prio = 0
|
||||||
if (match(line, /Omarchy menu/)) prio = 1
|
if (match(line, /Omarchy 菜单/)) prio = 1
|
||||||
if (match(line, /Terminal/)) prio = 2
|
if (match(line, /终端/)) prio = 2
|
||||||
if (match(line, /Browser/) && !match(line, /Browser[[:space:]]*\(/) && !match(line, /SUPER SHIFT.*\+.*B.*→.*Browser/)) prio = 3
|
if (match(line, /浏览器/) && !match(line, /浏览器(/) && !match(line, /SUPER SHIFT.*\+.*B.*→.*浏览器/)) prio = 3
|
||||||
if (match(line, /File manager/) && !match(line, /File manager \(cwd\)/)) prio = 4
|
if (match(line, /文件管理器/) && !match(line, /文件管理器(当前目录)/)) prio = 4
|
||||||
if (match(line, /Launch apps/)) prio = 5
|
if (match(line, /Launch apps/)) prio = 5
|
||||||
if (match(line, /System menu/)) prio = 6
|
if (match(line, /系统菜单/)) prio = 6
|
||||||
if (match(line, /Theme menu/)) prio = 7
|
if (match(line, /主题菜单/)) prio = 7
|
||||||
if (match(line, /Full screen/)) prio = 8
|
if (match(line, /全屏/)) prio = 8
|
||||||
if (match(line, /Full width/)) prio = 9
|
if (match(line, /全宽/)) prio = 9
|
||||||
if (match(line, /Close window/)) prio = 10
|
if (match(line, /关闭窗口/)) prio = 10
|
||||||
if (match(line, /Close all windows/)) prio = 11
|
if (match(line, /关闭所有窗口/)) prio = 11
|
||||||
if (match(line, /Lock system/)) prio = 12
|
if (match(line, /锁定系统/)) prio = 12
|
||||||
if (match(line, /Toggle window floating/)) prio = 13
|
if (match(line, /切换窗口浮动/)) prio = 13
|
||||||
if (match(line, /Toggle window split/)) prio = 14
|
if (match(line, /切换窗口分割/)) prio = 14
|
||||||
if (match(line, /Pop window/)) prio = 15
|
if (match(line, /弹出窗口/)) prio = 15
|
||||||
if (match(line, /Universal/)) prio = 16
|
if (match(line, /通用/)) prio = 16
|
||||||
if (match(line, /Clipboard/)) prio = 17
|
if (match(line, /剪贴板/)) prio = 17
|
||||||
if (match(line, /Audio controls/)) prio = 18
|
if (match(line, /Audio controls/)) prio = 18
|
||||||
if (match(line, /Bluetooth controls/)) prio = 19
|
if (match(line, /Bluetooth controls/)) prio = 19
|
||||||
if (match(line, /Wifi controls/)) prio = 20
|
if (match(line, /Wifi controls/)) prio = 20
|
||||||
if (match(line, /Emojis/)) prio = 21
|
if (match(line, /表情/)) prio = 21
|
||||||
if (match(line, /Color picker/)) prio = 22
|
if (match(line, /取色器/)) prio = 22
|
||||||
if (match(line, /Screenshot/)) prio = 23
|
if (match(line, /截图/)) prio = 23
|
||||||
if (match(line, /Screenrecording/)) prio = 24
|
if (match(line, /录屏/)) prio = 24
|
||||||
if (match(line, /Tmux/)) prio = 25
|
if (match(line, /Tmux/)) prio = 25
|
||||||
if (match(line, /Herdr/)) prio = 26
|
if (match(line, /Herdr/)) prio = 26
|
||||||
if (match(line, /SUPER SHIFT.*\+.*B.*→.*Browser/)) prio = 27
|
if (match(line, /SUPER SHIFT.*\+.*B.*→.*浏览器/)) prio = 27
|
||||||
if (match(line, /File manager \(cwd\)/)) prio = 28
|
if (match(line, /文件管理器(当前目录)/)) prio = 28
|
||||||
if (match(line, /(Switch|Next|Former|Previous).*workspace/)) prio = 29
|
if (match(line, /(切换到|下一|上一|上次)工作区/)) prio = 29
|
||||||
if (match(line, /Move window to workspace/)) prio = 30
|
if (match(line, /窗口移到工作区/)) prio = 30
|
||||||
if (match(line, /Move window silently to workspace/)) prio = 31
|
if (match(line, /窗口静默移到工作区/)) prio = 31
|
||||||
if (match(line, /Swap window/)) prio = 32
|
if (match(line, /互换/)) prio = 32
|
||||||
if (match(line, /Focus/)) prio = 33
|
if (match(line, /聚焦/)) prio = 33
|
||||||
if (match(line, /Move window$/)) prio = 34
|
if (match(line, /移动窗口$/)) prio = 34
|
||||||
if (match(line, /Resize window/)) prio = 35
|
if (match(line, /调整窗口大小/)) prio = 35
|
||||||
if (match(line, /Expand window/)) prio = 36
|
if (match(line, /扩展窗口/)) prio = 36
|
||||||
if (match(line, /Shrink window/)) prio = 37
|
if (match(line, /收缩窗口/)) prio = 37
|
||||||
if (match(line, /scratchpad/)) prio = 38
|
if (match(line, /便签区/)) prio = 38
|
||||||
if (match(line, /notification/)) prio = 39
|
if (match(line, /通知/)) prio = 39
|
||||||
if (match(line, /Toggle window transparency/)) prio = 40
|
if (match(line, /切换窗口透明/)) prio = 40
|
||||||
if (match(line, /Toggle workspace gaps/)) prio = 41
|
if (match(line, /切换窗口间距/)) prio = 41
|
||||||
if (match(line, /Toggle nightlight/)) prio = 42
|
if (match(line, /切换夜间模式/)) prio = 42
|
||||||
if (match(line, /Toggle locking/)) prio = 43
|
if (match(line, /切换空闲锁定/)) prio = 43
|
||||||
if (match(line, /group/)) prio = 94
|
if (match(line, /组内|分组/)) prio = 94
|
||||||
if (match(line, /Scroll active workspace/)) prio = 95
|
if (match(line, /工作区向(前|后)滚动/)) prio = 95
|
||||||
if (match(line, /Cycle to/)) prio = 96
|
if (match(line, /Cycle to/)) prio = 96
|
||||||
if (match(line, /Reveal active/)) prio = 97
|
if (match(line, /置顶显示/)) prio = 97
|
||||||
if (match(line, /Apple Display/)) prio = 98
|
if (match(line, /Apple Display/)) prio = 98
|
||||||
if (match(line, /XF86/)) prio = 99
|
if (match(line, /XF86/)) prio = 99
|
||||||
if (match(line, /Tmux keybindings/)) prio = 100
|
if (match(line, /Tmux 快捷键/)) prio = 100
|
||||||
if (match(line, /Herdr keybindings/)) prio = 101
|
if (match(line, /Herdr 快捷键/)) prio = 101
|
||||||
|
|
||||||
# print "priority<TAB>record"
|
# print "priority<TAB>record"
|
||||||
printf "%d\t%s\n", prio, $0
|
printf "%d\t%s\n", prio, $0
|
||||||
|
|||||||
@@ -186,7 +186,7 @@ tips=(
|
|||||||
"Share files with phones and laptops using LocalSend"
|
"Share files with phones and laptops using LocalSend"
|
||||||
"Turn any website into an app with Install > Web App in the menu"
|
"Turn any website into an app with Install > Web App in the menu"
|
||||||
"Super + Return opens a terminal, Super + Shift + Return the browser"
|
"Super + Return opens a terminal, Super + Shift + Return the browser"
|
||||||
"Edit images with Pinta, videos with Kdenlive, docs with LibreOffice"
|
"Edit images with Pinta and videos with Kdenlive"
|
||||||
"Super + Ctrl + Print grabs text off the screen with OCR"
|
"Super + Ctrl + Print grabs text off the screen with OCR"
|
||||||
"Print takes a screenshot, Alt + Print records the screen"
|
"Print takes a screenshot, Alt + Print records the screen"
|
||||||
"Set a reminder with Super + Ctrl + R"
|
"Set a reminder with Super + Ctrl + R"
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Usage: omarchy finalize user [--force] [--first-install]
|
|||||||
|
|
||||||
Runs the per-user setup steps that /etc/skel can't seed:
|
Runs the per-user setup steps that /etc/skel can't seed:
|
||||||
dev-aware skill symlinks, xdg-user-dirs + gtk bookmarks (need \$HOME),
|
dev-aware skill symlinks, xdg-user-dirs + gtk bookmarks (need \$HOME),
|
||||||
default browser/mailto, and install/user/all.sh.
|
default browser, and install/user/all.sh.
|
||||||
|
|
||||||
For shipped configs see /etc/skel (new users) and omarchy-reinstall-configs
|
For shipped configs see /etc/skel (new users) and omarchy-reinstall-configs
|
||||||
(existing users explicitly resyncing).
|
(existing users explicitly resyncing).
|
||||||
@@ -110,7 +110,6 @@ source "$OMARCHY_INSTALL/user/all.sh"
|
|||||||
|
|
||||||
omarchy-refresh-applications
|
omarchy-refresh-applications
|
||||||
env -u BROWSER xdg-settings set default-web-browser chromium.desktop
|
env -u BROWSER xdg-settings set default-web-browser chromium.desktop
|
||||||
xdg-mime default HEY.desktop x-scheme-handler/mailto
|
|
||||||
|
|
||||||
if (( first_install )); then
|
if (( first_install )); then
|
||||||
mkdir -p "$state_dir/migrations"
|
mkdir -p "$state_dir/migrations"
|
||||||
|
|||||||
@@ -18,13 +18,10 @@ if gum confirm "Are you sure you want to remove all preinstalled web apps, TUI w
|
|||||||
~/.local/bin/omp ~/.local/bin/ori ~/.local/bin/grok ~/.local/bin/crush ~/.local/bin/ghui ~/.local/bin/hunk
|
~/.local/bin/omp ~/.local/bin/ori ~/.local/bin/grok ~/.local/bin/crush ~/.local/bin/ghui ~/.local/bin/hunk
|
||||||
|
|
||||||
omarchy-pkg-drop \
|
omarchy-pkg-drop \
|
||||||
aether \
|
|
||||||
cliamp \
|
cliamp \
|
||||||
libreoffice-fresh \
|
|
||||||
xournalpp \
|
xournalpp \
|
||||||
pinta \
|
pinta \
|
||||||
obsidian \
|
obsidian \
|
||||||
obs-studio \
|
|
||||||
kdenlive \
|
kdenlive \
|
||||||
moonlight-qt \
|
moonlight-qt \
|
||||||
lazydocker \
|
lazydocker \
|
||||||
|
|||||||
@@ -5,7 +5,10 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if ! id -nG "$USER" 2>/dev/null | grep -qw docker; then
|
# Ask about the configured groups, not this session's: right after enabling,
|
||||||
|
# sudoless Docker is on for the account even though the running session still
|
||||||
|
# needs a prompt, and this command is what turns it back off.
|
||||||
|
if omarchy-sudo-docker --configured; then
|
||||||
echo "Sudoless Docker is not enabled: $USER is not in the docker group."
|
echo "Sudoless Docker is not enabled: $USER is not in the docker group."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@@ -13,13 +16,19 @@ fi
|
|||||||
echo "Removing $USER from the docker group..."
|
echo "Removing $USER from the docker group..."
|
||||||
sudo gpasswd -d "$USER" docker >/dev/null
|
sudo gpasswd -d "$USER" docker >/dev/null
|
||||||
|
|
||||||
# Group membership is fixed at login, so the running session keeps its docker
|
# Group membership is only re-read by a fresh session, and in practice logging
|
||||||
# access until it ends. Flag a reboot so omarchy-update-restart prompts for one
|
# out or newgrp isn't enough — only a reboot reliably applies it. Record it so a
|
||||||
# (and the bar shows it pending); a plain log out and back in works too.
|
# later `omarchy update` still prompts (omarchy-update-restart reads this), then
|
||||||
|
# offer to do it now.
|
||||||
omarchy-state set reboot-required
|
omarchy-state set reboot-required
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Sudoless Docker DISABLED. Reboot (or log out and back in) for the change to take effect."
|
echo "Sudoless Docker DISABLED. Docker access goes through a polkit/sudo prompt"
|
||||||
echo "Docker access now goes through a polkit/sudo prompt again: the Docker TUI"
|
echo "again: the Docker TUI (Super + Shift + D) and the Windows VM ask when they"
|
||||||
echo "(Super + Shift + D) and the Windows VM will ask when they need it, and the"
|
echo "need it, and the plain 'docker' CLI runs under sudo. It takes effect after a reboot."
|
||||||
echo "plain 'docker' CLI runs under sudo."
|
echo ""
|
||||||
|
# The migration reuses this command during 'omarchy update' and defers the
|
||||||
|
# reboot to omarchy-update-restart, so it doesn't cut the update short.
|
||||||
|
if [[ -z ${OMARCHY_DEFER_REBOOT:-} ]] && gum confirm "Reboot now to apply?"; then
|
||||||
|
omarchy-system-reboot
|
||||||
|
fi
|
||||||
|
|||||||
@@ -5,7 +5,9 @@
|
|||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if id -nG "$USER" 2>/dev/null | grep -qw docker; then
|
# Ask about the configured groups, not this session's: once enabled it stays
|
||||||
|
# enabled for the account even before the reboot that lets this session use it.
|
||||||
|
if ! omarchy-sudo-docker --configured; then
|
||||||
echo "Sudoless Docker is already enabled: $USER is in the docker group."
|
echo "Sudoless Docker is already enabled: $USER is in the docker group."
|
||||||
echo "To disable it again, run: omarchy-remove-security-sudoless-docker"
|
echo "To disable it again, run: omarchy-remove-security-sudoless-docker"
|
||||||
exit 0
|
exit 0
|
||||||
@@ -28,14 +30,20 @@ echo ""
|
|||||||
|
|
||||||
if gum confirm "Enable sudoless Docker? This gives anything running as you passwordless root."; then
|
if gum confirm "Enable sudoless Docker? This gives anything running as you passwordless root."; then
|
||||||
sudo usermod -aG docker "$USER"
|
sudo usermod -aG docker "$USER"
|
||||||
# Group membership is fixed at login, so docker won't be reachable without a
|
# A new docker group membership is only picked up by a fresh session, and in
|
||||||
# prompt until the session restarts. Flag a reboot so omarchy-update-restart
|
# practice logging out or newgrp isn't enough — only a reboot reliably applies
|
||||||
# prompts for one (and the bar shows it pending).
|
# it. Record it so a later `omarchy update` still prompts
|
||||||
|
# (omarchy-update-restart reads this), then offer to do it now.
|
||||||
omarchy-state set reboot-required
|
omarchy-state set reboot-required
|
||||||
echo ""
|
echo ""
|
||||||
echo "Sudoless Docker ENABLED. Reboot, or log out and back in (or run 'newgrp docker'),"
|
echo "Sudoless Docker ENABLED. It takes effect after a reboot."
|
||||||
echo "for the new group membership to take effect."
|
echo "To disable it again: Setup > Security > Sudoless Docker."
|
||||||
echo "To disable it again, run: omarchy-remove-security-sudoless-docker"
|
echo ""
|
||||||
|
# The migration reuses this command during 'omarchy update' and defers the
|
||||||
|
# reboot to omarchy-update-restart, so it doesn't cut the update short.
|
||||||
|
if [[ -z ${OMARCHY_DEFER_REBOOT:-} ]] && gum confirm "Reboot now to apply?"; then
|
||||||
|
omarchy-system-reboot
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
echo "Aborted. No changes made. Docker access still goes through a prompt."
|
echo "Aborted. No changes made. Docker access still goes through a prompt."
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# omarchy:summary=Succeed when Docker needs sudo, fail when it can be used directly
|
||||||
|
# omarchy:args=[--configured]
|
||||||
|
# omarchy:examples=omarchy-sudo-docker && echo "needs sudo" | omarchy-sudo-docker --configured
|
||||||
|
# omarchy:hidden=true
|
||||||
|
|
||||||
|
# The docker group is root-equivalent, so Omarchy leaves users out of it by
|
||||||
|
# default and reaches the daemon through a prompt instead. Everything that has
|
||||||
|
# to make that choice asks here rather than testing group membership itself.
|
||||||
|
#
|
||||||
|
# Two questions, because they have different answers between toggling sudoless
|
||||||
|
# Docker and the reboot that applies it (group membership is fixed when the
|
||||||
|
# session is created):
|
||||||
|
#
|
||||||
|
# (default) Does Docker need sudo *right now*? Answered by whether this
|
||||||
|
# process can actually reach the socket, which is what decides
|
||||||
|
# if a command must elevate. Still true in the window after
|
||||||
|
# sudoless Docker is enabled but before the reboot.
|
||||||
|
# --configured Will it need sudo once the account's groups take effect?
|
||||||
|
# Answered from the account's configured groups, so the menu
|
||||||
|
# offers the toggle that can actually change state.
|
||||||
|
#
|
||||||
|
# Succeeds (exit 0) when sudo is needed, so it reads as `if omarchy-sudo-docker`.
|
||||||
|
|
||||||
|
DOCKER_SOCKET="${OMARCHY_DOCKER_SOCKET:-/var/run/docker.sock}"
|
||||||
|
|
||||||
|
case "${1:-}" in
|
||||||
|
--configured)
|
||||||
|
# An account in the docker group will not need sudo after the next login.
|
||||||
|
id -nG "$USER" 2>/dev/null | grep -qw docker && exit 1
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
"")
|
||||||
|
# A socket we can write is a daemon we can drive without elevating. A missing
|
||||||
|
# socket counts as needing sudo: reaching it means starting it as root anyway.
|
||||||
|
[[ -w $DOCKER_SOCKET ]] && exit 1
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Usage: omarchy-sudo-docker [--configured]" >&2
|
||||||
|
exit 2
|
||||||
|
;;
|
||||||
|
esac
|
||||||
@@ -3,16 +3,16 @@
|
|||||||
# omarchy:summary=Prompt for confirmation before starting an update
|
# omarchy:summary=Prompt for confirmation before starting an update
|
||||||
|
|
||||||
gum style --border normal --padding "1 2" \
|
gum style --border normal --padding "1 2" \
|
||||||
"Ready to update?" \
|
"准备好更新了吗?" \
|
||||||
"" \
|
"" \
|
||||||
"• You cannot stop the update once you start!" \
|
"• 更新一旦开始就不能中止!" \
|
||||||
"• Make sure you're connected to power or have a full battery" \
|
"• 请确保已接通电源或电量充足" \
|
||||||
"" \
|
"" \
|
||||||
"What's new: https://github.com/basecamp/omarchy/releases/latest"
|
"更新内容: https://git.zacharyzhang.com/ZacharyZhang-NY/omarchycn/releases"
|
||||||
|
|
||||||
echo
|
echo
|
||||||
|
|
||||||
if ! gum confirm "Continue with update?"; then
|
if ! gum confirm "继续更新?"; then
|
||||||
echo "Update cancelled"
|
echo "已取消更新"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -2196,10 +2196,6 @@ fi
|
|||||||
if command -v xdg-settings >/dev/null 2>&1; then
|
if command -v xdg-settings >/dev/null 2>&1; then
|
||||||
env -u BROWSER xdg-settings set default-web-browser chromium.desktop || true
|
env -u BROWSER xdg-settings set default-web-browser chromium.desktop || true
|
||||||
fi
|
fi
|
||||||
if command -v xdg-mime >/dev/null 2>&1; then
|
|
||||||
xdg-mime default HEY.desktop x-scheme-handler/mailto || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# This script is fetched from the branch and runs against whatever packaged
|
# This script is fetched from the branch and runs against whatever packaged
|
||||||
# tree the channel currently serves, so the packaged tree can be older than the
|
# tree the channel currently serves, so the packaged tree can be older than the
|
||||||
# script. The completion markers are written directly rather than through
|
# script. The completion markers are written directly rather than through
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# omarchy:summary=Open HEY webmail and translate mailto links
|
|
||||||
# omarchy:args=[url]
|
|
||||||
|
|
||||||
url="$1"
|
|
||||||
web_url="https://app.hey.com"
|
|
||||||
|
|
||||||
# Handle mailto: URLs
|
|
||||||
if [[ $url =~ ^mailto: ]]; then
|
|
||||||
email=$(echo "$url" | sed 's/mailto://')
|
|
||||||
web_url="https://app.hey.com/messages/new?to=$email"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec omarchy-launch-webapp "$web_url"
|
|
||||||
@@ -31,8 +31,11 @@ CONTAINER="omarchy-windows"
|
|||||||
|
|
||||||
# --- privilege helpers -------------------------------------------------------
|
# --- privilege helpers -------------------------------------------------------
|
||||||
|
|
||||||
# True when the user can reach the Docker socket directly (sudoless Docker on).
|
# True when this session can reach the Docker socket directly (sudoless Docker
|
||||||
in_docker_group() { id -nG 2>/dev/null | grep -qw docker; }
|
# on and in effect). Asking about the socket rather than the configured groups
|
||||||
|
# keeps the prompt in place through the window where sudoless Docker is enabled
|
||||||
|
# but the reboot that grants the group has not happened yet.
|
||||||
|
docker_needs_sudo() { omarchy-sudo-docker; }
|
||||||
|
|
||||||
# The command to hand pkexec for the privileged re-exec. pkexec runs whatever
|
# The command to hand pkexec for the privileged re-exec. pkexec runs whatever
|
||||||
# executable it is given (after authorization) and only shows the path in the
|
# executable it is given (after authorization) and only shows the path in the
|
||||||
@@ -64,7 +67,7 @@ priv_target() {
|
|||||||
priv() {
|
priv() {
|
||||||
local action="$1"
|
local action="$1"
|
||||||
shift
|
shift
|
||||||
if [[ $action != write_compose ]] && in_docker_group; then
|
if [[ $action != write_compose ]] && ! docker_needs_sudo; then
|
||||||
"__priv_$action" "$@"
|
"__priv_$action" "$@"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -0,0 +1,8 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# OmarchyCN command center: routes to omarchy cn <command>
|
||||||
|
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
OMARCHY_BIN_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
|
||||||
|
|
||||||
|
exec "$OMARCHY_BIN_DIR/omarchy" cn "$@"
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"_verified": "2026-08-24, AUR RPC 实证在维护且未 out-of-date",
|
||||||
|
"apps": {
|
||||||
|
"wechat": { "name": "微信", "source": "aur", "package": "wechat-universal-bwrap", "license": "proprietary" },
|
||||||
|
"qq": { "name": "QQ", "source": "aur", "package": "linuxqq", "license": "proprietary" },
|
||||||
|
"feishu": { "name": "飞书", "source": "aur", "package": "feishu-bin", "license": "proprietary" },
|
||||||
|
"dingtalk": { "name": "钉钉", "source": "aur", "package": "dingtalk-bin", "license": "proprietary" },
|
||||||
|
"wemeet": { "name": "腾讯会议", "source": "aur", "package": "wemeet-bin", "license": "proprietary" },
|
||||||
|
"wps": { "name": "WPS Office", "source": "aur", "package": "wps-office-cn", "license": "proprietary" },
|
||||||
|
"tencent-docs": { "name": "腾讯文档", "source": "webapp", "url": "https://docs.qq.com", "icon": "https://docs.qq.com/favicon.ico", "license": "web" },
|
||||||
|
"yuque": { "name": "语雀", "source": "webapp", "url": "https://www.yuque.com/dashboard", "icon": "https://www.yuque.com/favicon.ico", "license": "web" },
|
||||||
|
"shimo": { "name": "石墨文档", "source": "webapp", "url": "https://shimo.im/desktop", "icon": "https://shimo.im/favicon.ico", "license": "web" }
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"npm": {
|
||||||
|
"china": "https://registry.npmmirror.com",
|
||||||
|
"official": "https://registry.npmjs.org/"
|
||||||
|
},
|
||||||
|
"pip": {
|
||||||
|
"china": "https://pypi.tuna.tsinghua.edu.cn/simple",
|
||||||
|
"official": "https://pypi.org/simple"
|
||||||
|
},
|
||||||
|
"cargo": {
|
||||||
|
"china": "sparse+https://rsproxy.cn/index/",
|
||||||
|
"official": ""
|
||||||
|
},
|
||||||
|
"go": {
|
||||||
|
"china": "https://goproxy.cn,direct",
|
||||||
|
"official": "https://proxy.golang.org,direct"
|
||||||
|
},
|
||||||
|
"gem": {
|
||||||
|
"china": "https://mirrors.tuna.tsinghua.edu.cn/rubygems/",
|
||||||
|
"official": "https://rubygems.org/"
|
||||||
|
},
|
||||||
|
"docker": {
|
||||||
|
"china": "https://docker.m.daocloud.io",
|
||||||
|
"official": ""
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
[Groups/0]
|
||||||
|
Name=Default
|
||||||
|
Default Layout=us
|
||||||
|
DefaultIM=rime
|
||||||
|
|
||||||
|
[Groups/0/Items/0]
|
||||||
|
Name=keyboard-us
|
||||||
|
Layout=
|
||||||
|
|
||||||
|
[Groups/0/Items/1]
|
||||||
|
Name=rime
|
||||||
|
Layout=
|
||||||
|
|
||||||
|
[GroupOrder]
|
||||||
|
0=Default
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||||
|
<fontconfig>
|
||||||
|
<!-- 日文/韩文标签内容保持原生字形(仅约束 generic 请求,避免波及未标签路径) -->
|
||||||
|
<match target="pattern">
|
||||||
|
<test name="lang" compare="contains"><string>ja</string></test>
|
||||||
|
<test name="family"><string>sans-serif</string></test>
|
||||||
|
<edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK JP</string></edit>
|
||||||
|
</match>
|
||||||
|
<match target="pattern">
|
||||||
|
<test name="lang" compare="contains"><string>ko</string></test>
|
||||||
|
<test name="family"><string>sans-serif</string></test>
|
||||||
|
<edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK KR</string></edit>
|
||||||
|
</match>
|
||||||
|
|
||||||
|
<!-- 简体中文内容强制简体字形 -->
|
||||||
|
<match target="pattern">
|
||||||
|
<test name="lang" compare="contains"><string>zh-cn</string></test>
|
||||||
|
<test name="family"><string>sans-serif</string></test>
|
||||||
|
<edit name="family" mode="prepend" binding="strong"><string>Noto Sans CJK SC</string></edit>
|
||||||
|
</match>
|
||||||
|
<match target="pattern">
|
||||||
|
<test name="lang" compare="contains"><string>zh-cn</string></test>
|
||||||
|
<test name="family"><string>serif</string></test>
|
||||||
|
<edit name="family" mode="prepend" binding="strong"><string>Noto Serif CJK SC</string></edit>
|
||||||
|
</match>
|
||||||
|
<match target="pattern">
|
||||||
|
<test name="lang" compare="contains"><string>zh-cn</string></test>
|
||||||
|
<test name="family"><string>monospace</string></test>
|
||||||
|
<edit name="family" mode="prepend" binding="strong"><string>Noto Sans Mono CJK SC</string></edit>
|
||||||
|
</match>
|
||||||
|
|
||||||
|
<!-- 无语言标签的任意字体请求:汉字回退到 SC 而非 JP(Chromium/Electron 常见路径) -->
|
||||||
|
<match target="pattern">
|
||||||
|
<edit name="family" mode="append" binding="weak"><string>Noto Sans CJK SC</string></edit>
|
||||||
|
</match>
|
||||||
|
|
||||||
|
<!-- generic 家族展开时 SC 优先于其他 CJK 变体 -->
|
||||||
|
<alias>
|
||||||
|
<family>sans-serif</family>
|
||||||
|
<prefer>
|
||||||
|
<family>Noto Sans</family>
|
||||||
|
<family>Noto Sans CJK SC</family>
|
||||||
|
<family>Noto Color Emoji</family>
|
||||||
|
</prefer>
|
||||||
|
</alias>
|
||||||
|
<alias>
|
||||||
|
<family>serif</family>
|
||||||
|
<prefer>
|
||||||
|
<family>Noto Serif</family>
|
||||||
|
<family>Noto Serif CJK SC</family>
|
||||||
|
<family>Noto Color Emoji</family>
|
||||||
|
</prefer>
|
||||||
|
</alias>
|
||||||
|
<alias>
|
||||||
|
<family>monospace</family>
|
||||||
|
<prefer>
|
||||||
|
<family>Noto Sans Mono CJK SC</family>
|
||||||
|
<family>Noto Color Emoji</family>
|
||||||
|
</prefer>
|
||||||
|
</alias>
|
||||||
|
</fontconfig>
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
xsBNBGqMzPYBCADOcNGiPxC8AgP1kG1s6obLZi5NzfkVzlqkWH9/7JgSokRr//IO
|
||||||
|
L8L2eMQ5bvEou4Mc+eujPI+5Tm8TwfECkjhKWbEOk09yn9kUXVlc/+iROJXF9z4u
|
||||||
|
Cp6BIiZ5YzoadZysCqSLlYXejp38LGXdi4xyh5SfXII/VD/036MBwvwZkb6qoFsp
|
||||||
|
1AS4BRLcE0BgD2QjL5MIFU+yVblUZl8ss1r9AVNNgAllGzFpYHFt+PknnPDldj/j
|
||||||
|
dv5vihekC1Wy+w46w15vdBM04i6t1h72N3naFfuPkMJFuXo0NLWMNLOeDp+bsej8
|
||||||
|
Kwf31yn6Vz0XLw8wCmLBwUtBaahvE/TqYUJPABEBAAHNDyhBcmNoIFJlZ2lzdHJ5
|
||||||
|
KcLAuwQTAQgAbwWCaozM9gILBwkQvThgSIZ7M7Q1FAAAAAAAHAAQc2FsdEBub3Rh
|
||||||
|
dGlvbnMub3BlbnBncGpzLm9yZwbZDf7U+gBf+H+EPPm1SmYCFQgCFgACGQECmwMC
|
||||||
|
HgEWIQR03PV6zYErJNlZ8Ua9OGBIhnsztAAATuEH/2LQxWP9JXXjloS2HwsD/jBb
|
||||||
|
OX/LPP4inkbUmkxaPx9hzecKPIZttzRoIXK8FxviPxwifQYPRShD5t1UwI1vwTnY
|
||||||
|
BCWs4VUf+vMlcaKrmMhgL4z3Wfi1Cpn7GcEYaCB+9BPbNlVTy4KzQJKXk8RkrOPz
|
||||||
|
+r2YynBH2PynjoqVqVvgAnU1vc5gdRUdZIBQIt8RqpwF/Sc0+WwWf9bdW1VzB0Pc
|
||||||
|
QTvuCaNzQOtSTYgDko9XJSa5VNQJrYuwYg97DmTfx+PYm2dFBTeR8Ut9wWiynItZ
|
||||||
|
4ywSm6qE9w1OuBknUx80jev2LGlNNCD0/xBTWPokLf0ZsgLG9f302raZ+WY78GzO
|
||||||
|
wE0EaozM9gEIAN8JV920AR4+TY1v1FVenZbSq74nCe2UNtEHWf97cwZye8ivUbg2
|
||||||
|
mbDEJp+09asoLWRGwzDvD6rUicqihvTgAOB5cZQU1D9wxXfowfG5aB/czVA0MzPU
|
||||||
|
bj5BXS8lA0pN4zcTamCHnrfoQpCGk+eB48xwBPLfxxVtwttaBtvG2YAPdiwultJu
|
||||||
|
13IX4lsK/LS425NYwzuGw5m7Amy/rzamAUZiymIiG45RQ8y3/1UYRMW4yXOVMrtV
|
||||||
|
fmtaL/hzsG0sGVEyiuseR/ZPqZKZrveYeqzy3fCOyCGsPwWH9rtfDekGBGbJLoiY
|
||||||
|
wwA3ikMifFYPr1A1PMOBR5jAXYV/VG/pQQkAEQEAAcLArAQYAQgAYAWCaozM9gkQ
|
||||||
|
vThgSIZ7M7Q1FAAAAAAAHAAQc2FsdEBub3RhdGlvbnMub3BlbnBncGpzLm9yZyFs
|
||||||
|
5xT4PpfIzf6Y7ke/Br8CmwwWIQR03PV6zYErJNlZ8Ua9OGBIhnsztAAATqIH/26g
|
||||||
|
dx2lJNHIYXlS/Ld8JXCC42IctWPeESegQPmJp96GbvF4Z7dVB0e+kqy7YgNYY8dv
|
||||||
|
ibc7GicmQrAtsNDmm+fB1nmd316HxrtiVsBKgeNWTh7EN8cH79lNB4IqwWf6zkny
|
||||||
|
1A1Ntbtqv0tERg/fXEuY6y+9f67JBM5P20iWRij3NNODPHpy5Vr7Ftm7pQ7FgDSj
|
||||||
|
tntrOKMvAwKsWA+avGt55eQe9kbbFhbOqQEXfiqIgIQki0yg8o5VrIz5ZEQm7AXU
|
||||||
|
fYr6IxJPrD7KhBeXO2Z0/TdKjZ5c1kpWEC2W0x8TUH9s2v5q4UeTlyHg5fyFzte6
|
||||||
|
oAEZesYWyQ10m7ewZTg=
|
||||||
|
=9OK8
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||||
|
|
||||||
|
mDMEaozDJhYJKwYBBAHaRw8BAQdA3l2d/6gj2z96cit0NGYg419BmDDFH6SYhkzL
|
||||||
|
3OMVCem0PU9tYXJjaHlDTiBSZWxlYXNlIFNpZ25pbmcgS2V5IDx6aGFuZ3lhbmdo
|
||||||
|
YWhhMDQwN0BvdXRsb29rLmNvbT6ImQQTFgoAQRYhBARJDwZfat0mKnJDUG7fe4YD
|
||||||
|
tdJHBQJqjMMmAhsBBQkDwmcABQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJ
|
||||||
|
EG7fe4YDtdJHuSMBAI3/samJVmhfdr/HYS8y266Xq82tof9lL9izImd/YibkAQCQ
|
||||||
|
Fjw97J4LPnPQEm93j/3kmHC+EGTQu3EDbXEoI/AUC7gzBGqMwyYWCSsGAQQB2kcP
|
||||||
|
AQEHQCRBOFrQ9UQVtv3XawZIMm93j3IV45K8kk5AGLg+JnMUiPUEGBYKACYWIQQE
|
||||||
|
SQ8GX2rdJipyQ1Bu33uGA7XSRwUCaozDJgIbAgUJA8JnAACBCRBu33uGA7XSR3Yg
|
||||||
|
BBkWCgAdFiEEUarKC/SJIll7SA5+IRubguF8+2cFAmqMwyYACgkQIRubguF8+2cP
|
||||||
|
FQD6A6Xgt7L5bXR/kSJXvDHEgjsQG5xfAEEaZ8/VZ0clWxwA/ikOgsx8VQkZhwrJ
|
||||||
|
Hb/3iG5mb138yHf3Ug00N1GwL6gOHn0A/3OSdXKvdmQhMEUf8TpZNf/ouRal2NsI
|
||||||
|
BB1FBGxZWCYGAQDJRR2W0FEYbEuzUj9XGCHb8O9TjabNN0QduQj78ZNNAQ==
|
||||||
|
=Awb4
|
||||||
|
-----END PGP PUBLIC KEY BLOCK-----
|
||||||
@@ -0,0 +1,159 @@
|
|||||||
|
# shellcheck shell=bash
|
||||||
|
# Sourced helpers for omarchy-cn-ai-* commands
|
||||||
|
|
||||||
|
CN_AI_PROVIDERS="$OMARCHY_PATH/cn/registry/ai-providers.json"
|
||||||
|
CN_AI_HARNESSES="$OMARCHY_PATH/cn/registry/ai-harnesses.json"
|
||||||
|
CN_AI_COMPAT="$OMARCHY_PATH/cn/registry/ai-compatibility.json"
|
||||||
|
CN_AI_PROFILE_DIR="$HOME/.config/omarchycn/ai/profiles"
|
||||||
|
CN_AI_CURRENT="$HOME/.config/omarchycn/ai/current"
|
||||||
|
|
||||||
|
cn_ai_provider_ids() { jq -r '.providers | keys[]' "$CN_AI_PROVIDERS"; }
|
||||||
|
cn_ai_harness_ids() { jq -r '.harnesses | keys[]' "$CN_AI_HARNESSES"; }
|
||||||
|
|
||||||
|
cn_ai_endpoint() {
|
||||||
|
jq -re --arg p "$1" --arg proto "$2" '.providers[$p].endpoints[$proto]' "$CN_AI_PROVIDERS"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_ai_models() {
|
||||||
|
jq -r --arg p "$1" '.providers[$p].models[].id' "$CN_AI_PROVIDERS"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_ai_model_by_alias() {
|
||||||
|
jq -re --arg p "$1" --arg a "$2" \
|
||||||
|
'.providers[$p].models[] | select(.aliases // [] | index($a)) | .id' "$CN_AI_PROVIDERS"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_ai_fast_model() {
|
||||||
|
cn_ai_model_by_alias "$1" fast 2>/dev/null || cn_ai_model_by_alias "$1" default-coding
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_ai_harness_field() {
|
||||||
|
jq -re --arg h "$1" --arg f "$2" '.harnesses[$h][$f]' "$CN_AI_HARNESSES"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_ai_combo_level() {
|
||||||
|
jq -r --arg h "$1" --arg p "$2" '.combos[$h][$p].level // "unsupported"' "$CN_AI_COMPAT"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Combo-specific model allowlist; empty output means no restriction
|
||||||
|
cn_ai_combo_models() {
|
||||||
|
jq -r --arg h "$1" --arg p "$2" '.combos[$h][$p].models // [] | .[]' "$CN_AI_COMPAT"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_ai_model_protocol() {
|
||||||
|
jq -r --arg p "$1" --arg m "$2" \
|
||||||
|
'.providers[$p].models[] | select(.id == $m) | .protocol // ""' "$CN_AI_PROVIDERS"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Profile files are flat key="value" lines
|
||||||
|
cn_ai_profile_field() {
|
||||||
|
local file="$CN_AI_PROFILE_DIR/$1.toml" key="$2"
|
||||||
|
grep -E "^$key = " "$file" | head -1 | cut -d\" -f2
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_ai_current_profile() {
|
||||||
|
if [[ ! -f $CN_AI_CURRENT ]]; then
|
||||||
|
echo "No default AI profile set (run: omarchycn ai profile use <name>)" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
cat "$CN_AI_CURRENT"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Print export statements for the profile's harness x provider combo.
|
||||||
|
# Secrets are resolved at launch time only; nothing is written to disk.
|
||||||
|
cn_ai_render_env() {
|
||||||
|
local harness="$1" provider="$2" model="$3" key="$4"
|
||||||
|
local base fast
|
||||||
|
|
||||||
|
case "$harness" in
|
||||||
|
claude-code)
|
||||||
|
base=$(cn_ai_endpoint "$provider" anthropic)
|
||||||
|
fast=$(cn_ai_fast_model "$provider")
|
||||||
|
printf 'export ANTHROPIC_BASE_URL=%q\n' "$base"
|
||||||
|
# Docs vary between AUTH_TOKEN (deepseek/zai) and API_KEY (kimi): set both
|
||||||
|
printf 'export ANTHROPIC_AUTH_TOKEN=%q\n' "$key"
|
||||||
|
printf 'export ANTHROPIC_API_KEY=%q\n' "$key"
|
||||||
|
printf 'export ANTHROPIC_MODEL=%q\n' "$model"
|
||||||
|
printf 'export ANTHROPIC_DEFAULT_SONNET_MODEL=%q\n' "$model"
|
||||||
|
printf 'export ANTHROPIC_DEFAULT_OPUS_MODEL=%q\n' "$model"
|
||||||
|
printf 'export ANTHROPIC_DEFAULT_HAIKU_MODEL=%q\n' "$fast"
|
||||||
|
;;
|
||||||
|
opencode)
|
||||||
|
if [[ $provider != "deepseek" ]]; then
|
||||||
|
echo "opencode adapter renders only the deepseek combo (native provider)" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
printf 'export DEEPSEEK_API_KEY=%q\n' "$key"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "No env renderer for harness: $harness" >&2
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
# Write ~/.codex/config.toml + models.json per DeepSeek's official codex
|
||||||
|
# integration contract (mirrors cdn.deepseek.com codex-deepseek-setup script)
|
||||||
|
cn_ai_render_codex_config() {
|
||||||
|
local provider="$1" model="$2" key="$3"
|
||||||
|
local base cfg="$HOME/.codex/config.toml"
|
||||||
|
|
||||||
|
if [[ $provider != "deepseek" ]]; then
|
||||||
|
echo "codex adapter renders only the deepseek combo (official integration)" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
base="https://api.deepseek.com/"
|
||||||
|
|
||||||
|
mkdir -p "${cfg%/*}"
|
||||||
|
touch "$cfg"
|
||||||
|
|
||||||
|
# Strip our old blocks first, then check for an unmanaged provider table
|
||||||
|
rm -f "$cfg.omarchycn-tmp" "$cfg.omarchycn-new"
|
||||||
|
(
|
||||||
|
umask 077
|
||||||
|
awk '
|
||||||
|
/^# OmarchyCN ai (model|provider) begin$/ { skip = 1; next }
|
||||||
|
/^# OmarchyCN ai (model|provider) end$/ { skip = 0; next }
|
||||||
|
skip { next }
|
||||||
|
/^[[:space:]]*\[/ { in_section = 1 }
|
||||||
|
!in_section && /^[[:space:]]*(model|model_provider|model_catalog_json|preferred_auth_method|forced_login_method|model_reasoning_effort)[[:space:]]*=/ { next }
|
||||||
|
{ print }
|
||||||
|
' "$cfg" > "$cfg.omarchycn-tmp"
|
||||||
|
)
|
||||||
|
|
||||||
|
if grep -qE "^[[:space:]]*\[[[:space:]]*model_providers[[:space:]]*\.[[:space:]]*\"?$provider\"?[[:space:]]*\]" "$cfg.omarchycn-tmp"; then
|
||||||
|
rm -f "$cfg.omarchycn-tmp"
|
||||||
|
echo "codex: $cfg 已有非托管的 [model_providers.$provider],请手动清理后重试" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -s $cfg ]]; then
|
||||||
|
cp "$cfg" "$cfg.omarchycn-bak-$(date +%Y%m%d-%H%M%S)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
cp "$OMARCHY_PATH/cn/registry/codex-deepseek-models.json" "$HOME/.codex/models.json"
|
||||||
|
|
||||||
|
(
|
||||||
|
umask 077
|
||||||
|
{
|
||||||
|
echo "# OmarchyCN ai model begin"
|
||||||
|
echo "model = \"$model\""
|
||||||
|
echo "model_provider = \"$provider\""
|
||||||
|
echo "model_catalog_json = \"~/.codex/models.json\""
|
||||||
|
echo "preferred_auth_method = \"apikey\""
|
||||||
|
echo "forced_login_method = \"api\""
|
||||||
|
echo "model_reasoning_effort = \"high\""
|
||||||
|
echo "# OmarchyCN ai model end"
|
||||||
|
cat "$cfg.omarchycn-tmp"
|
||||||
|
echo "# OmarchyCN ai provider begin"
|
||||||
|
echo "[model_providers.$provider]"
|
||||||
|
echo "name = \"$provider\""
|
||||||
|
echo "base_url = \"$base\""
|
||||||
|
echo "wire_api = \"responses\""
|
||||||
|
echo "experimental_bearer_token = \"$key\""
|
||||||
|
echo "# OmarchyCN ai provider end"
|
||||||
|
} > "$cfg.omarchycn-new"
|
||||||
|
)
|
||||||
|
mv "$cfg.omarchycn-new" "$cfg"
|
||||||
|
rm -f "$cfg.omarchycn-tmp"
|
||||||
|
}
|
||||||
@@ -0,0 +1,138 @@
|
|||||||
|
# shellcheck shell=bash
|
||||||
|
# Sourced helpers for omarchy-cn-dev-mirror-* commands
|
||||||
|
|
||||||
|
CN_DEV_MIRRORS_JSON="$OMARCHY_PATH/cn/dev-mirrors.json"
|
||||||
|
# shellcheck disable=SC2034 # consumed by sourcing commands
|
||||||
|
CN_DM_TARGETS=(npm pip cargo go gem docker)
|
||||||
|
CN_DM_BACKUP_ROOT="$HOME/.local/state/omarchycn/backups/dev-mirror"
|
||||||
|
|
||||||
|
cn_dm_url() {
|
||||||
|
jq -re --arg t "$1" --arg p "$2" '.[$t][$p]' "$CN_DEV_MIRRORS_JSON"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_backup() {
|
||||||
|
local file="$1"
|
||||||
|
local stamp="$2"
|
||||||
|
|
||||||
|
if [[ -f $file ]]; then
|
||||||
|
mkdir -p "$CN_DM_BACKUP_ROOT/$stamp"
|
||||||
|
cp "$file" "$CN_DM_BACKUP_ROOT/$stamp/${file##*/}"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Replace-or-append one key=value style line matched by a regex
|
||||||
|
cn_dm_set_line() {
|
||||||
|
local file="$1" match="$2" line="$3"
|
||||||
|
|
||||||
|
mkdir -p "${file%/*}"
|
||||||
|
touch "$file"
|
||||||
|
grep -vE "$match" "$file" > "$file.omarchycn-tmp" || true
|
||||||
|
printf '%s\n' "$line" >> "$file.omarchycn-tmp"
|
||||||
|
mv "$file.omarchycn-tmp" "$file"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_get_npm() { grep -sE '^registry=' "$HOME/.npmrc" | cut -d= -f2- || true; }
|
||||||
|
cn_dm_set_npm() { cn_dm_set_line "$HOME/.npmrc" '^registry=' "registry=$1"; }
|
||||||
|
|
||||||
|
cn_dm_get_pip() {
|
||||||
|
python3 - <<'EOF'
|
||||||
|
import configparser, os
|
||||||
|
c = configparser.ConfigParser()
|
||||||
|
c.read(os.path.expanduser("~/.config/pip/pip.conf"))
|
||||||
|
print(c.get("global", "index-url", fallback=""))
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_set_pip() {
|
||||||
|
CN_DM_PIP_URL="$1" python3 - <<'EOF'
|
||||||
|
import configparser, os
|
||||||
|
path = os.path.expanduser("~/.config/pip/pip.conf")
|
||||||
|
c = configparser.ConfigParser()
|
||||||
|
c.read(path)
|
||||||
|
if not c.has_section("global"):
|
||||||
|
c.add_section("global")
|
||||||
|
c.set("global", "index-url", os.environ["CN_DM_PIP_URL"])
|
||||||
|
os.makedirs(os.path.dirname(path), exist_ok=True)
|
||||||
|
with open(path, "w") as f:
|
||||||
|
c.write(f)
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_get_cargo() {
|
||||||
|
local f="$HOME/.cargo/config.toml"
|
||||||
|
grep -sA1 '^\[source\.omarchycn\]' "$f" | grep -sE '^registry' | cut -d\" -f2 || true
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_set_cargo() {
|
||||||
|
local url="$1" f="$HOME/.cargo/config.toml"
|
||||||
|
|
||||||
|
mkdir -p "${f%/*}"
|
||||||
|
touch "$f"
|
||||||
|
sed -i '/^# OmarchyCN dev-mirror begin$/,/^# OmarchyCN dev-mirror end$/d' "$f"
|
||||||
|
if [[ -z $url ]]; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
if grep -q '^\[source\.crates-io\]' "$f"; then
|
||||||
|
echo "cargo: $f already defines [source.crates-io]; edit it manually" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
cat >> "$f" <<EOF
|
||||||
|
# OmarchyCN dev-mirror begin
|
||||||
|
[source.crates-io]
|
||||||
|
replace-with = "omarchycn"
|
||||||
|
|
||||||
|
[source.omarchycn]
|
||||||
|
registry = "$url"
|
||||||
|
# OmarchyCN dev-mirror end
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_get_go() { grep -sE '^GOPROXY=' "$HOME/.config/go/env" | cut -d= -f2- || true; }
|
||||||
|
cn_dm_set_go() { cn_dm_set_line "$HOME/.config/go/env" '^GOPROXY=' "GOPROXY=$1"; }
|
||||||
|
|
||||||
|
cn_dm_get_gem() { grep -sE '^- ' "$HOME/.gemrc" | head -1 | sed 's/^- //' || true; }
|
||||||
|
|
||||||
|
cn_dm_set_gem() {
|
||||||
|
local f="$HOME/.gemrc"
|
||||||
|
|
||||||
|
if [[ -s $f ]] && ! grep -q '^# OmarchyCN dev-mirror managed$' "$f"; then
|
||||||
|
echo "gem: $f has existing user content; set :sources: manually" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
cat > "$f" <<EOF
|
||||||
|
# OmarchyCN dev-mirror managed
|
||||||
|
---
|
||||||
|
:sources:
|
||||||
|
- $1
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_get_docker() {
|
||||||
|
jq -re '."registry-mirrors"[0] // ""' /etc/docker/daemon.json 2>/dev/null || true
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_set_docker() {
|
||||||
|
local url="$1" current="{}"
|
||||||
|
|
||||||
|
sudo mkdir -p /etc/docker
|
||||||
|
if sudo test -f /etc/docker/daemon.json; then
|
||||||
|
current=$(sudo cat /etc/docker/daemon.json)
|
||||||
|
fi
|
||||||
|
if [[ -n $url ]]; then
|
||||||
|
jq --arg u "$url" '."registry-mirrors" = [$u]' <<<"$current" | sudo tee /etc/docker/daemon.json > /dev/null
|
||||||
|
else
|
||||||
|
jq 'del(."registry-mirrors")' <<<"$current" | sudo tee /etc/docker/daemon.json > /dev/null
|
||||||
|
fi
|
||||||
|
echo "docker: restart the docker daemon to take effect"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_dm_config_file() {
|
||||||
|
case "$1" in
|
||||||
|
npm) echo "$HOME/.npmrc" ;;
|
||||||
|
pip) echo "$HOME/.config/pip/pip.conf" ;;
|
||||||
|
cargo) echo "$HOME/.cargo/config.toml" ;;
|
||||||
|
go) echo "$HOME/.config/go/env" ;;
|
||||||
|
gem) echo "$HOME/.gemrc" ;;
|
||||||
|
docker) echo "/etc/docker/daemon.json" ;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
@@ -0,0 +1,82 @@
|
|||||||
|
# shellcheck shell=bash
|
||||||
|
# Sourced helpers for omarchy-cn-mirror-* commands
|
||||||
|
|
||||||
|
CN_MIRRORS_JSON="$OMARCHY_PATH/cn/mirrors.json"
|
||||||
|
CN_MIRRORLIST="/etc/pacman.d/mirrorlist"
|
||||||
|
CN_PROFILE_FILE="$HOME/.config/omarchycn/mirror-profile"
|
||||||
|
|
||||||
|
cn_mirror_ids() {
|
||||||
|
jq -r '.mirrors[].id' "$CN_MIRRORS_JSON"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_mirror_url() {
|
||||||
|
jq -r --arg id "$1" '.mirrors[] | select(.id == $id) | .url' "$CN_MIRRORS_JSON"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_mirror_name() {
|
||||||
|
jq -r --arg id "$1" '.mirrors[] | select(.id == $id) | .name' "$CN_MIRRORS_JSON"
|
||||||
|
}
|
||||||
|
|
||||||
|
cn_mirror_ids_by_region() {
|
||||||
|
jq -r --arg r "$1" '.mirrors[] | select(.region == $r) | .id' "$CN_MIRRORS_JSON"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Probe one mirror: prints "<speed_bytes_s> <ttfb_s> <sync_age_s|stale|unknown>"
|
||||||
|
cn_mirror_probe() {
|
||||||
|
local url="$1"
|
||||||
|
local out speed=0 ttfb=0 lastsync age="unknown" now
|
||||||
|
|
||||||
|
if out=$(curl -sSf -o /dev/null -m 12 --connect-timeout 5 \
|
||||||
|
-w '%{speed_download} %{time_starttransfer}' \
|
||||||
|
"$url/core/os/x86_64/core.db" 2>/dev/null); then
|
||||||
|
read -r speed ttfb <<<"$out"
|
||||||
|
speed="${speed%%.*}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if lastsync=$(curl -sSf -m 5 --connect-timeout 5 "$url/lastsync" 2>/dev/null); then
|
||||||
|
lastsync=$(tr -cd '0-9' <<<"$lastsync")
|
||||||
|
if [[ -n $lastsync ]]; then
|
||||||
|
now=$(date +%s)
|
||||||
|
age=$((now - lastsync))
|
||||||
|
if (( age > 86400 )); then
|
||||||
|
age="stale"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$speed $ttfb $age"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Rank ids by probe speed, excluding dead (speed 0) and stale mirrors
|
||||||
|
cn_mirror_rank() {
|
||||||
|
local id url speed ttfb age
|
||||||
|
|
||||||
|
for id in "$@"; do
|
||||||
|
url=$(cn_mirror_url "$id")
|
||||||
|
read -r speed ttfb age < <(cn_mirror_probe "$url")
|
||||||
|
(( speed > 0 )) || continue
|
||||||
|
[[ $age == "stale" ]] && continue
|
||||||
|
echo "$speed $id"
|
||||||
|
done | sort -rn | awk '{print $2}'
|
||||||
|
}
|
||||||
|
|
||||||
|
# Write mirrorlist from mirror ids (first = primary), with timestamped backup
|
||||||
|
cn_mirror_write_list() {
|
||||||
|
local profile="$1"
|
||||||
|
shift
|
||||||
|
local stamp id url content=""
|
||||||
|
|
||||||
|
stamp=$(date +%Y%m%d-%H%M%S)
|
||||||
|
content="## OmarchyCN mirrorlist (profile: $profile, generated $stamp)\n"
|
||||||
|
for id in "$@"; do
|
||||||
|
url=$(cn_mirror_url "$id")
|
||||||
|
content+="## $id: $(cn_mirror_name "$id")\nServer = $url/\$repo/os/\$arch\n"
|
||||||
|
done
|
||||||
|
|
||||||
|
sudo cp "$CN_MIRRORLIST" "$CN_MIRRORLIST.omarchycn-bak-$stamp"
|
||||||
|
printf '%b' "$content" | sudo tee "$CN_MIRRORLIST" > /dev/null
|
||||||
|
|
||||||
|
mkdir -p "${CN_PROFILE_FILE%/*}"
|
||||||
|
echo "$profile" > "$CN_PROFILE_FILE"
|
||||||
|
echo "Mirrorlist written ($CN_MIRRORLIST), backup: $CN_MIRRORLIST.omarchycn-bak-$stamp"
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"mirrors": [
|
||||||
|
{ "id": "tuna", "name": "清华大学 TUNA", "region": "cn", "url": "https://mirrors.tuna.tsinghua.edu.cn/archlinux" },
|
||||||
|
{ "id": "ustc", "name": "中国科学技术大学", "region": "cn", "url": "https://mirrors.ustc.edu.cn/archlinux" },
|
||||||
|
{ "id": "aliyun", "name": "阿里云", "region": "cn", "url": "https://mirrors.aliyun.com/archlinux" },
|
||||||
|
{ "id": "tencent", "name": "腾讯云", "region": "cn", "url": "https://mirrors.cloud.tencent.com/archlinux" },
|
||||||
|
{ "id": "netease", "name": "网易", "region": "cn", "url": "https://mirrors.163.com/archlinux" },
|
||||||
|
{ "id": "sjtu", "name": "上海交通大学", "region": "cn", "url": "https://mirror.sjtu.edu.cn/archlinux" },
|
||||||
|
{ "id": "geo", "name": "Arch 官方 Geo Mirror", "region": "global", "url": "https://geo.mirror.pkgbuild.com" },
|
||||||
|
{ "id": "worldwide", "name": "Arch 官方 Worldwide", "region": "global", "url": "https://mirror.rackspace.com/archlinux" }
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,66 @@
|
|||||||
|
{
|
||||||
|
"_verified": "2026-08-25. level=stable: adapter 渲染由 test/shell.d/omarchycn-ai-test.sh mock 回归覆盖; level=official-doc: 官方集成文档存在,native CLI 自管配置",
|
||||||
|
"combos": {
|
||||||
|
"claude-code": {
|
||||||
|
"deepseek": {
|
||||||
|
"level": "stable",
|
||||||
|
"doc": "https://api-docs.deepseek.com/quick_start/agent_integrations/claude_code/",
|
||||||
|
"adapter": true
|
||||||
|
},
|
||||||
|
"kimi": {
|
||||||
|
"level": "stable",
|
||||||
|
"doc": "https://www.kimi.com/code/docs/en/third-party-tools/claude-code",
|
||||||
|
"adapter": true
|
||||||
|
},
|
||||||
|
"zai": {
|
||||||
|
"level": "stable",
|
||||||
|
"doc": "https://docs.z.ai/devpack/tool/claude",
|
||||||
|
"adapter": true
|
||||||
|
},
|
||||||
|
"minimax": {
|
||||||
|
"level": "stable",
|
||||||
|
"doc": "https://platform.minimax.io/docs/token-plan/claude-code",
|
||||||
|
"adapter": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"codex": {
|
||||||
|
"deepseek": {
|
||||||
|
"level": "stable",
|
||||||
|
"doc": "https://api-docs.deepseek.com/quick_start/agent_integrations/codex/",
|
||||||
|
"models": [
|
||||||
|
"deepseek-v4-flash",
|
||||||
|
"deepseek-v4-pro",
|
||||||
|
"deepseek-v4-flash-vision-exp"
|
||||||
|
],
|
||||||
|
"catalog": "codex-deepseek-models.json",
|
||||||
|
"adapter": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"opencode": {
|
||||||
|
"deepseek": {
|
||||||
|
"level": "stable",
|
||||||
|
"doc": "https://api-docs.deepseek.com/quick_start/agent_integrations/opencode/",
|
||||||
|
"adapter": true
|
||||||
|
},
|
||||||
|
"zai": {
|
||||||
|
"level": "official-doc",
|
||||||
|
"doc": "https://docs.z.ai/scenario-example/develop-tools/opencode",
|
||||||
|
"adapter": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"kimi-code": {
|
||||||
|
"kimi": {
|
||||||
|
"level": "official-doc",
|
||||||
|
"doc": "https://www.kimi.com/code/docs/en/",
|
||||||
|
"adapter": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"deep-code": {
|
||||||
|
"deepseek": {
|
||||||
|
"level": "official-doc",
|
||||||
|
"doc": "https://api-docs.deepseek.com/quick_start/agent_integrations/deepcode/",
|
||||||
|
"adapter": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{
|
||||||
|
"_verified": "2026-08-24",
|
||||||
|
"harnesses": {
|
||||||
|
"claude-code": {
|
||||||
|
"display_name": "Claude Code",
|
||||||
|
"command": "claude",
|
||||||
|
"install": "omarchy-mise-install claude",
|
||||||
|
"config_method": "env",
|
||||||
|
"protocol": "anthropic"
|
||||||
|
},
|
||||||
|
"codex": {
|
||||||
|
"display_name": "Codex",
|
||||||
|
"command": "codex",
|
||||||
|
"install": "omarchy-mise-install codex",
|
||||||
|
"config_method": "env",
|
||||||
|
"protocol": "openai"
|
||||||
|
},
|
||||||
|
"opencode": {
|
||||||
|
"display_name": "OpenCode",
|
||||||
|
"command": "opencode",
|
||||||
|
"install": "omarchy-mise-install opencode",
|
||||||
|
"config_method": "env",
|
||||||
|
"protocol": "anthropic"
|
||||||
|
},
|
||||||
|
"kimi-code": {
|
||||||
|
"display_name": "Kimi Code CLI",
|
||||||
|
"command": "kimi",
|
||||||
|
"install": "doc:https://www.kimi.com/code/docs/en/",
|
||||||
|
"config_method": "native",
|
||||||
|
"protocol": "native"
|
||||||
|
},
|
||||||
|
"deep-code": {
|
||||||
|
"display_name": "Deep Code",
|
||||||
|
"command": "deepcode",
|
||||||
|
"install": "omarchy-mise-install npm:@vegamo/deepcode-cli deepcode",
|
||||||
|
"config_method": "native",
|
||||||
|
"protocol": "native"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
{
|
||||||
|
"_verified": "2026-08-25, from official docs (see OmarchyCN PRD §27; minimax: platform.minimax.io/docs/token-plan/claude-code)",
|
||||||
|
"providers": {
|
||||||
|
"deepseek": {
|
||||||
|
"display_name": "DeepSeek",
|
||||||
|
"auth": [
|
||||||
|
"api_key"
|
||||||
|
],
|
||||||
|
"key_url": "https://platform.deepseek.com/api_keys",
|
||||||
|
"endpoints": {
|
||||||
|
"anthropic": "https://api.deepseek.com/anthropic",
|
||||||
|
"openai": "https://api.deepseek.com"
|
||||||
|
},
|
||||||
|
"models": [
|
||||||
|
{
|
||||||
|
"id": "deepseek-v4-pro[1m]",
|
||||||
|
"aliases": [
|
||||||
|
"default-coding"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming",
|
||||||
|
"reasoning"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "deepseek-v4-flash",
|
||||||
|
"aliases": [
|
||||||
|
"fast"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"kimi": {
|
||||||
|
"display_name": "Kimi (Moonshot)",
|
||||||
|
"auth": [
|
||||||
|
"api_key"
|
||||||
|
],
|
||||||
|
"key_url": "https://www.kimi.com/code",
|
||||||
|
"endpoints": {
|
||||||
|
"anthropic": "https://api.kimi.com/coding/",
|
||||||
|
"openai": "https://api.moonshot.cn/v1"
|
||||||
|
},
|
||||||
|
"models": [
|
||||||
|
{
|
||||||
|
"id": "kimi-for-coding",
|
||||||
|
"aliases": [
|
||||||
|
"default-coding"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming",
|
||||||
|
"reasoning"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "kimi-for-coding-highspeed",
|
||||||
|
"aliases": [
|
||||||
|
"fast"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "kimi-k2.6",
|
||||||
|
"aliases": [
|
||||||
|
"general"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming"
|
||||||
|
],
|
||||||
|
"protocol": "openai"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"zai": {
|
||||||
|
"display_name": "Z.AI / GLM",
|
||||||
|
"auth": [
|
||||||
|
"api_key"
|
||||||
|
],
|
||||||
|
"key_url": "https://z.ai/manage-apikey/apikey-list",
|
||||||
|
"endpoints": {
|
||||||
|
"anthropic": "https://api.z.ai/api/anthropic"
|
||||||
|
},
|
||||||
|
"models": [
|
||||||
|
{
|
||||||
|
"id": "glm-5.2[1m]",
|
||||||
|
"aliases": [
|
||||||
|
"default-coding"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming",
|
||||||
|
"reasoning"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "GLM-5.3",
|
||||||
|
"aliases": [
|
||||||
|
"latest"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming",
|
||||||
|
"reasoning"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "GLM-4.7",
|
||||||
|
"aliases": [
|
||||||
|
"fast"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"minimax": {
|
||||||
|
"display_name": "MiniMax",
|
||||||
|
"auth": [
|
||||||
|
"api_key"
|
||||||
|
],
|
||||||
|
"key_url": "https://platform.minimaxi.com/user-center/payment/token-plan",
|
||||||
|
"endpoints": {
|
||||||
|
"anthropic": "https://api.minimaxi.com/anthropic"
|
||||||
|
},
|
||||||
|
"models": [
|
||||||
|
{
|
||||||
|
"id": "MiniMax-M3[1m]",
|
||||||
|
"aliases": [
|
||||||
|
"default-coding"
|
||||||
|
],
|
||||||
|
"capabilities": [
|
||||||
|
"tools",
|
||||||
|
"streaming",
|
||||||
|
"reasoning"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
4
|
||||||
@@ -2,4 +2,4 @@
|
|||||||
--ozone-platform-hint=wayland
|
--ozone-platform-hint=wayland
|
||||||
--password-store=gnome-libsecret
|
--password-store=gnome-libsecret
|
||||||
--enable-features=TouchpadOverscrollHistoryNavigation
|
--enable-features=TouchpadOverscrollHistoryNavigation
|
||||||
--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url,/usr/share/omarchy/default/chromium/extensions/yt-dlp,/usr/share/omarchy/default/chromium/extensions/whatsapp-slim
|
--load-extension=/usr/share/omarchy/default/chromium/extensions/copy-url,/usr/share/omarchy/default/chromium/extensions/yt-dlp
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ application/pdf=org.gnome.Evince.desktop
|
|||||||
|
|
||||||
x-scheme-handler/http=chromium.desktop
|
x-scheme-handler/http=chromium.desktop
|
||||||
x-scheme-handler/https=chromium.desktop
|
x-scheme-handler/https=chromium.desktop
|
||||||
x-scheme-handler/mailto=HEY.desktop
|
|
||||||
|
|
||||||
video/mp4=mpv.desktop
|
video/mp4=mpv.desktop
|
||||||
video/x-msvideo=mpv.desktop
|
video/x-msvideo=mpv.desktop
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
{
|
|
||||||
"manifest_version": 3,
|
|
||||||
"name": "WhatsApp Slim",
|
|
||||||
"version": "1.1",
|
|
||||||
"key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAszLhFYxjvKqx1VAORt3M6b0H1Kz03cmQ1MrUjJZ8gj3nhRcvufk6PS17yUIjEdKKmuj+1HuFVwOaHJQsACGJXwn2TeKQqZmZx/83yd7ydgabHXTsJbhy5O+Yunv+VA1B2IX/phcXpkH9bPv2PuC/bQ13nmmAvT2b+EMyq8EPQHOoSWhE4M4kIhLDczTmxfJX5X3tTxH66952DYuQWvGpIXLAUXkvIgap0qemW68/LymPaWzcg6g3oE/nZ7C0j7JE5bnqLFxqXNlA9Jt+Ss/1Y33QL3OSD9EEsrpgueS0bbqtkmFQ9/jGlruIL+qj0xe+CAtqbJ5ty9H/sqi01kjfyQIDAQAB",
|
|
||||||
"description": "Make WhatsApp Web follow the system theme and collapse its chat list in narrow windows, this extension is installed by Omarchy",
|
|
||||||
"content_scripts": [
|
|
||||||
{
|
|
||||||
"matches": [
|
|
||||||
"https://web.whatsapp.com/*"
|
|
||||||
],
|
|
||||||
"css": [
|
|
||||||
"whatsapp.css"
|
|
||||||
],
|
|
||||||
"js": [
|
|
||||||
"system-theme.js"
|
|
||||||
],
|
|
||||||
"run_at": "document_start"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
if (localStorage.getItem("system-theme-mode") !== "true") {
|
|
||||||
localStorage.setItem("system-theme-mode", "true");
|
|
||||||
location.reload();
|
|
||||||
}
|
|
||||||