mirror of
https://github.com/andwati/dotfiles.git
synced 2026-11-14 07:45:14 +00:00
fix(zsh): drop archlinux plugin, fix plugin order, dedupe PATH, fix pnpm check
- remove archlinux plugin (Fedora) - load zsh-syntax-highlighting before zsh-history-substring-search - add autoswitch_virtualenv plugin - typeset -U path and drop duplicate ~/.local/bin entries - fix pnpm PATH case pattern (missing leading *)
This commit is contained in:
+1
-5
@@ -2,9 +2,5 @@ export PYENV_ROOT="$HOME/.pyenv"
|
|||||||
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
||||||
eval "$(pyenv init --path)"
|
eval "$(pyenv init --path)"
|
||||||
|
|
||||||
# Created by `pipx` on 2026-07-26 14:32:10
|
# pipx and Antigravity CLI install here
|
||||||
export PATH="$PATH:/home/ian/.local/bin"
|
|
||||||
|
|
||||||
|
|
||||||
# Added by Antigravity CLI installer
|
|
||||||
export PATH="/home/ian/.local/bin:$PATH"
|
export PATH="/home/ian/.local/bin:$PATH"
|
||||||
|
|||||||
+8
-9
@@ -3,6 +3,9 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
|
|||||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Keep PATH free of duplicates (first occurrence wins).
|
||||||
|
typeset -U path PATH
|
||||||
|
|
||||||
if [[ ":$FPATH:" != *":$HOME/.zsh/completions:"* ]]; then export FPATH="$HOME/.zsh/completions:$FPATH"; fi
|
if [[ ":$FPATH:" != *":$HOME/.zsh/completions:"* ]]; then export FPATH="$HOME/.zsh/completions:$FPATH"; fi
|
||||||
# If you come from bash you might have to change your $PATH.
|
# If you come from bash you might have to change your $PATH.
|
||||||
# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
||||||
@@ -77,9 +80,12 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
|
|||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
# Add wisely, as too many plugins slow down shell startup.
|
# Add wisely, as too many plugins slow down shell startup.
|
||||||
plugins=(
|
plugins=(
|
||||||
git sudo extract archlinux docker docker-compose fzf
|
git sudo extract docker docker-compose fzf
|
||||||
zsh-completions you-should-use
|
zsh-completions you-should-use
|
||||||
zsh-autosuggestions zsh-syntax-highlighting zsh-history-substring-search
|
autoswitch_virtualenv
|
||||||
|
zsh-autosuggestions
|
||||||
|
zsh-syntax-highlighting
|
||||||
|
zsh-history-substring-search # must come after zsh-syntax-highlighting
|
||||||
)
|
)
|
||||||
|
|
||||||
source $ZSH/oh-my-zsh.sh
|
source $ZSH/oh-my-zsh.sh
|
||||||
@@ -178,19 +184,12 @@ esac
|
|||||||
# pnpm end
|
# pnpm end
|
||||||
|
|
||||||
|
|
||||||
# Created by `pipx` on 2026-07-26 14:32:10
|
|
||||||
export PATH="$PATH:/home/ian/.local/bin"
|
|
||||||
|
|
||||||
|
|
||||||
# Java 17 (Temurin via SDKMAN) and Android SDK, for Android Studio / Gradle builds.
|
# Java 17 (Temurin via SDKMAN) and Android SDK, for Android Studio / Gradle builds.
|
||||||
export JAVA_HOME="$HOME/.sdkman/candidates/java/17.0.20-tem"
|
export JAVA_HOME="$HOME/.sdkman/candidates/java/17.0.20-tem"
|
||||||
export ANDROID_HOME="$HOME/Android/Sdk"
|
export ANDROID_HOME="$HOME/Android/Sdk"
|
||||||
export PATH="$JAVA_HOME/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator:$PATH"
|
export PATH="$JAVA_HOME/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$ANDROID_HOME/emulator:$PATH"
|
||||||
|
|
||||||
|
|
||||||
# Added by Antigravity CLI installer
|
|
||||||
export PATH="/home/ian/.local/bin:$PATH"
|
|
||||||
|
|
||||||
# Resend CLI
|
# Resend CLI
|
||||||
export PATH="$HOME/.resend/bin:$PATH"
|
export PATH="$HOME/.resend/bin:$PATH"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user