From adaefebf3571d003f851961ac357219cc57e046b Mon Sep 17 00:00:00 2001 From: major Date: Mon, 5 Jun 2023 10:51:04 +0800 Subject: [PATCH] fix: plugins must be installed after ohmyzsh --- templates/zshrc.zsh-template | 22 ++-------------------- tools/install.sh | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 5f7955cd8..7e1c7997c 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -8,7 +8,7 @@ export ZSH=$HOME/.oh-my-zsh # load a random theme each time oh-my-zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes -ZSH_THEME="powerlevel10k/powerlevel10k" +ZSH_THEME="robbyrussell" # Set list of themes to pick from when loading at random # Setting this variable when ZSH_THEME=random will cause zsh to load @@ -70,12 +70,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k" # Custom plugins may be added to $ZSH_CUSTOM/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=( - git - autojump - zsh-autosuggestions - zsh-syntax-highlighting -) +plugins=(git) source $ZSH/oh-my-zsh.sh @@ -104,16 +99,3 @@ source $ZSH/oh-my-zsh.sh # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" -# Set/Unset proxy aliases - -# Set/Unset proxy aliases -HOSTIP=$(cat /etc/resolv.conf |grep -oP '(?<=nameserver\ ).*') -alias setp='export https_proxy="http://${HOSTIP}:7890"; export http_proxy="http://${HOSTIP}:7890"; export all_proxy="socks5://${HOSTIP}:7890"; export ALL_PROXY="socks5://${HOSTIP}:7890";' -alias unsetp='unset https_proxy; unset http_proxy; unset all_proxy; unset ALL_PROXY;' - -# Fzf -[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -export FZF_DEFAULT_COMMAND='ag -i --hidden -l -g ""' -export FZF_DEFAULT_OPTS="--layout=reverse --preview '(bat --style=numbers --color=always {} || highlight -O ansi -l {} || coderay {} || rougify {} || cat {}) 2> /dev/null | head -500'" -export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/wsl/lib:/snap/bin:$HOME/.fzf/bin - diff --git a/tools/install.sh b/tools/install.sh index 70d980051..ac756e093 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -70,7 +70,7 @@ ZSH="${ZSH:-$HOME/.oh-my-zsh}" # REPO=${REPO:-ohmyzsh/ohmyzsh} REPO=${REPO:-gmingj/ohmyzsh} REMOTE=${REMOTE:-https://github.com/${REPO}.git} -BRANCH=${BRANCH:-ohmyzsh} +BRANCH=${BRANCH:-myohmyzsh} # Other options CHSH=${CHSH:-yes}