From 4d46e11493d464832a7f99f0edaf6cf19876cb73 Mon Sep 17 00:00:00 2001
From: Severin Kaderli <severin@kaderli.dev>
Date: Thu, 13 Jan 2022 18:39:01 +0100
Subject: [PATCH] Clean up for env variables

Signed-off-by: Severin Kaderli <severin@kaderli.dev>
---
 system/.config/custom/env                    | 31 ++++----------------
 system/.config/environment.d/10_xdg.conf     | 25 ++++++++++++++++
 system/.config/environment.d/20_theme.conf   |  1 +
 system/.config/environment.d/30_wayland.conf |  2 ++
 system/.config/zsh/.zprofile                 | 11 ++++---
 5 files changed, 39 insertions(+), 31 deletions(-)
 create mode 100644 system/.config/environment.d/10_xdg.conf
 create mode 100644 system/.config/environment.d/20_theme.conf
 create mode 100644 system/.config/environment.d/30_wayland.conf

diff --git a/system/.config/custom/env b/system/.config/custom/env
index 5d00a3e..4111bc8 100644
--- a/system/.config/custom/env
+++ b/system/.config/custom/env
@@ -16,17 +16,6 @@ if [ -f "${XDG_BIN_HOME}/utils" ]; then
     . "${XDG_BIN_HOME}/utils"
 fi
 
-if [ -z "${HOME}" ]; then
-    export HOME="/home/severin"
-fi
-
-export XDG_CONFIG_HOME="${HOME}/.config"
-export XDG_CACHE_HOME="${HOME}/.cache"
-export XDG_DATA_HOME="${HOME}/.local/share"
-export XDG_BIN_HOME="${HOME}/.local/bin"
-export XDG_LOG_HOME="${HOME}/.local/log"
-export DOTFILES="${HOME}/dotfiles"
-
 if [ "$(hostname)" = "loki" ]; then
     export IS_WORK="1"
 else
@@ -34,36 +23,31 @@ else
 fi
 
 # XDG Overrides for unsupported programs 
-export HTTPIE_CONFIG_DIR="${XDG_CONFIG_HOME}/httpie"
+
 export XAUTHORITY="${HOME}/.Xauthority"
 export VIMINIT=":source ${XDG_CONFIG_HOME}/vim/vimrc"
-export CARGO_HOME="${XDG_DATA_HOME}/cargo"
-export RUSTUP_HOME="${XDG_DATA_HOME}/rustup"
-export PYLINTHOME="${XDG_CACHE_HOME}/pylint"
-export DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
+
+
 export GTK_RC_FILES="${XDG_CONFIG_HOME}/gtk-1.0/gtkrc"
 export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
-export XINITRC="${XDG_CONFIG_HOME}/X11/xinitrc"
 export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME}/npm/config"
 export NODE_REPL_HISTORY="${XDG_DATA_HOME}/node/repl_history"
-export GOPATH="${XDG_DATA_HOME}/go"
+
 export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
 export GEM_HOME="${XDG_DATA_HOME}/gem"
 export GEM_SPEC_CACHE="${XDG_CACHE_HOME}/gem/specs"
 mkdir -p "${XDG_DATA_HOME}/wine/prefixes"
-export WINEPREFIX="${XDG_DATA_HOME}/wine/prefixes/default"
+
 export SQLITE_HISTORY="${XDG_DATA_HOME}/sqlite_history"
 export TASKDATA="${HOME}/tasks"
 export TASKRC="${XDG_CONFIG_HOME}/task/taskrc"
-export CCACHE_CONFIGPATH="${XDG_CONFIG_HOME}/ccache/config"
-export CCACHE_DIR="${XDG_CACHE_HOME}/ccache"
+
 mkdir -p "${XDG_CONFIG_HOME}/pg"
 mkdir -p "${XDG_CACHE_HOME}/pg"
 export PSQLRC="${XDG_CONFIG_HOME}/pg/psqlrc"
 export PSQL_HISTORY="${XDG_CACHE_HOME}/pg/psql_history"
 export PGPASSFILE="${XDG_CONFIG_HOME}/pg/pgpass"
 export PGSERVICEFILE="${XDG_CONFIG_HOME}/pg/pg_service.conf"
-export STARSHIP_CONFIG="${XDG_CONFIG_HOME}/starship/config.toml"
 export OCTAVE_HISTFILE="${XDG_CACHE_HOME}/octave-hist"
 export OCTAVE_SITE_INITFILE="${XDG_CONFIG_HOME}/octave/octaverc"
 mkdir -p "${XDG_CONFIG_HOME}/bazaar"
@@ -125,9 +109,6 @@ export BROWSER="firefox"
 export PAGER="less"
 export MANPAGER="${PAGER}"
 
-# QT
-export QT_QPA_PLATFORMTHEME="qt5ct"
-
 # Ibus
 export GTK_IM_MODULE=ibus
 export XMODIFIERS=@im=ibus
diff --git a/system/.config/environment.d/10_xdg.conf b/system/.config/environment.d/10_xdg.conf
new file mode 100644
index 0000000..0d0bdde
--- /dev/null
+++ b/system/.config/environment.d/10_xdg.conf
@@ -0,0 +1,25 @@
+# XDG Base Directories
+TEST_VAR="TEST2"
+XDG_CONFIG_HOME="${HOME}/.config"
+XDG_CACHE_HOME="${HOME}/.cache"
+XDG_DATA_HOME="${HOME}/.local/share"
+XDG_STATE_HOME="${HOME}/.local/state"
+
+# Custom inofficial Base Directories
+XDG_BIN_HOME="${HOME}/.local/bin"
+XDG_LOG_HOME="${HOME}/.local/log"
+DOTFILES="${HOME}/dotfiles"
+
+# XDG Config
+STARSHIP_CONFIG="${XDG_CONFIG_HOME}/starship/config.toml"
+KDEHOME="${XDG_CONFIG_HOME}/kde"
+DOCKER_CONFIG="${XDG_CONFIG_HOME}/docker"
+
+# XDG Cache
+CUDA_CACHE_PATH="${XDG_CACHE_HOME}/nv"
+
+# XDG Data
+CARGO_HOME="${XDG_DATA_HOME}/cargo"
+RUSTUP_HOME="${XDG_DATA_HOME}/rustup"
+GOPATH="${XDG_DATA_HOME}/go"
+WINEPREFIX="${XDG_DATA_HOME}/wine/prefixes/default"
diff --git a/system/.config/environment.d/20_theme.conf b/system/.config/environment.d/20_theme.conf
new file mode 100644
index 0000000..3eaec13
--- /dev/null
+++ b/system/.config/environment.d/20_theme.conf
@@ -0,0 +1 @@
+QT_QPA_PLATFORMTHEME="qt5ct"
diff --git a/system/.config/environment.d/30_wayland.conf b/system/.config/environment.d/30_wayland.conf
new file mode 100644
index 0000000..48ecc80
--- /dev/null
+++ b/system/.config/environment.d/30_wayland.conf
@@ -0,0 +1,2 @@
+QT_QPA_PLATFORM=wayland
+MOZ_ENABLE_WAYLAND=1
diff --git a/system/.config/zsh/.zprofile b/system/.config/zsh/.zprofile
index d819360..699f0f6 100644
--- a/system/.config/zsh/.zprofile
+++ b/system/.config/zsh/.zprofile
@@ -11,6 +11,11 @@
 #
 # USAGE:
 # This script is automatically executed when you start a login shell.
+
+# Load env variables
+export $(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
+
+
 if [[ -f "${HOME}/.config/zsh/.zshrc" ]]; then
     . "${HOME}/.config/zsh/.zshrc"
 fi
@@ -18,12 +23,6 @@ fi
 # Restore custom dconf configuration
 dconf load / < "${XDG_CONFIG_HOME}/dconf/root.conf"
 
-# Activate correct crontab file
-crontab "${XDG_CONFIG_HOME}/cron/crontab"
-
-# Load env variables
-export "$(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)"
-
 if [ "$(tty)" = "/dev/tty1" ]; then
     sway > "${XDG_LOG_HOME}/sway.log" 2>&1 && exit
 fi