diff --git a/AGENTS.md b/AGENTS.md
new file mode 100644
index 0000000..461c6a3
--- /dev/null
+++ b/AGENTS.md
@@ -0,0 +1 @@
+@/CLAUDE.md
diff --git a/home/dot_config/fish/conf.d/abbr.fish.tmpl b/home/dot_config/fish/conf.d/abbr.fish.tmpl
index ce165b1..4f6255c 100644
--- a/home/dot_config/fish/conf.d/abbr.fish.tmpl
+++ b/home/dot_config/fish/conf.d/abbr.fish.tmpl
@@ -27,6 +27,8 @@ abbr -a ch 'chezmoi'
 abbr -a romanlog "ssh roman 'tail -F /var/log/syslog' --lines 100"
 
 # Other aliases
+abbr -a oc 'opencode'
+abbr -a cl 'claude'
 abbr -a gpt 'chatgpt'
 abbr -a copilot 'gh copilot'
 abbr -a suggest 'gh copilot suggest -t shell'
@@ -35,6 +37,18 @@ abbr -a gitalias 'alias | grep "git "'
 abbr -a mousefix 'sudo udevadm trigger'
 abbr -a bw_login 'set -gx BW_SESSION (bw unlock --raw)'
 
+# Development tools
+abbr -a d 'docker'
+abbr -a j 'just'
+abbr -a cb 'cargo build'
+abbr -a cr 'cargo run'
+abbr -a ct 'cargo nextest run'
+abbr -a cnt 'cargo nextest run'
+
+# GitHub CLI
+abbr -a ghpr 'gh pr'
+abbr -a ghs 'gh secret'
+
 # Clipboard aliases
 {{ if not .wsl -}}
 abbr -a copy 'xsel -ib'