From 6edd87f13aeadb5be39cb7becd579d83b43e8e0c Mon Sep 17 00:00:00 2001 From: stitchy Date: Fri, 21 Mar 2025 11:14:48 +0000 Subject: [PATCH] fix: properly source env-vars Had an issue where hyprland wouldn't source the env-vars for stuff because I put the source for it under the execute hyprland :) --- config/zshrc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/config/zshrc b/config/zshrc index c056349..c6194f0 100755 --- a/config/zshrc +++ b/config/zshrc @@ -93,13 +93,15 @@ eval "$(zoxide init zsh)" export PATH="${PATH}:/home/flyingstitchman/.cargo/bin" # Clean Up -export MBSYNCRC=${XDG_CONFIG_HOME:-~/.config}/mbsync/config -export PASSWORD_STORE_DIR=${XDG_CONFIG_HOME:-~/.config}/password_store -export NOTMUCH_CONFIG=${XDG_CONFIG_HOME-~/.config}/notmuch/config +export MBSYNCRC=$XDG_CONFIG_HOME/mbsync/config +export PASSWORD_STORE_DIR=$XDG_CONFIG_HOME/password_store +export NOTMUCH_CONFIG=$XDG_CONFIG_HOME/notmuch/config export KDEHOME="$XDG_CONFIG_HOME"/kde export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle +export GNUPGHOME=$XDG_DATA_HOME/gnupg export GOPATH="$XDG_DATA_HOME" export GOMODCACHE="$XDG_CACHE_HOME" +export GPG_TTY=$(tty) export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java export WINEPREFIX="$XDG_DATA_HOME"/wineprefixes/default @@ -117,6 +119,9 @@ reconfig() { sudo nixos-rebuild --flake "/etc/nixos#$(cat /etc/hostname)" "$@" } +# Home Manager Variables +source ~/.local/state/nix/profiles/home-manager/home-path/etc/profile.d/hm-session-vars.sh + # Autostart Hyprland after all environmental Variables have been declared if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then exec Hyprland @@ -126,6 +131,3 @@ export QSYS_ROOTDIR="~/.cache/paru/clone/quartus-free/pkg/quartus-free-quartus/o # Nix Direnv Support eval "$(direnv hook zsh)" - -# Home Manager Variables -source ~/.local/state/nix/profiles/home-manager/home-path/etc/profile.d/hm-session-vars.sh