@@ -34,10 +34,6 @@ autoload -Uz compinit
3434compinit -i
3535export PATH=" /Applications/Docker.app/Contents/Resources/bin:$PATH "
3636
37- # Use a guarded alias for `claude` only if the command is not found.
38- # This prevents shadowing Homebrew's `/usr/local/bin/claude` (Intel)
39- # or `/opt/homebrew/bin/claude` (Apple Silicon), and only falls back
40- # to the legacy local install when it actually exists.
4137if ! command -v claude > /dev/null 2>&1 ; then
4238 if [[ -x " $HOME /.claude/local/claude" ]]; then
4339 alias claude=" $HOME /.claude/local/claude"
4642
4743[[ " $TERM_PROGRAM " == " kiro" ]] && . " $( kiro --locate-shell-integration-path zsh) "
4844
49- # --- uv / local bin ---
50- # The official uv installer places binaries in ~/.local/bin.
51- # If not present in PATH, prepend it to enable commands.
52- case " :$PATH :" in
53- * " :$HOME /.local/bin:" * ) ;;
54- * ) export PATH=" $HOME /.local/bin:$PATH " ;;
55- esac
56- # --- /uv / local bin ---
45+ case " :$PATH :" in * " :$HOME /.local/bin:" * ) ;; * ) export PATH=" $HOME /.local/bin:$PATH " ;; esac
5746
58- # --- zsh-autosuggestions ---
59- # 設定はsource前に定義
6047ZSH_AUTOSUGGEST_USE_ASYNC=1
6148ZSH_AUTOSUGGEST_STRATEGY=(history)
6249ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE=' fg=8'
6350
64- # Homebrewのインストール先に応じてsource
6551if [[ -r /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh ]]; then
6652 source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh
6753elif [[ -r /usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh ]]; then
6854 source /usr/local/share/zsh-autosuggestions/zsh-autosuggestions.zsh
6955fi
70-
71- # 受け入れをCtrl-fに割当(→でも確定可能)
7256bindkey ' ^F' autosuggest-accept
73- # --- /zsh-autosuggestions ---
7457
7558# h(): select from history with peco and execute
7659unalias h 2> /dev/null
@@ -109,19 +92,7 @@ add-zsh-hook chpwd _codex_update_codex_home
10992_codex_update_codex_home
11093# <<< codex-cli init <<<
11194
112- # --- 1Password CLI Integration ---
113- # GitHub CLI: authenticate via 1Password Shell Plugin
95+ # 1Password
11496alias gh=" op plugin run -- gh"
115-
116- # op command completion
117- if command -v op > /dev/null 2>&1 ; then
118- eval " $( op completion zsh) "
119- fi
120-
121- # Helper function to run commands with secrets from 1Password
122- # Usage: with-secrets ./deploy.sh
123- # OP_ENV_FILE=~/.config/op/work.template with-secrets ./script.sh
124- with-secrets () {
125- op run --env-file=" ${OP_ENV_FILE:- $HOME / .config/ op/ env.template} " -- " $@ "
126- }
127- # --- /1Password CLI Integration ---
97+ command -v op > /dev/null 2>&1 && eval " $( op completion zsh) "
98+ with-secrets () { op run --env-file=" ${OP_ENV_FILE:- $HOME / .config/ op/ env.template} " -- " $@ " ; }
0 commit comments