Remove settings copy/pasted that could have caused warnings
This commit is contained in:
parent
33688d4ab3
commit
19e9411404
@ -1,5 +1,6 @@
|
|||||||
# chezmoi:template:left-delimiter=#{{
|
# chezmoi:template:left-delimiter=#{{
|
||||||
#{{- /* vim: set filetype=zsh: */ -}}
|
#{{- /* vim: set filetype=zsh: */ -}}
|
||||||
|
|
||||||
setopt autocd
|
setopt autocd
|
||||||
setopt autopushd
|
setopt autopushd
|
||||||
setopt pushdignoredups
|
setopt pushdignoredups
|
||||||
@ -15,38 +16,15 @@ autoload -Uz compinit && compinit
|
|||||||
# Use emacs keybindings even if our EDITOR is set to vi
|
# Use emacs keybindings even if our EDITOR is set to vi
|
||||||
bindkey -e
|
bindkey -e
|
||||||
|
|
||||||
zstyle ':completion:*' auto-description 'specify: %d'
|
|
||||||
zstyle ':completion:*' completer _expand _complete _correct _approximate
|
|
||||||
zstyle ':completion:*' format 'Completing %d'
|
|
||||||
zstyle ':completion:*' group-name ''
|
|
||||||
zstyle ':completion:*' menu select=2
|
|
||||||
zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
|
|
||||||
zstyle ':completion:*' list-colors ''
|
|
||||||
zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
|
|
||||||
zstyle ':completion:*' matcher-list '' 'm:{a-z}={A-Z}' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=* l:|=*'
|
|
||||||
zstyle ':completion:*' menu select=long
|
|
||||||
zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
|
|
||||||
zstyle ':completion:*' use-compctl false
|
|
||||||
zstyle ':completion:*' verbose true
|
|
||||||
|
|
||||||
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
|
|
||||||
zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
|
|
||||||
|
|
||||||
#{{ if and (lookPath "dircolors") (eq .chezmoi.os "linux") -}}
|
#{{ if and (lookPath "dircolors") (eq .chezmoi.os "linux") -}}
|
||||||
eval "$(dircolors -b)"
|
eval "$(dircolors -b)"
|
||||||
#{{ end -}}
|
#{{ end -}}
|
||||||
|
|
||||||
#{{- if lookPath "bat" -}}
|
|
||||||
alias cat=bat
|
|
||||||
#{{ end -}}
|
|
||||||
|
|
||||||
#{{- if lookPath "direnv" -}}
|
#{{- if lookPath "direnv" -}}
|
||||||
eval "$(direnv hook zsh)"
|
eval "$(direnv hook zsh)"
|
||||||
#{{ end -}}
|
#{{ end -}}
|
||||||
|
|
||||||
#{{- if lookPath "erd" -}}
|
#{{- if lookPath "erd" -}}
|
||||||
autoload -Uz compinit
|
|
||||||
compinit
|
|
||||||
eval "$(erd --completions zsh)"
|
eval "$(erd --completions zsh)"
|
||||||
#{{ end -}}
|
#{{ end -}}
|
||||||
|
|
||||||
|
|||||||
@ -15,22 +15,6 @@ export XDG_DATA_HOME="${XDG_DATA_HOME:=$HOME/.local/share}"
|
|||||||
export XDG_INCLUDE_HOME="${XDG_INCLUDE_HOME:=$HOME/.local/include}"
|
export XDG_INCLUDE_HOME="${XDG_INCLUDE_HOME:=$HOME/.local/include}"
|
||||||
export XDG_STATE_HOME="${XDG_STATE_HOME:=$HOME/.local/state}"
|
export XDG_STATE_HOME="${XDG_STATE_HOME:=$HOME/.local/state}"
|
||||||
|
|
||||||
#{{- if eq .chezmoi.os "darwin" }}
|
|
||||||
if [ "${XDG_RUNTIME_DIR}" = "" ]; then
|
|
||||||
__TMPDIR__=
|
|
||||||
__LINK__=/tmp/$(id -u)
|
|
||||||
if [ -L "${__LINK__}" ]; then
|
|
||||||
__TMPDIR__="$(readlink "${__LINK__}")"
|
|
||||||
else
|
|
||||||
__TMPDIR__="$(mktemp -d)"
|
|
||||||
ln -s "${__TMPDIR__}" "${__LINK__}"
|
|
||||||
fi
|
|
||||||
XDG_RUNTIME_DIR="${__TMPDIR__}"
|
|
||||||
unset __TMPDIR__ __LINK__
|
|
||||||
export XDG_RUNTIME_DIR
|
|
||||||
fi
|
|
||||||
#{{- end }}
|
|
||||||
|
|
||||||
_env_file () {
|
_env_file () {
|
||||||
if [ ! -f "${1}" ]; then
|
if [ ! -f "${1}" ]; then
|
||||||
return
|
return
|
||||||
@ -48,8 +32,8 @@ _env_file "${XDG_CONFIG_HOME}/user-dirs.dirs"
|
|||||||
#{{- range $file := (glob (joinPath $home ".config" "profile" "env.d" "*.env")) }}
|
#{{- range $file := (glob (joinPath $home ".config" "profile" "env.d" "*.env")) }}
|
||||||
_env_file "#{{ replace $home "${HOME}" $file }}"
|
_env_file "#{{ replace $home "${HOME}" $file }}"
|
||||||
#{{- end }}
|
#{{- end }}
|
||||||
|
|
||||||
unset _env_file
|
unset _env_file
|
||||||
|
|
||||||
#{{ range $file := (glob (joinPath $home ".config" "profile" "profile.d" "*.sh")) }}
|
#{{ range $file := (glob (joinPath $home ".config" "profile" "profile.d" "*.sh")) }}
|
||||||
. "#{{ replace $home "${HOME}" $file }}"
|
. "#{{ replace $home "${HOME}" $file }}"
|
||||||
#{{- end }}
|
#{{- end }}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user