-
Notifications
You must be signed in to change notification settings - Fork 0
feat: add chezmoi-development skill and fix settings.json race condition #4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| --- | ||
| # Claude Code marketplace configuration | ||
| # This data is merged into ~/.claude/settings.json via run_onchange_after_ script | ||
|
|
||
| marketplace: | ||
| extraKnownMarketplaces: | ||
| fx-cc: | ||
| source: | ||
| source: git | ||
| url: git@github.com:fx/cc.git | ||
|
|
||
| settings: | ||
| includeCoAuthoredBy: false | ||
| enableAllProjectMcpServers: true | ||
| enabledPlugins: | ||
| fx-dev@fx-cc: true |
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
This file was deleted.
Oops, something went wrong.
36 changes: 36 additions & 0 deletions
36
.chezmoiscripts/run_onchange_after_update-claude-settings.sh.tmpl
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| #!/bin/bash | ||
| # Update ~/.claude/settings.json with marketplace configuration | ||
| # Works with both real directories and symlinks | ||
|
|
||
| {{ if .include_defaults -}} | ||
| set -e | ||
|
|
||
| # Ensure ~/.claude exists (as directory or symlink) | ||
| if [ ! -e "$HOME/.claude" ]; then | ||
| mkdir -p "$HOME/.claude" | ||
| fi | ||
|
|
||
| SETTINGS_FILE="$HOME/.claude/settings.json" | ||
|
|
||
| # Read existing settings or start with empty object | ||
| if [ -f "$SETTINGS_FILE" ]; then | ||
| existing=$(cat "$SETTINGS_FILE") | ||
| else | ||
| existing='{}' | ||
| fi | ||
|
|
||
| # Our required settings from .chezmoidata/claude.yaml | ||
| required_settings='{{ .settings | toJson }}' | ||
| marketplace_config='{{ .marketplace | toJson }}' | ||
|
|
||
| # Merge: existing settings + our required settings + marketplace config | ||
| # Our settings take precedence (using * operator for recursive merge) | ||
| result=$(echo "$existing" | jq --argjson required "$required_settings" \ | ||
| --argjson marketplace "$marketplace_config" \ | ||
| '. * $required * $marketplace') | ||
|
|
||
| # Write the merged result | ||
| echo "$result" > "$SETTINGS_FILE" | ||
|
|
||
| echo "✓ Updated $SETTINGS_FILE" | ||
| {{ end -}} | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.