Remove now unneeded oh-my-zsh lib, set some options it set
This commit is contained in:
parent
cc55c54e6b
commit
a9bae9ddd2
|
@ -61,10 +61,11 @@ if command -v antibody > /dev/null; then
|
||||||
else
|
else
|
||||||
mkdir -p ${plugin_cache_dir}
|
mkdir -p ${plugin_cache_dir}
|
||||||
antibody bundle --parallelism=$(nproc --ignore=1) <<EOF > ${ZSH_PLUGIN_SOURCE}
|
antibody bundle --parallelism=$(nproc --ignore=1) <<EOF > ${ZSH_PLUGIN_SOURCE}
|
||||||
robbyrussell/oh-my-zsh path:lib
|
# robbyrussell/oh-my-zsh path:lib
|
||||||
robbyrussell/oh-my-zsh path:plugins/history-substring-search
|
# robbyrussell/oh-my-zsh path:plugins/history-substring-search
|
||||||
${depends_on_fzf}
|
${depends_on_fzf}
|
||||||
zsh-users/zsh-autosuggestions
|
zsh-users/zsh-autosuggestions
|
||||||
|
zsh-users/zsh-history-substring-search
|
||||||
mafredri/zsh-async
|
mafredri/zsh-async
|
||||||
zsh-users/zsh-syntax-highlighting
|
zsh-users/zsh-syntax-highlighting
|
||||||
EOF
|
EOF
|
||||||
|
|
|
@ -5,6 +5,12 @@ function() # Keep local variables in here.
|
||||||
autoload -Uz compinit
|
autoload -Uz compinit
|
||||||
compinit -d "${ZSH_CACHE_DIR}/.zcompdump"
|
compinit -d "${ZSH_CACHE_DIR}/.zcompdump"
|
||||||
|
|
||||||
|
# Directory options
|
||||||
|
setopt AUTO_CD AUTO_PUSHD PUSHD_IGNORE_DUPS PUSHD_MINUS
|
||||||
|
|
||||||
|
# Various options
|
||||||
|
setopt CORRECT_ALL FLOW_CONTROL INTERACTIVE_COMMENTS LONG_LIST_JOBS
|
||||||
|
|
||||||
############################## Plugins #########################################
|
############################## Plugins #########################################
|
||||||
|
|
||||||
# Hyphen-insensitive completion. Case sensitive completion must be off. _ and -
|
# Hyphen-insensitive completion. Case sensitive completion must be off. _ and -
|
||||||
|
@ -64,6 +70,8 @@ HIST_STAMPS="yyyy-mm-dd"
|
||||||
# Write command to history file after it is finished, with time and duration.
|
# Write command to history file after it is finished, with time and duration.
|
||||||
# setopt NO_SHARE_HISTORY EXTENDED_HISTORY INC_APPEND_HISTORY_TIME
|
# setopt NO_SHARE_HISTORY EXTENDED_HISTORY INC_APPEND_HISTORY_TIME
|
||||||
setopt EXTENDED_HISTORY SHARE_HISTORY
|
setopt EXTENDED_HISTORY SHARE_HISTORY
|
||||||
|
setopt HIST_EXPIRE_DUPS_FIRST HIST_IGNORE_DUPS HIST_IGNORE_SPACE
|
||||||
|
setopt HIST_VERIFY
|
||||||
|
|
||||||
# Import new commands from the history file.
|
# Import new commands from the history file.
|
||||||
function precmd_history
|
function precmd_history
|
||||||
|
@ -74,6 +82,8 @@ function precmd_history
|
||||||
|
|
||||||
############################## Completion ######################################
|
############################## Completion ######################################
|
||||||
|
|
||||||
|
setopt ALWAYS_TO_END COMPLETE_IN_WORD
|
||||||
|
|
||||||
# Configure completions.
|
# Configure completions.
|
||||||
zstyle ':completion::complete:*' cache-path "${ZSH_CACHE_DIR}/.zcompcache"
|
zstyle ':completion::complete:*' cache-path "${ZSH_CACHE_DIR}/.zcompcache"
|
||||||
zstyle ':completion:*' completer _complete _ignored _approximate
|
zstyle ':completion:*' completer _complete _ignored _approximate
|
||||||
|
@ -156,7 +166,7 @@ case ${TERM} in
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
(dumb) # Emacs shells and TRAMP.
|
(dumb) # Emacs shells and TRAMP.
|
||||||
unsetopt zle
|
unsetopt ZLE
|
||||||
|
|
||||||
if [[ "${INSIDE_EMACS}" =~ "tramp" ]]; then
|
if [[ "${INSIDE_EMACS}" =~ "tramp" ]]; then
|
||||||
HISTFILE="/dev/null"
|
HISTFILE="/dev/null"
|
||||||
|
|
|
@ -80,7 +80,7 @@ else
|
||||||
add-zsh-hook precmd vcs_info
|
add-zsh-hook precmd vcs_info
|
||||||
fi
|
fi
|
||||||
|
|
||||||
setopt prompt_subst
|
setopt PROMPT_SUBST
|
||||||
|
|
||||||
PROMPT="%B%F{${zsh_theme_colours[prompt]}}${showuser}%b"'${vcs_info_msg_0_}'"%B%F{${zsh_theme_colours[prompt]}}%#%f%b "
|
PROMPT="%B%F{${zsh_theme_colours[prompt]}}${showuser}%b"'${vcs_info_msg_0_}'"%B%F{${zsh_theme_colours[prompt]}}%#%f%b "
|
||||||
RPROMPT="%F{${zsh_theme_colours[minor]}}%(?..[%B%F{${zsh_theme_colours[highlight]}}%?%b%F{${zsh_theme_colours[minor]}}] )%4~%f"
|
RPROMPT="%F{${zsh_theme_colours[minor]}}%(?..[%B%F{${zsh_theme_colours[highlight]}}%?%b%F{${zsh_theme_colours[minor]}}] )%4~%f"
|
||||||
|
|
|
@ -51,6 +51,8 @@ bindkey '^[[1;5B' history-substring-search-down
|
||||||
|
|
||||||
bindkey '^H' backward-delete-word # C-BackSpace
|
bindkey '^H' backward-delete-word # C-BackSpace
|
||||||
bindkey '^[[3;5~' delete-word # C-Del
|
bindkey '^[[3;5~' delete-word # C-Del
|
||||||
|
bindkey '^[[1;5D' backward-word # C-Left
|
||||||
|
bindkey '^[[1;5C' forward-word # C-Right
|
||||||
|
|
||||||
|
|
||||||
if [[ "${TERM}" =~ "^rxvt" ]]; then
|
if [[ "${TERM}" =~ "^rxvt" ]]; then
|
||||||
|
|
Loading…
Reference in New Issue
Block a user