diff options
| author | Guangxiong Lin <[email protected]> | 2023-11-15 22:55:09 +0800 |
|---|---|---|
| committer | Guangxiong Lin <[email protected]> | 2023-11-15 22:55:09 +0800 |
| commit | 7de27509734330495fc54235283047c2e74ee8b3 (patch) | |
| tree | 1f3a16af4e465c872172eea489e5491392d6dc8e | |
| parent | dc7e5a5f94cc89c57c4ff7f20f90a55a1a0e6ec4 (diff) | |
| download | dotfiles-7de27509734330495fc54235283047c2e74ee8b3.tar.gz dotfiles-7de27509734330495fc54235283047c2e74ee8b3.tar.bz2 dotfiles-7de27509734330495fc54235283047c2e74ee8b3.zip | |
Refactor
| -rwxr-xr-x | .path | 5 | ||||
| -rw-r--r-- | .zinitrc | 14 | ||||
| -rw-r--r-- | .zshrc | 11 |
3 files changed, 19 insertions, 11 deletions
@@ -9,7 +9,10 @@ then export PATH=$PATH:$(go env GOPATH)/bin fi -if gem env user_gemhome &> /dev/null; then +# gem env is quite slow in macos. +# Don't set the environment variables as mitigation. +if [ ! $(uname) = Darwin ] && + gem env user_gemhome &> /dev/null; then export GEM_HOME="$(gem env user_gemhome)" export PATH="$PATH:$GEM_HOME/bin" fi @@ -1,15 +1,17 @@ #!/usr/bin/env zsh ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git" -[ ! -d $ZINIT_HOME ] && mkdir -p "$(dirname $ZINIT_HOME)" -[ ! -d $ZINIT_HOME/.git ] && git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME" +[ ! -d $ZINIT_HOME ] && + mkdir -p "$(dirname $ZINIT_HOME)" +[ ! -d $ZINIT_HOME/.git ] && + git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME" source "${ZINIT_HOME}/zinit.zsh" -autoload -Uz _zinit -(( ${+_comps} )) && _comps[zinit]=_zinit - -zinit wait lucid atload'_zsh_autosuggest_start' light-mode for zsh-users/zsh-autosuggestions +zinit wait lucid atload'_zsh_autosuggest_start' \ + light-mode for \ + zsh-users/zsh-autosuggestions +ZSH_AUTOSUGGEST_STRATEGY=(history completion) zinit wait lucid light-mode for \ zsh-users/zsh-syntax-highlighting \ zsh-users/zsh-completions @@ -1,5 +1,3 @@ -setopt histignorealldups sharehistory hist_ignore_space - # Use emacs keybindings even if our EDITOR is set to vi bindkey -e @@ -21,6 +19,9 @@ source $HOME/.env source $HOME/.aliases source $HOME/.functions +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + source "$HOME/.zinitrc" [ -r $HOME/.nnnrc ] && source $HOME/.nnnrc @@ -28,12 +29,14 @@ source "$HOME/.zinitrc" command -v zoxide > /dev/null && eval "$(zoxide init --cmd j zsh)" -if command -v direnv &> /dev/null; then +if command -v direnv > /dev/null; then eval "$(direnv hook zsh)" fi -if command -v navi &> /dev/null; then +if command -v navi > /dev/null; then eval "$(navi widget zsh)" fi +autoload -Uz compinit; compinit +setopt histignorealldups sharehistory hist_ignore_space [ -r $HOME/.zsh_local ] && source $HOME/.zsh_local |