config/shell/zsh/extra/zshcompletion.zsh

@@ -140,11 +140,12 @@ function __zsh_compl () {
     # Some functions, like _apt and _dpkg, are very slow. We can use a cache in
     # order to speed things up
     if [[ ${__COMP_CACHING:-yes} == yes ]]; then
-        if [[ ! -d ${ZSH_COMPDIR} ]]; then
-            command mkdir -p "${ZSH_COMPDIR}"
+        __COMP_CACHE_DIR=${__COMP_CACHE_DIR:-${ZDOTDIR:-$HOME}/.cache}
+        if [[ ! -d ${__COMP_CACHE_DIR} ]]; then
+            command mkdir -p "${__COMP_CACHE_DIR}"
         fi
         zstyle ':completion:*' use-cache  yes
-        zstyle ':completion:*:complete:*' cache-path "${ZSH_COMPDIR}"
+        zstyle ':completion:*:complete:*' cache-path "${__COMP_CACHE_DIR}"
     fi
 
     # host completion

config/shell/zsh/zshrc

@@ -16,13 +16,6 @@ if zmodload zsh/terminfo && (( "$terminfo[colors]" >= "256" )); then
     __MATERUS_ZSH_256COLORS="${__MATERUS_ZSH_256COLORS:-0}"; 
 fi
 
-#MSYS
-if [[ "$(uname -s)" =~ ^MSYS_NT.* ]]; then
-    #Use windows symlink instead copy
-    export MSYS=winsymlinks:nativestrict   
-fi
-
-
 #region Plugins
 # Clone plugins if not exists
 [ -d $ZSH_DATA_DIR/plugins/powerlevel10k ] || git clone https://github.com/romkatv/powerlevel10k $ZSH_DATA_DIR/plugins/powerlevel10k
@@ -31,6 +24,8 @@ fi
 [ -d $ZSH_DATA_DIR/plugins/zsh-autosuggestions ] || git clone https://github.com/zsh-users/zsh-autosuggestions $ZSH_DATA_DIR/plugins/zsh-autosuggestions
 
 source ${ZSH_DATA_DIR}/plugins/powerlevel10k/powerlevel10k.zsh-theme
+source ${ZSH_CONFIG_DIR}/extra/zinputrc
+source ${ZSH_CONFIG_DIR}/extra/zshcompletion.zsh
 
 source ${ZSH_DATA_DIR}/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 source ${ZSH_DATA_DIR}/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
@@ -78,8 +73,6 @@ fi
 
 
 #region Bindings
-source ${ZSH_CONFIG_DIR}/extra/zinputrc
-
 bindkey -r "^["
 bindkey "^[[1;5C" forward-word
 bindkey "^[[1;5D" backward-word
@@ -92,13 +85,8 @@ bindkey '^[[3;2~' delete-word
 #endregion
 
 #region Completions
-ZSH_COMPDIR="${ZSH_COMPDIR:-${XDG_CACHE_HOME:-${HOME}/.cache}/zsh}"
-ZSH_COMPDUMP="${ZSH_COMPDUMP:-${ZSH_COMPDIR}/.zcompdump-${HOST}-${ZSH_VERSION}}"
-if [[ ! -d ${ZSH_COMPDIR} ]]; then
-            command mkdir -p "${ZSH_COMPDIR}"
-fi
+ZSH_COMPDUMP="${ZSH_COMPDUMP:-${XDG_CACHE_HOME:-${HOME}/.cache}/.zcompdump-${HOST}-${ZSH_VERSION}}"
 autoload -U compinit && compinit -d $ZSH_COMPDUMP
-source ${ZSH_CONFIG_DIR}/extra/zshcompletion.zsh
 #endregion
 
 #region Functions