Skip to content

Simplify Makima system config and add Microsoft Teams/Outlook - #4

Merged
brutcha merged 2 commits into
mainfrom
makima-migration
Jul 4, 2026
Merged

Simplify Makima system config and add Microsoft Teams/Outlook#4
brutcha merged 2 commits into
mainfrom
makima-migration

Conversation

@brutcha

@brutcha brutcha commented Jul 4, 2026

Copy link
Copy Markdown
Owner

Summary by CodeRabbit

  • New Features
    • Added support for Microsoft Teams and Outlook on macOS.
    • Expanded app options for the macOS setup, including new internet app toggles.
    • Updated host defaults and preferences for a more tailored macOS experience, including app, window, trackpad, Finder, and screenshot settings.
    • Added development tools to the user environment on one machine.

@coderabbitai

coderabbitai Bot commented Jul 4, 2026

Copy link
Copy Markdown

Review Change Stack

Warning

Review limit reached

@brutcha, you've reached your PR review limit, so we couldn't start this review.

Next review available in: 41 minutes

Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available.
You're only billed for reviews past your plan's rate limits ($0.25/file).

How can I continue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews.

How do review limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please refer docs for additional details.

Review details
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: d896c47f-b386-4291-94bc-3c68142a0caf

📥 Commits

Reviewing files that changed from the base of the PR and between e63ef49 and f27c3fa.

📒 Files selected for processing (1)
  • hosts/makima/default.nix

Walkthrough

Adds Microsoft Teams and Outlook Homebrew cask packages with a new Darwin apps.internet module, updates flake.nix's makima username, reconfigures the makima host's app enablement and adds extensive macOS system.defaults/CustomUserPreferences settings, and trims disabled app toggles in NB2123 configs.

Changes

Microsoft Teams/Outlook packages and module

Layer / File(s) Summary
Cask derivations and overlay wiring
pkgs/microsoft-teams/default.nix, pkgs/microsoft-outlook/default.nix, pkgs/default.nix
Adds Homebrew cask derivations for Microsoft Teams and Outlook and registers both as overlay package attributes.
Darwin internet module
modules/darwin/apps/internet.nix, modules/darwin/apps/default.nix
Introduces darwin.apps.internet options for microsoft-teams/microsoft-outlook and conditionally installs their packages; imports the new module into the apps aggregator.

Host configuration updates

Layer / File(s) Summary
Flake username and NB2123 toggle cleanup
flake.nix, hosts/NB2123/default.nix, hosts/NB2123/home.nix
Changes the makima host's username from brutcha to pavla; removes disabled aldente, blurred, and antigravity toggles from NB2123 and removes the tmux.enable setting from NB2123 home config.
makima app enablement rewrite
hosts/makima/default.nix, hosts/makima/home.nix
Removes a TODO comment; switches system/windowManager apps from aldente/karabiner/better-touch-tool/blurred to ice; switches internet apps to Microsoft Teams/Outlook; empties shared.apps; restructures home.nix home.apps into development (ghostty, git, claude-code) and internet (helium) sections.
makima macOS system.defaults overrides
hosts/makima/default.nix
Adds extensive system.defaults/CustomUserPreferences settings covering NSGlobalDomain, screensaver, Finder, .DS_Store prevention, symbolic hotkeys, Spotlight, trackpad, screenshots, menu clock, software update, and app-specific preferences for Alt-Tab, Ice, Ghostty, and Raycast.

Estimated code review effort: 3 (Moderate) | ~25 minutes

Sequence Diagram(s)

Not applicable — this PR consists of declarative Nix configuration changes and static package definitions without multi-component runtime interaction flows.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main changes: simplifying Makima configuration and adding Microsoft Teams/Outlook support.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch makima-migration

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 3

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@hosts/makima/default.nix`:
- Around line 36-39: The configuration block is using the wrong option
namespace, so update the `darwin.internet` assignment in `default.nix` to the
existing `darwin.apps.internet` path. Keep the `microsoft-teams.enable` and
`microsoft-outlook.enable` settings under the `darwin.apps.internet` attrset so
the `internet` module resolves correctly and evaluation succeeds.
- Line 103: The screenshot location in the screencapture defaults setup uses a
tilde path, which will not be expanded by macOS. Update the configuration in the
screencapture location setting to use an absolute path, and ensure the target
screenshots directory is created or otherwise guaranteed to exist when this host
config is applied.

In `@modules/darwin/apps/internet.nix`:
- Around line 9-16: The host config is referencing the wrong options namespace,
so the internet app toggles are never applied. Update the
`hosts/makima/default.nix` references to use the declared
`darwin.apps.internet.*` path that is defined by the `darwin.apps.internet`
module, and ensure the `microsoft-teams.enable` and `microsoft-outlook.enable`
settings point to that namespace consistently.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 87ef0384-4744-4891-87eb-715913ae8519

📥 Commits

Reviewing files that changed from the base of the PR and between cde6910 and e63ef49.

⛔ Files ignored due to path filters (1)
  • flake.lock is excluded by !**/*.lock
📒 Files selected for processing (10)
  • flake.nix
  • hosts/NB2123/default.nix
  • hosts/NB2123/home.nix
  • hosts/makima/default.nix
  • hosts/makima/home.nix
  • modules/darwin/apps/default.nix
  • modules/darwin/apps/internet.nix
  • pkgs/default.nix
  • pkgs/microsoft-outlook/default.nix
  • pkgs/microsoft-teams/default.nix

Comment thread hosts/makima/default.nix Outdated
Comment thread hosts/makima/default.nix Outdated
Comment thread modules/darwin/apps/internet.nix
@brutcha
brutcha merged commit 5d4e8fd into main Jul 4, 2026
1 check passed
@brutcha
brutcha deleted the makima-migration branch July 4, 2026 13:04
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.

1 participant