refactor(zsh): clean up plugins and improve compinit

1 files changed, 27 insertions, 23 deletions

diff --git a/sheldon/.config/sheldon/plugins.toml b/sheldon/.config/sheldon/plugins.toml
index b853ec9..a026960 100644
--- a/sheldon/.config/sheldon/plugins.toml
+++ b/sheldon/.config/sheldon/plugins.toml
@@ -1,46 +1,50 @@
+[templates]
+defer = '{% for file in files %} zsh-defer source "{{ file }}" {% endfor %}'
+contrib_fpath = 'fpath=( "{{ dir }}/contrib/completion/zsh" $fpath )'
+
 [plugins]
 
 [plugins.zsh-defer]
 github = 'romkatv/zsh-defer'
 
-[templates]
-defer = { value = 'zsh-defer source "{{ file }}"', each = true }
-comp = { value = 'mkdir -p "$XDG_DATA_HOME/zsh/site-functions"; ln -sf "{{ file }}" "$XDG_DATA_HOME/zsh/site-functions/_{{ name }}"', each = true }
-
 [plugins.zsh-vi-mode]
 github = "jeffreytse/zsh-vi-mode"
 
 [plugins.zsh-wsl]
-local = '~/.local/share/zsh-wsl'
+local = '~/.local/share/wsl/shell'
 profiles = ["WSL2"]
 
-[plugins.zsh-syntax-highlighting]
-github = "zsh-users/zsh-syntax-highlighting"
-apply = ["defer"]
+[plugins.zsh-autosuggestions]
+github = "zsh-users/zsh-autosuggestions"
+use = ["{{ name }}.zsh"]
 
-[plugins.zsh-fzf-history-search]
-github = "joshskidmore/zsh-fzf-history-search"
-apply = ["defer"]
+[plugins.fzf]
+github = "junegunn/fzf"
+use = ["completion.zsh"]
 
 [plugins.zsh-completions]
 github = "zsh-users/zsh-completions"
-apply = ["defer"]
 
 [plugins.zsh-pandoc-completion]
 github = "srijanshetty/zsh-pandoc-completion"
-apply = ["defer"]
-
-[plugins.dotnet]
-remote = "https://raw.githubusercontent.com/dotnet/cli/master/scripts/register-completions.zsh"
-apply = ["comp"]
+apply = ["fpath"]
 
 [plugins.docker]
-remote = "https://raw.githubusercontent.com/docker/cli/master/contrib/completion/zsh/_docker"
-apply = ["comp"]
+github = "docker/cli"
+apply = ["contrib_fpath"]
 
-[plugins.zsh-autosuggestions]
-github = "zsh-users/zsh-autosuggestions"
-use = ["{{ name }}.zsh"]
+[plugins.base16]
+github = "chriskempson/base16-shell"
+apply = ["defer"]
+
+[plugins.zsh-syntax-highlighting]
+github = "zsh-users/zsh-syntax-highlighting"
+apply = ["defer"]
+
+[plugins.zsh-fzf-history-search]
+github = "joshskidmore/zsh-fzf-history-search"
+apply = ["defer"]
 
 [plugins.compinit]
-inline = 'mkdir -p $XDG_CACHE_HOME/zsh && autoload -Uz compinit && zsh-defer compinit -d $XDG_CACHE_HOME/zsh/zcompdump-$ZSH_VERSION'
+local = '~/.local/share/zsh/plugins'
+apply = ["defer"]