From f4315de21ef7011bae194783b28d821815c0060e Mon Sep 17 00:00:00 2001
From: Amolith <amolith@secluded.site>
Date: Sun, 13 Nov 2022 19:18:16 -0500
Subject: [PATCH] optimise zsh setup

---
 dot_config/zsh/private_dot_zshrc.tmpl | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/dot_config/zsh/private_dot_zshrc.tmpl b/dot_config/zsh/private_dot_zshrc.tmpl
index fdacf474d0ec4857dedcc31589a967a905480b21..68f33b03461ed5dfe0d8c1f2a7cb0eebb9e987d9 100644
--- a/dot_config/zsh/private_dot_zshrc.tmpl
+++ b/dot_config/zsh/private_dot_zshrc.tmpl
@@ -52,8 +52,6 @@ export ZIM_HOME="$XDG_CONFIG_HOME"/.zim
 alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
 alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
 
-eval "$(antidot init)"
-
 # ------------------
 # Initialize modules
 # ------------------
@@ -123,9 +121,6 @@ export PYTHON_KEYRING_BACKEND=keyring.backends.null.Keyring
 # Uncomment the following line if pasting URLs and other text is messed up.
 # DISABLE_MAGIC_FUNCTIONS=true
 
-# Additional completions
-source <(charm completion zsh)
-
 # Integrate z - jump around
 source /usr/share/z/z.sh
 
@@ -184,8 +179,6 @@ export GPG_TTY="$TTY"
 export SSH_AUTH_SOCK="/run/user/1000/gnupg/S.gpg-agent.ssh"
 gpgconf --launch gpg-agent
 
-eval "$(starship init zsh)"
-
 zstyle ':completion:*' completer _expand _complete _ignored _correct _approximate
 zstyle ':completion:*' group-name ''
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
@@ -194,6 +187,11 @@ zstyle ':completion:*' menu select=1
 zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
 zstyle :compinstall filename '/home/amolith/.config/zsh/.zshrc'
 
-autoload -Uz compinit
-compinit
+autoload -Uz compinit && compinit
+
+# Additional completions
+source $XDG_CONFIG_HOME/zsh/completions/charm.zsh
+source $XDG_CONFIG_HOME/zsh/completions/starship.zsh
+source $XDG_CONFIG_HOME/zsh/completions/antidot.zsh
+
 compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"