diff --git a/dot_claude/CLAUDE.md b/dot_claude/CLAUDE.md
new file mode 100644
index 0000000..3cc30f4
--- /dev/null
+++ b/dot_claude/CLAUDE.md
@@ -0,0 +1,11 @@
+# Claude Memory
+
+## Preferences
+
+### Chezmoi Sync
+When making changes to dotfiles (including Claude files in `~/.claude/`), always:
+1. Sync with chezmoi:
+   - `chezmoi add <file>` for new files
+   - `chezmoi re-add <file>` for updated files
+2. Commit the changes in the chezmoi source directory:
+   - `cd $(chezmoi source-path) && git add -A && git commit -m "<descriptive message>"`
diff --git a/dot_oh-my-zsh/custom/aliases.zsh b/dot_oh-my-zsh/custom/aliases.zsh
index 96f4be5..3ac6968 100644
--- a/dot_oh-my-zsh/custom/aliases.zsh
+++ b/dot_oh-my-zsh/custom/aliases.zsh
@@ -152,3 +152,12 @@ alias upgrade="sudo $pm upgrade"
 alias install="sudo $pm install"
 alias remove="sudo $pm remove"
 alias reinstall="sudo $pm reinstall"
+
+# ============================================================================
+# Chezmoi (dotfiles management)
+# ============================================================================
+alias cmu="chezmoi update"           # Pull from remote and apply changes
+alias cma="chezmoi apply"            # Apply changes from local source
+alias cms="chezmoi status"           # Show what would change
+alias cmd="chezmoi diff"             # Show diff of pending changes
+alias cme="chezmoi edit"             # Edit a managed file