From a884bcbce428562cea73e5363b77020ec036670b Mon Sep 17 00:00:00 2001 From: Oscar Wallberg Date: Wed, 31 Jul 2024 11:49:15 +0200 Subject: [PATCH] feat(zsh): replace completion plugin with manual configuration --- .gitignore | 1 - zsh/completion | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ zsh/plugins | 4 +--- zsh/rc | 14 ++++++++++++-- 4 files changed, 62 insertions(+), 6 deletions(-) delete mode 100644 .gitignore create mode 100644 zsh/completion diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 264508e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -zsh/.cache diff --git a/zsh/completion b/zsh/completion new file mode 100644 index 0000000..b103827 --- /dev/null +++ b/zsh/completion @@ -0,0 +1,49 @@ +# vim: set ft=zsh: + +# See: https://zsh.sourceforge.io/Doc/Release/Options.html#Completion-4 +setopt ALWAYS_TO_END +setopt COMPLETE_IN_WORD # Allow completion from anywhere in a word, for example `foobar` would get + # completed if the cursor is placed on b in `fbar` +setopt GLOB_DOTS # Show hidden files and directories in completion menu +setopt LIST_TYPES + +# See: https://zsh.sourceforge.io/Doc/Release/Zsh-Modules.html#The-zsh_002fcomplist-Module +zmodload zsh/complist + +# Perform history expansion and insert a space into the buffer. +# See: https://zsh.sourceforge.io/Doc/Release/Expansion.html#History-Expansion +bindkey ' ' magic-space + +# https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Completion +bindkey -M menuselect '^[[Z' reverse-menu-complete +bindkey -M menuselect '^M' .accept-line # Immediately execute command line on +bindkey -M menuselect '^F' vi-insert # Toggle interactive mode +bindkey '^P' history-beginning-search-backward +bindkey '^N' history-beginning-search-forward + +# See: https://zsh.sourceforge.io/Doc/Release/Completion-System.html#Standard-Styles +# :completion::::: +zstyle ':completion:*' auto-description '%d' +zstyle ':completion:*' cache-path "${_cache_dir:?}/compcache" +zstyle ':completion:*' completer _complete _approximate +zstyle ':completion:*:descriptions' format '%F{yellow}-- %d --%f' +zstyle ':completion:*' group-name '' +zstyle ':completion:*' insert-unambiguous true +# shellcheck disable=SC2296 +zstyle ':completion:*:default' list-colors "${(s.:.)LS_COLORS}" +zstyle ':completion:*' list-dirs-first true +zstyle ':completion:*:default' list-prompt '' +zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' +zstyle ':completion:*:approximate:*' max-errors 1 numeric +zstyle ':completion:*:default' menu true select +zstyle ':completion:*' original false +zstyle ':completion:*' preserve-prefix '//[^/]##/' +zstyle ':completion:*:default' select-prompt '' +zstyle ':completion:*' show-ambiguity true +zstyle ':completion:*' squeeze-slashes true +zstyle ':completion:*' use-cache on +zstyle ':completion:*' use-compctl true +zstyle ':completion:*' verbose true + +autoload -Uz compinit +compinit -i -d "${_cache_dir:?}/compdump" diff --git a/zsh/plugins b/zsh/plugins index c8d5b45..29134b6 100644 --- a/zsh/plugins +++ b/zsh/plugins @@ -1,4 +1,2 @@ zsh-users/zsh-completions -belak/zsh-utils path:completion -belak/zsh-utils path:utility -zsh-users/zsh-autosuggestions +zsh-users/zsh-syntax-highlighting # leave this last diff --git a/zsh/rc b/zsh/rc index 824f4b5..eaf2a82 100644 --- a/zsh/rc +++ b/zsh/rc @@ -1,4 +1,5 @@ -# vim: set ft=zsh: + +# vim: set ft=zsh nowrap: _here="$(dirname -- "$(readlink -f -- "${HOME}/.zshrc")")" _cache_dir="${XDG_CACHE_HOME:-"${HOME}/.cache"}/zsh" @@ -38,12 +39,12 @@ bindkey -e # Ref: https://zsh.sourceforge.io/Doc/Release/Parameters.html path=("${HOME}/.local/bin" "${path[@]}") -export PATH export MAIL="/var/spool/mail/$USER" export MAILCHECK=60 export HISTFILE="${HOME}/.zsh_history" export HISTSIZE=100100 export SAVEHIST=100000 +export LISTMAX=0 ################### # Other Variables # @@ -55,12 +56,21 @@ export DIFFPROG="nvim -d" export NNN_TRASH=2 export NNN_PLUG='' +# Generated using `dircolors` defaults +export LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=00:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.7z=01;31:*.ace=01;31:*.alz=01;31:*.apk=01;31:*.arc=01;31:*.arj=01;31:*.bz=01;31:*.bz2=01;31:*.cab=01;31:*.cpio=01;31:*.crate=01;31:*.deb=01;31:*.drpm=01;31:*.dwm=01;31:*.dz=01;31:*.ear=01;31:*.egg=01;31:*.esd=01;31:*.gz=01;31:*.jar=01;31:*.lha=01;31:*.lrz=01;31:*.lz=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.lzo=01;31:*.pyz=01;31:*.rar=01;31:*.rpm=01;31:*.rz=01;31:*.sar=01;31:*.swm=01;31:*.t7z=01;31:*.tar=01;31:*.taz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tgz=01;31:*.tlz=01;31:*.txz=01;31:*.tz=01;31:*.tzo=01;31:*.tzst=01;31:*.udeb=01;31:*.war=01;31:*.whl=01;31:*.wim=01;31:*.xz=01;31:*.z=01;31:*.zip=01;31:*.zoo=01;31:*.zst=01;31:*.avif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:*~=00;90:*#=00;90:*.bak=00;90:*.crdownload=00;90:*.dpkg-dist=00;90:*.dpkg-new=00;90:*.dpkg-old=00;90:*.dpkg-tmp=00;90:*.old=00;90:*.orig=00;90:*.part=00;90:*.rej=00;90:*.rpmnew=00;90:*.rpmorig=00;90:*.rpmsave=00;90:*.swp=00;90:*.tmp=00;90:*.ucf-dist=00;90:*.ucf-new=00;90:*.ucf-old=00;90:'; + ########## # Prompt # ########## source "${_here}/prompt" +############## +# Completion # +############## + +source "${_here}/completion" + ########### # Plugins # ###########