chore: mainの内容をfor-businessに取り込む#69
Merged
Merged
Conversation
- wezterm: port ghostty's default ANSI palette + fg/bg/cursor for visual parity, enable default hyperlink_rules so raw URLs become Cmd-clickable, recolor tab_bar/window_frame with the same palette - claude code: pin model to claude-opus-4-7[1m], switch tui to fullscreen, enable agent push notifs, suppress workflow usage warning
mini.deps development is frozen in the latest mini.nvim, which recommends
vim.pack for plugin management and MiniMisc.safely() in place of
MiniDeps.now()/later().
- init.lua: install mini.nvim via vim.pack; set up mini.misc early so the
MiniMisc global is available before other modules load
- replace MiniDeps.add(...) with vim.pack.add(...); the treesitter
post_checkout hook is reproduced with a PackChanged autocmd, and the
ts-comments depends edge is covered by the existing treesitter add
- replace now()/later() with MiniMisc.safely('now'/'later', ...) everywhere
- drop the redundant mini.misc.setup() in nav.lua and the MiniDeps luarc global
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01RhQR9TdszBTQ2XEZMbbCoz
Gate the CI workflow with a path filter so the nixfmt check and the (expensive) macOS darwin build only run when nix-relevant files change. PRs that touch only non-nix files (nvim lua, wezterm, README, etc.) no longer trigger wasteful build/fmt runs. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WhHQrJp4TeYPZ2buJGSKHg
…-business-2t2453 # Conflicts: # .github/workflows/ci.yml # home/claude/settings.json # home/nvim/lua/lsp/init.lua # home/wezterm/wezterm.lua
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
概要
mainの変更をfor-businessブランチに取り込むマージです。コンフリクトの解決内容
4ファイルでコンフリクトが発生し、以下の方針で解決しました。
.github/workflows/ci.yml: トリガー対象ブランチをfor-businessのまま維持しつつ、mainで追加された path フィルタ（**/*.nix/flake.lock/ci.yml変更時のみ実行）を取り込み。home/claude/settings.json:mainで追加されたskipWorkflowUsageWarning/inputNeededNotifEnabled/agentPushNotifEnabledを取り込み。home/nvim/lua/lsp/init.lua:mainのMiniDeps→vim.pack/MiniMisc.safely移行を採用。home/wezterm/wezterm.lua: for-business は従来から wezterm を意図的に除外しているため（前回マージ chore: mainの内容をfor-businessに取り込む #65 と同様）、削除を維持。確認
🤖 Generated with Claude Code
Generated by Claude Code