Remove special p10k/Cursor handling, use VSCode shell integration properly

This commit is contained in:
2025-06-11 15:28:28 -05:00
parent d1d925232d
commit e090509339
2 changed files with 15 additions and 25 deletions

View File

@@ -102,6 +102,8 @@ if command -v thefuck &> /dev/null; then
eval $(thefuck --alias) eval $(thefuck --alias)
fi fi
[[ "$TERM_PROGRAM" == "vscode" ]] && . "$(code --locate-shell-integration-path bash)"
{{/* Common shared aliases, scripts, & shell setup details. */ -}} {{/* Common shared aliases, scripts, & shell setup details. */ -}}
{{ template "scripts/commonrc.sh.tmpl" dict "data" . "shell" "bash" }} {{ template "scripts/commonrc.sh.tmpl" dict "data" . "shell" "bash" }}

View File

@@ -23,13 +23,6 @@ DISABLE_AUTO_UPDATE="true" # required for chezmoi external management
# DISABLE_UNTRACKED_FILES_DIRTY="true" # DISABLE_UNTRACKED_FILES_DIRTY="true"
# HIST_STAMPS="mm/dd/yyyy" # HIST_STAMPS="mm/dd/yyyy"
# Set Oh My Zsh theme conditionally
if [[ "$TERM_PROGRAM" == "vscode" ]]; then
ZSH_THEME="" # Disable Powerlevel10k for Cursor
# Plugins limited as they're mostly just aliases, not useful to the Cursor agent
plugins=(asdf)
else
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
ZSH_THEME="powerlevel10k/powerlevel10k" ZSH_THEME="powerlevel10k/powerlevel10k"
@@ -40,17 +33,10 @@ else
{{ " kitty" }} {{ " kitty" }}
{{- end}} {{- end}}
) )
fi
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
# Use a minimal prompt in Cursor to avoid command detection issues
if [[ "$TERM_PROGRAM" == "vscode" ]]; then
PROMPT='%n@%m:%~%# '
RPROMPT=''
else
[[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh # configure with `p10k configure` [[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh # configure with `p10k configure`
fi
# {{ if lookPath "bw" -}} eval "$(bw completion --shell zsh); compdef _bw bw;" {{ end }} # {{ if lookPath "bw" -}} eval "$(bw completion --shell zsh); compdef _bw bw;" {{ end }}
@@ -59,3 +45,5 @@ fi
{{/* Chezmoi's shell completion */ -}} {{/* Chezmoi's shell completion */ -}}
{{ completion "zsh" }} {{ completion "zsh" }}
[[ "$TERM_PROGRAM" == "vscode" ]] && . "$(code --locate-shell-integration-path zsh)"