Skip to content

AeroSpace migration, installer portability (#25), profile parity - #71

Merged
barbatdev merged 12 commits into
mainfrom
odd/aerospace-migration
Oct 21, 2026
Merged

barbatdev merged 12 commits into
mainfrom
odd/aerospace-migration

Conversation

@barbatdev

@barbatdev barbatdev commented Oct 21, 2026 •

Copy link
Copy Markdown
Owner

Summary

  • AeroSpace migration: yabai/skhd configs ported and archived, window-manager migration log closed
  • Issue Finish installer portability and symlink hardening after Herdr migration #25 — installer portability and symlink hardening: single MANAGED_LINKS manifest driving backups, symlink creation and --check; unified cp -P backups (no more repo duplication into .bak_*); pre-flight abort when a destination is a real directory; find-based --check globs; README backup/restore docs; CORTEX_HOME defined in local/env.zsh.example
  • cmux/mise removal carried through; refactoria/barbatdev profiles and live Mac config

Closes #25

Context (original description): snapshot of the configuration the Mac runs today (aerospace, herdr/ghostty/fish/pi profiles). Twelve live symlinks point to files that only exist on this branch, so the root checkout cannot return to main until this lands.

Verification

  • shellcheck -x install.sh clean, bash -n OK
  • install.sh --check exit 0
  • Sandbox $HOME: real run x2 idempotent (0 new .bak_* on rerun), symlink backup via cp -P verified, real-directory conflict aborts exit 1 with nothing touched, --dry-run exit 0 with 31 manifest symlinks

Review note

~1.4k changed lines over 12 commits (several features over time). If preferred, split into chained PRs (aerospace / installer #25 / profiles) before merge.

- aerospace/aerospace.toml: BSP tiling with zero gaps, same alt+cmd
  leader, focus/move with arrows and hjkl, workspaces 1..9 with follow,
  floating layout toggle, fullscreen, back-and-forth, resize mode, and
  on-window-detected float rules replacing yabai manage=off
- rotate/mirror/balance-space have no i3-tree equivalent (mapped to
  join/resize where sensible); skhd bindings now live in the toml
- install.sh: managed symlink for the config and cask dependency
- SketchyBar needs no change: AeroSpace maps workspaces onto macOS
  Spaces, so space.1..10 keeps working
split has no effect with enable-normalization-flatten-containers; the
accordion/tiles toggle is the honest i3-tree analog. Records the
migration log.
yabai 7.1.25 rebuilt from source with the asmvik/yabai#2800 version
alias (27 -> 26); binary patched in Cellar, stock binary kept at
~/.local/backups/yabai-migration/. Runs as user LaunchAgents
(com.koekeishiya.yabai/skhd); space ops are no-ops without the SA and
are handled by native Mission Control shortcuts.
…light conflicts

Issue #25: destinations declared once in MANAGED_LINKS and consumed by
backup, symlink creation and --check; backups never follow symlink
operands into the repo; a real directory at a destination aborts cleanly
instead of failing mid-run via ln -sfn + set -e; --check JSON/TOML globs
use find (no globstar-dependent **, no duplicate validation).

Verified: shellcheck clean; sandbox $HOME run x2 idempotent (0 new
.bak_* on rerun); conflict test aborts exit 1 with nothing touched;
--check and --dry-run exit 0.
…emplate

Issue #25: README gains a 'Backups y restore' section (cp -P vs cp -R
semantics, manual restore, periodic find, real-directory abort);
local/env.zsh.example defines CORTEX_HOME and defaults
CORTEX_SHELL_INTEGRATION to it. Adds ODD task doc.
…config

Snapshot of the configuration the Mac runs today, committed so the root
checkout can return to main. Needs split and review before merge.

Refs #69
@barbatdev barbatdev changed the title wip: aerospace migration and live Mac profiles AeroSpace migration, installer portability (#25), profile parity Oct 21, 2026
@barbatdev
barbatdev marked this pull request as ready for review October 21, 2026 17:54
@barbatdev
barbatdev merged commit 30390d7 into main Oct 21, 2026
1 check passed
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.

Finish installer portability and symlink hardening after Herdr migration

1 participant