Skip to content

chore: mainの内容をfor-businessに取り込む#65

Merged
rin2yh merged 41 commits into
for-businessfrom
chore/merge-main-into-for-business-3
Jun 27, 2026
Merged

chore: mainの内容をfor-businessに取り込む#65
rin2yh merged 41 commits into
for-businessfrom
chore/merge-main-into-for-business-3

Conversation

@rin2yh

@rin2yh rin2yh commented Jun 27, 2026

Copy link
Copy Markdown
Owner

Summary

  • main を for-business にマージ
  • WezTerm 関連の変更(cask, home/wezterm/wezterm.lua, home.nix の symlink)は取り込まない
  • CI workflow の branches: は for-business 側を維持

Test plan

  • CI (nixfmt) が通る
  • CI (build darwinConfiguration) が通る

claude and others added 30 commits April 30, 2026 15:14
Bumps [nixpkgs](https://github.com/nixos/nixpkgs) from `6368eda` to `68a8af9`.
- [Commits](NixOS/nixpkgs@6368eda...68a8af9)

---
updated-dependencies:
- dependency-name: nixpkgs
  dependency-version: 68a8af93ff4297686cb68880845e61e5e2e41d92
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [homebrew-core](https://github.com/homebrew/homebrew-core) from `7deee96` to `458fc34`.
- [Commits](Homebrew/homebrew-core@7deee96...458fc34)

---
updated-dependencies:
- dependency-name: homebrew-core
  dependency-version: 458fc34e680f3049f36f11478c27ac73b8b146bf
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [homebrew-cask](https://github.com/homebrew/homebrew-cask) from `4ae120b` to `2a6d45e`.
- [Release notes](https://github.com/homebrew/homebrew-cask/releases)
- [Commits](Homebrew/homebrew-cask@4ae120b...2a6d45e)

---
updated-dependencies:
- dependency-name: homebrew-cask
  dependency-version: 2a6d45ee3fbc2694a12efbb19860b9b1803f31d1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Rename the darwinConfiguration output from the hardcoded hostname to
'default' and set networking.hostName to match. This decouples the flake
from a specific machine name so 'darwin-rebuild switch --flake .#default'
works on any host, surviving PC migrations without edits.

Drop the DARWIN_HOST variable and its 'scutil --get LocalHostName'
shell-out from the Makefile, which is no longer needed.
Bumps [home-manager](https://github.com/nix-community/home-manager) from `8ec5a71` to `4c5c1e8`.
- [Commits](nix-community/home-manager@8ec5a71...4c5c1e8)

---
updated-dependencies:
- dependency-name: home-manager
  dependency-version: fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [nix-darwin](https://github.com/nix-darwin/nix-darwin) from `06648f4` to `56c666e`.
- [Commits](nix-darwin/nix-darwin@06648f4...56c666e)

---
updated-dependencies:
- dependency-name: nix-darwin
  dependency-version: 8c62fba0854ba15c8917aed18894dbccb48a3777
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Replace the Ghostty configuration with an equivalent WezTerm setup,
preserving behavior where WezTerm supports it:

- background opacity/blur, option-as-alt, inactive pane dimming
- keybinds: reload config, cmd+opt tab nav, cmd+shift pane resize, cmd+l clear
- shell integration (built into WezTerm)

Swap the Homebrew cask ghostty -> wezterm and update the home-manager
symlink. Remove the ghostty-shaders submodule since WezTerm has no
custom GLSL shader support (the CRT cursor shader does not migrate).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
WezTerm has no default tab-rename shortcut; bind cmd+e to a
PromptInputLine that sets the active tab title.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
Restore the Ghostty config, cask, and shaders submodule so both
terminals are installed and configured side by side. WezTerm is added
as an additional option rather than a drop-in replacement.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
cmd+opt+arrow tab navigation and cmd+shift+arrow pane resize already
match WezTerm's built-in bindings (ALT|SUPER arrows, SHIFT|SUPER
arrows at size 10), so remove the redundant explicit definitions and
leave a note. Keep the genuine additions: cmd+r reload, cmd+l clear,
cmd+e rename tab.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
Set window_decorations to INTEGRATED_BUTTONS|RESIZE so the macOS title
bar (showing the active program name like "zsh") is removed and the
traffic-light buttons move into the tab bar.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
Set window_close_confirmation = "NeverPrompt" so quitting (cmd+q) or
closing a tab/window with a running process no longer shows the
"really close?" dialog.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
INTEGRATED_BUTTONS moves the window buttons into the fancy tab bar,
whose titlebar background is opaque by default, making the window look
non-transparent on macOS (wezterm#5239). Set the active/inactive
titlebar backgrounds to "none" so transparency works on a normal
launch while keeping the title bar hidden.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
INTEGRATED_BUTTONS keeps the tab-bar strip transparent but renders the
terminal body opaque on macOS (wezterm#5239). Switch to "RESIZE" only,
which removes the title bar and keeps full window transparency at the
cost of the integrated window buttons.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
The window_decorations/window_frame changes broke window-body
transparency on macOS. Roll the config back to the clean
Ghostty-equivalent state: opacity + blur + option-as-alt + keybinds,
with the default (native) title bar.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
The WebGpu front end can fail to apply window_background_opacity/blur on
macOS when launched from the Dock (launchd) rather than a terminal,
leaving the window opaque. Pin front_end = "OpenGL" for consistent
transparency regardless of how WezTerm is started.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
Bump the see-through level a bit now that transparency renders
correctly via the OpenGL front end.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
WezTerm's default background is pure black (#000000), which looks much
darker than Ghostty at the same opacity. Set the background to
Ghostty's default (#292c33) and restore opacity to 0.85 so the
translucent window matches the Ghostty look.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
Ghostty uses JetBrainsMono Nerd Font at 13pt; WezTerm bundles only the
plain JetBrains Mono, so set the font explicitly to the Nerd Font
variant and size 13 to match.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
Ghostty ships the Nerd Font internally, but WezTerm needs it installed
on the system. Add the font-jetbrains-mono-nerd-font cask so the font
WezTerm is configured to use is actually available.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
The user prefers not to install a font. WezTerm bundles "JetBrains Mono"
and Nerd Font symbols, so use the built-in font (same letterforms as
Ghostty's JetBrainsMono Nerd Font, icons covered by the bundled
symbols) and drop the font cask.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
Hide the tab bar when only one tab is open (matching Ghostty), keep the
fancy rounded tabs, and strip the "1:" index prefix via
format-tab-title so tabs show just the title.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01SBm1GA28B7MzHWDxwcm5oe
rin2yh and others added 11 commits June 27, 2026 22:12
Adds a GitHub Actions workflow that runs on pull requests to main
(and via manual dispatch):

- lint: verify all .nix files match nixfmt-rfc-style formatting
- build: build the aarch64-darwin darwinConfiguration on a macOS
  runner to catch flake evaluation/build breakage (e.g. from
  dependabot dependency bumps)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017zhEKbHFbFbZ8TQfEgkSdF
- Pin actions to commit SHAs at their latest releases:
  actions/checkout v7.0.0, DeterminateSystems/nix-installer-action v22
- Build on macos-26 (latest GA macOS runner, arm64) to stay close to
  the local machine
- Remove workflow_dispatch trigger (PR-only)

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017zhEKbHFbFbZ8TQfEgkSdF
home-manager は 26.11 系に進行済だったが nixpkgs lock が 26.05 系で取り残されており、darwin-rebuild 時に Home Manager / Nixpkgs version mismatch 警告が発生していた。nixpkgs lock のみを更新して両者を 26.11 系で揃える。
@rin2yh rin2yh merged commit 6fba96d into for-business Jun 27, 2026
2 checks passed
@rin2yh rin2yh deleted the chore/merge-main-into-for-business-3 branch June 27, 2026 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants