From cb4c486777197f84f0af8725c5c2960ee0b2d296 Mon Sep 17 00:00:00 2001
From: thek4n <thek4n@yandex.ru>
Date: Sat, 13 Jan 2024 00:57:42 +0300
Subject: [PATCH] add .zshenv

---
 home/user/.config/bash/export |  8 --------
 home/user/.config/zsh/.zshrc  |  6 ++++++
 home/user/.config/zsh/sourcer | 28 ++++++++++++----------------
 home/user/.zshenv             |  9 +++++++++
 home/user/.zshrc              |  6 ------
 install                       |  2 +-
 6 files changed, 28 insertions(+), 31 deletions(-)
 create mode 100644 home/user/.config/zsh/.zshrc
 create mode 100644 home/user/.zshenv
 delete mode 100644 home/user/.zshrc

diff --git a/home/user/.config/bash/export b/home/user/.config/bash/export
index 74742cc..320cbcf 100644
--- a/home/user/.config/bash/export
+++ b/home/user/.config/bash/export
@@ -27,14 +27,6 @@ if [ -d "$HOME/.npm-global/bin" ] ; then
     export PATH="$HOME/.npm-global/bin:$PATH"
 fi
 
-if [ -d "$HOME/.go/bin" ] ; then
-    export PATH="$HOME/.go/bin:$PATH"
-fi
-
-if [ -d "$HOME/.go" ] ; then
-    export GOPATH="$HOME/.go"
-fi
-
 for TMPDIR in "$TMPDIR" "$TMP" /tmp /var/tmp
 do
     test -d "$TMPDIR" && break
diff --git a/home/user/.config/zsh/.zshrc b/home/user/.config/zsh/.zshrc
new file mode 100644
index 0000000..9097ec5
--- /dev/null
+++ b/home/user/.config/zsh/.zshrc
@@ -0,0 +1,6 @@
+# .zshrc by TheK4n
+# https://github.com/TheK4n/dotfiles
+
+if [ -f "$ZDOTDIR/sourcer" ]; then
+    source "$ZDOTDIR/sourcer"
+fi
diff --git a/home/user/.config/zsh/sourcer b/home/user/.config/zsh/sourcer
index 4907f37..87837bb 100644
--- a/home/user/.config/zsh/sourcer
+++ b/home/user/.config/zsh/sourcer
@@ -3,22 +3,18 @@ _so() {
 }
 
 _so /etc/zsh_command_not_found
-_so "$HOME/.config/zsh/options"
-_so "$HOME/.config/zsh/completion"
-_so "$HOME/.config/zsh/history"
-_so "$HOME/.config/zsh/prompt"
-_so "$HOME/.config/zsh/other"
-_so "$HOME/.config/zsh/plugin"
-_so "$HOME/.config/zsh/aliases"
+_so "$ZDOTDIR/options"
+_so "$ZDOTDIR/completion"
+_so "$ZDOTDIR/history"
+_so "$ZDOTDIR/prompt"
+_so "$ZDOTDIR/other"
+_so "$ZDOTDIR/plugin"
+_so "$ZDOTDIR/aliases"
 
-_so "$HOME/.config/bash/aliases"
-_so "$HOME/.config/bash/completion"
-_so "$HOME/.config/bash/export"
-_so "$HOME/.config/bash/functions"
-_so "$HOME/.config/bash/hosts/$HOST"
+_so "$XDG_CONFIG_HOME/bash/aliases"
+_so "$XDG_CONFIG_HOME/bash/completion"
+_so "$XDG_CONFIG_HOME/bash/functions"
+_so "$XDG_CONFIG_HOME/bash/hosts/$HOST"
 
 
-_so "$HOME/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
-
-
-_sod "$HOME/.config/zsh/zshrc.d"
+_sod "$ZDOTDIR/zshrc.d"
diff --git a/home/user/.zshenv b/home/user/.zshenv
new file mode 100644
index 0000000..5b5059f
--- /dev/null
+++ b/home/user/.zshenv
@@ -0,0 +1,9 @@
+
+_so() {
+    [ -r "$1" ] && [ -f "$1" ] && source "$1"
+}
+
+export XDG_CONFIG_HOME="$HOME/.config"
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+
+_so "$XDG_CONFIG_HOME/bash/export"
diff --git a/home/user/.zshrc b/home/user/.zshrc
deleted file mode 100644
index a6f48a7..0000000
--- a/home/user/.zshrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# .zshrc by TheK4n
-# https://github.com/TheK4n/dotfiles
-
-if [ -f $HOME/.config/zsh/sourcer ]; then
-    source $HOME/.config/zsh/sourcer
-fi
diff --git a/install b/install
index 1905cb4..0e26d3c 100755
--- a/install
+++ b/install
@@ -12,7 +12,7 @@ export SUB
 
 declare -r -A TARGETS=(
     ["bash"]=".config/bash .bashrc .profile"
-    ["zsh"]="%bash .config/zsh .zshrc .zprofile .zlogout .inputrc"
+    ["zsh"]="%bash .config/zsh .zshenv .zprofile .zlogout .inputrc"
     ["tmux"]=".tmux.conf"
     ["alacritty"]=".config/alacritty"
     ["nvim"]=".config/nvim .local/bin/vim_askpass_helper .local/bin/vim_askpass_helper_python"