diff --git a/dot_claude/CLAUDE.md b/dot_claude/CLAUDE.md index 82d656d..679e60e 100644 --- a/dot_claude/CLAUDE.md +++ b/dot_claude/CLAUDE.md @@ -1,7 +1,8 @@ -## Tooling -- If about to perform git actions, check to see if this repo is a [jj] repo. If so, -use jj and never use any git commands directly +## Version Control +I may use Jujutsu (jj) instead of or alongside Git. - -[jj]: https://www.jj-vcs.dev/latest/ +- Before running any version control command, check whether a `.jj` directory exists in the repo root. +- If `.jj` is present, NEVER run `git` commands directly (no `git add`, `git commit`, `git checkout`, `git branch`, `git merge`, `git rebase`, etc.) — even though `.jj` repos often have a colocated `.git` directory, using git commands directly can create conflicting state between jj's and git's tracking. +- Instead, use the equivalent `jj` commands (e.g. `jj commit`, `jj new`, `jj git push`, `jj bookmark`, etc.). +- If you're unsure whether a jj command exists for what you need, ask before falling back to git. diff --git a/dot_npmrc b/dot_npmrc index 921792c..0647b87 100644 --- a/dot_npmrc +++ b/dot_npmrc @@ -4,7 +4,7 @@ ## @lavamoat/allow-scripts ignore-scripts=true # Avoid installing packages published in last 2 days -min-release-age=3 +#min-release-age=3 ## Don't install packages from git urls, which can ## be used to bypass the above two settings allow-git=none diff --git a/private_dot_config/ghostty/config.ghostty b/private_dot_config/ghostty/config.ghostty index 4e46f67..5357d59 100644 --- a/private_dot_config/ghostty/config.ghostty +++ b/private_dot_config/ghostty/config.ghostty @@ -16,8 +16,8 @@ window-width = 105 mouse-hide-while-typing = true -background-opacity = .8 -background-blur = macos-glass-regular +#background-opacity = .8 +#background-blur = macos-glass-regular # background-blur-radius = 20 #keybind = alt+left=unbind #keybind = alt+right=unbind diff --git a/private_dot_config/git/ignore b/private_dot_config/git/ignore index b3edc8d..9075a3d 100644 --- a/private_dot_config/git/ignore +++ b/private_dot_config/git/ignore @@ -37,4 +37,5 @@ mise/*.local.toml # https://mise.jdx.dev/configuration.html#tool-versions #.tool-versions -.vscode/settings.json \ No newline at end of file +.vscode/settings.json +**/.claude/settings.local.json diff --git a/private_dot_config/private_fish/config.fish b/private_dot_config/private_fish/config.fish index cd908c0..49a2e1f 100644 --- a/private_dot_config/private_fish/config.fish +++ b/private_dot_config/private_fish/config.fish @@ -30,4 +30,3 @@ source ~/.orbstack/shell/init2.fish 2>/dev/null || : # Added by LM Studio CLI (lms) set -gx PATH $PATH /Users/jack/.lmstudio/bin # End of LM Studio CLI section -_zoxide_uninstall diff --git a/private_dot_config/zed/private_settings.json b/private_dot_config/zed/private_settings.json index 5dd5368..d73aef9 100644 --- a/private_dot_config/zed/private_settings.json +++ b/private_dot_config/zed/private_settings.json @@ -24,6 +24,12 @@ "enabled": true, }, "agent_servers": { + "claude-acp": { + "default_config_options": { + "mode": "plan" + }, + "type": "registry" + }, "github-copilot-cli": { "type": "registry", },