2 files changed, 4 insertions, 3 deletions
diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
index bb15a26..72514f4 100644
--- a/zsh/.config/zsh/.zshenv
+++ b/zsh/.config/zsh/.zshenv
@@ -37,6 +37,7 @@ export AWS_SHARED_CREDENTIALS_FILE="$XDG_CONFIG_HOME/aws/credentials"
 export AWS_CONFIG_FILE="$XDG_CONFIG_HOME/aws/config"
 export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME/alsa/asoundrc"
 export AZURE_CONFIG_DIR="$XDG_DATA_HOME/azure"
+export MIX_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/mix"
 export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg"
 export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default"
 export KODI_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/kodi"
@@ -45,7 +46,7 @@ export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
 export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
 export GOBIN="${XDG_BIN_HOME:-$HOME/.local/bin}"
-#export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
+export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
 export GOMODCACHE="$XDG_CACHE_HOME"/go/mod
 export VOLTA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/volta"
 export PNPM_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/pnpm"
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 651ba1e..c42c6c8 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -37,7 +37,7 @@ setopt complete_aliases
 # History in cache directory:
 HISTSIZE=100000000
 SAVEHIST=100000000
-HISTFILE=~/.cache/zsh/history
+HISTFILE="$XDG_STATE_HOME"/zsh/history
 
 # Load aliases and shortcuts if existent.
 [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc"
@@ -89,7 +89,7 @@ case "$ID" in
     ;;
   gentoo )
     source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh
-    source "$XDG_DATA_HOME"/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+    source /usr/share/zsh/site-functions/zsh-autosuggestions.zsh
     ;;
   Darwin )
     source $HOME/.nix-profile/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh