From ec147dfc43e40c8b733437d9e588480e2525df6d Mon Sep 17 00:00:00 2001
From: druckdev <63563978+druckdev@users.noreply.github.com>
Date: Tue, 3 Nov 2020 13:59:54 +0100
Subject: [PATCH] zsh: Move stuff around

Move all environment variables that do not relate directly to zsh but
(in most cases) enforce the XDG Base Directory specification to
zprofile.
This way they are just exported once on login and not every time the
shell starts again.

Move the lines in zshenv that are not directly responsible for moving
the zsh files into $XDG_CONFIG_HOME to their own zshenv there.
---
 .config/zsh/.zprofile | 52 +++++++++++++++++++++++++++++++++++++++++++
 .config/zsh/.zshenv   |  4 ++++
 .config/zsh/.zshrc    | 35 -----------------------------
 .zshenv               |  9 --------
 4 files changed, 56 insertions(+), 44 deletions(-)
 create mode 100644 .config/zsh/.zshenv

diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index fd27f14..d45fb3c 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -1,3 +1,55 @@
 # vim: ft=zsh
 
+# Less clutter in $HOME by enforcing the XDG Base Directory specification.
+: ${XDG_CONFIG_HOME:=$HOME/.config}
+: ${XDG_CACHE_HOME:=$HOME/.cache}
+: ${XDG_DATA_HOME:=$HOME/.local/share}
+export XDG_CONFIG_HOME XDG_CACHE_HOME XDG_DATA_HOME
+
+export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
+
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export GOPATH="$XDG_DATA_HOME"/go
+
+export HISTFILE="$XDG_DATA_HOME"/bash/history
+export LESSHISTFILE=/dev/null
+export SQLITE_HISTORY="$XDG_DATA_HOME"/sqlite3/sqlite_history
+
+VIMINIT="let \$MYVIMRC=\"$XDG_CONFIG_HOME/vim/xdg.vim\" | source \$MYVIMRC"
+export VIMINIT
+
+export ANDROID_AVD_HOME="$XDG_DATA_HOME"/android/
+export ANDROID_EMULATOR_HOME="$XDG_DATA_HOME"/android/
+export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
+export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android
+
+# Other environment variables
+if [[ ! "$PATH" =~ "$HOME/\.local/bin" ]]; then
+	export PATH="$HOME/.local/bin${PATH:+:$PATH}"
+fi
+
+if command -v nvim &>/dev/null; then
+	export EDITOR=nvim
+elif command -v vim &>/dev/null; then
+	export EDITOR=vim
+elif command -v vi &>/dev/null; then
+	export EDITOR=vi
+elif command -v nano &>/dev/null; then
+	export EDITOR=nano
+fi
+
+if command -v nvim &>/dev/null; then
+	export MANPAGER="nvim -c 'set ft=man' -"
+else
+	# https://www.tecmint.com/view-colored-man-pages-in-linux/
+	export LESS_TERMCAP_mb=$'\e[1;32m'
+	export LESS_TERMCAP_md=$'\e[1;32m'
+	export LESS_TERMCAP_me=$'\e[0m'
+	export LESS_TERMCAP_se=$'\e[0m'
+	export LESS_TERMCAP_so=$'\E[01;44;33m'
+	export LESS_TERMCAP_ue=$'\e[0m'
+	export LESS_TERMCAP_us=$'\e[1;4;31m'
+fi
+
+# Automatically start X on login after boot.
 [[ -n $DISPLAY || $XDG_VTNR -ne 1 ]] || exec startx
diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
new file mode 100644
index 0000000..fea95bd
--- /dev/null
+++ b/.config/zsh/.zshenv
@@ -0,0 +1,4 @@
+setopt NO_GLOBAL_RCS
+
+# Has to be exported for every pts again so we cannot but this in zprofile
+export GPG_TTY="$TTY"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 8c4bd3f..c0a2571 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -144,41 +144,6 @@ comp-source "$ZSH_CONF/keys.zsh"
 # Reenable fzf-tab since `bindkey -v` seems to deactivate it
 enable-fzf-tab
 
-## Setup PATH
-[[ "$PATH" =~ "$HOME/\.local/bin" ]] || export PATH="$HOME/.local/bin${PATH:+:$PATH}"
-
-## Env variables that have nothing to do with zsh
-if command -v nvim >/dev/null 2>&1; then
-	export EDITOR=nvim
-elif command -v vim >/dev/null 2>&1; then
-	export EDITOR=vim
-elif command -v nano >/dev/null 2>&1; then
-	export EDITOR=nano
-fi
-
-if command -v nvim >/dev/null 2>&1; then
-	export MANPAGER="nvim -c 'set ft=man' -"
-else
-	# https://www.tecmint.com/view-colored-man-pages-in-linux/
-	export LESS_TERMCAP_mb=$'\e[1;32m'
-	export LESS_TERMCAP_md=$'\e[1;32m'
-	export LESS_TERMCAP_me=$'\e[0m'
-	export LESS_TERMCAP_se=$'\e[0m'
-	export LESS_TERMCAP_so=$'\E[01;44;33m'
-	export LESS_TERMCAP_ue=$'\e[0m'
-	export LESS_TERMCAP_us=$'\e[1;4;31m'
-fi
-
-## Less clutter in $HOME by enforcing the XDG base directory standard
-export ATOM_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/atom"
-export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
-export SQLITE_HISTORY="${XDG_DATA_HOME:-$HOME/.local/share}/sqlite3/sqlite_history"
-# No less history file
-export LESSHISTFILE=-
-
-export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
-export VIMINIT="let \$MYVIMRC=\"${XDG_CONFIG_HOME:-$HOME/.config}/vim/xdg.vim\" | source \$MYVIMRC"
-
 ## Setup zle
 zle_highlight=('paste:none')
 
diff --git a/.zshenv b/.zshenv
index 8ecb48e..163b372 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,14 +1,5 @@
 ## Author:  druckdev
 ## Created: 2019-10-21
 
-setopt NO_GLOBAL_RCS
-
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_DATA_HOME="$HOME/.local/share"
-
-export GPG_TTY="$TTY"
-
 ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
-
 [ ! -r "$ZDOTDIR/.zshenv" ] || . "$ZDOTDIR/.zshenv"