From 9587780c13ac8999ac4227fbde609ed1e95d3f48 Mon Sep 17 00:00:00 2001 From: laily Date: Thu, 12 Feb 2026 10:53:38 +0800 Subject: [PATCH] feat: add mise env --- cursor/config/settings.json | 16 ++++++++++-- fish/config.fish | 6 ++++- nvim/lazy-lock.json | 2 +- nvim/lua/plugins/gemini-cli.lua | 1 + nvim/lua/plugins/sidekick.lua | 43 +++++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 nvim/lua/plugins/sidekick.lua diff --git a/cursor/config/settings.json b/cursor/config/settings.json index 0e8c9c2..768383c 100644 --- a/cursor/config/settings.json +++ b/cursor/config/settings.json @@ -161,7 +161,8 @@ "remote.SSH.connectTimeout": 30, "remote.SSH.remotePlatform": { "box1": "linux", - "hx80": "linux" + "hx80": "linux", + "hx20": "linux" }, "editor.formatOnSave": true, "pylint.enabled": false, @@ -273,5 +274,16 @@ "remote.SSH.localServerDownload": "always", "workbench.colorCustomizations": {}, "javascript.format.enable": false, - "typescript.format.enable": false + "typescript.format.enable": false, + "terminal.integrated.env.linux": { + "ANTHROPIC_AUTH_TOKEN": "sk-cp-QvKTjyX6D0bf5u0f9mB-mpaYcyCwdXq3nubxEzTFFtiGuYmLmC_nyxGOsK3jzmJSCMix2rXJ90iSFb6Xva0R30ZY1ilwMLf44npGnAzTWgtwUIqoGwHmQsc", + "ANTHROPIC_BASE_URL": "https://api.minimaxi.com/anthropic", + "ANTHROPIC_DEFAULT_HAIKU_MODEL": "MiniMax-M2.1", + "ANTHROPIC_DEFAULT_OPUS_MODEL": "MiniMax-M2.1", + "ANTHROPIC_DEFAULT_SONNET_MODEL": "MiniMax-M2.1", + "ANTHROPIC_MODEL": "MiniMax-M2.1", + "API_TIMEOUT_MS": "3000000", + "CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC": 1 + }, + "claudeCode.preferredLocation": "panel" } diff --git a/fish/config.fish b/fish/config.fish index 31396bc..5f41d6e 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -201,4 +201,8 @@ end source ~/.orbstack/shell/init2.fish 2>/dev/null || : # mise (formerly rtx) -mise activate fish | source +if command -v mise >/dev/null + add_to_path $HOME/.local/bin + add_to_path $HOME/.local/share/mise/shims + mise activate fish | source +end diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 0606cf0..d1fd2b9 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -6,7 +6,6 @@ "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink-cmp-avante": { "branch": "master", "commit": "4f494c6e124acbe31a8f5d58effa0c14aa38a6d5" }, "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, - "buf": { "branch": "main", "commit": "49785647e5e0e316f3fa2c2dab7bca225579018b" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" }, "codecompanion.nvim": { "branch": "main", "commit": "e0780fa9fda504ffb89307cabcb6cbe1ce8eb60c" }, @@ -50,6 +49,7 @@ "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "sidekick.nvim": { "branch": "main", "commit": "c2bdf8cfcd87a6be5f8b84322c1b5052e78e302e" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, diff --git a/nvim/lua/plugins/gemini-cli.lua b/nvim/lua/plugins/gemini-cli.lua index 1f8025f..198e54d 100644 --- a/nvim/lua/plugins/gemini-cli.lua +++ b/nvim/lua/plugins/gemini-cli.lua @@ -1,6 +1,7 @@ return { { "marcinjahn/gemini-cli.nvim", + enabled = false, -- 临时禁用 gemini-cli 插件 cmd = "Gemini", -- 懒加载,使用 :Gemini 命令时加载 dependencies = { "folke/snacks.nvim", -- 必需的依赖 diff --git a/nvim/lua/plugins/sidekick.lua b/nvim/lua/plugins/sidekick.lua new file mode 100644 index 0000000..7d4225e --- /dev/null +++ b/nvim/lua/plugins/sidekick.lua @@ -0,0 +1,43 @@ +return { + { + "folke/sidekick.nvim", + dependencies = { + "folke/snacks.nvim", -- sidekick 推荐的 prompt / cli picker 支持 + "nvim-treesitter/nvim-treesitter", -- 可选,但推荐用于 diff 窗口高亮 + }, + opts = { + -- 配置 CLI 工具 + cli = { + tools = { + gemini = { + -- Gemini CLI 命令 + cmd = { "gemini" }, + -- 传递给 gemini 命令的参数 + args = {}, + -- 环境变量配置 + -- 不设置 GEMINI_API_KEY,让 Gemini CLI 使用已缓存的 OAuth 凭证 + env = { + -- 代理配置(如果需要通过代理访问) + -- 从环境变量读取代理设置,如果没有设置则使用系统默认 + HTTP_PROXY = os.getenv("HTTP_PROXY") or os.getenv("http_proxy"), + HTTPS_PROXY = os.getenv("HTTPS_PROXY") or os.getenv("https_proxy"), + ALL_PROXY = os.getenv("ALL_PROXY") or os.getenv("all_proxy"), + NO_PROXY = os.getenv("NO_PROXY") or os.getenv("no_proxy"), + }, + }, + }, + -- 设置默认工具 + default = "gemini", + }, + }, + config = function(_, opts) + require("sidekick").setup(opts) + -- 在配置加载后设置快捷键 + vim.keymap.set("n", "as", function() + local sidekick = require("sidekick.cli") + sidekick.toggle({ name = "gemini", focus = true }) + end, { desc = "Sidekick: Toggle Gemini CLI" }) + end, + }, +} +