From fca7a5e558b690aba74ff414ec548bf4f9410b34 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Thu, 2 Mar 2023 13:40:11 -0600 Subject: Cleanup XDG cleanup stuff --- zsh/.config/zsh/.zshenv | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv index edb4183..bb15a26 100644 --- a/zsh/.config/zsh/.zshenv +++ b/zsh/.config/zsh/.zshenv @@ -13,14 +13,17 @@ export EDITOR="lvim +star" export BROWSER="chromium" # ~/ Clean-up: +export XDG_CONFIG_HOME="$HOME/.config" +export XDG_DATA_HOME="$HOME/.local/share" +export XDG_CACHE_HOME="$HOME/.cache" +export XDG_STATE_HOME="$HOME/.local/state" +export XDG_BIN_HOME="$HOME/.local/bin" + export USERXSESSION="$XDG_CACHE_HOME/X11/xsession" export USERXSESSIONRC="$XDG_CACHE_HOME/X11/xsessionrc" export ALTUSERXSESSION="$XDG_CACHE_HOME/X11/Xsession" export ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors" export GPG_TTY=$TTY -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_CACHE_HOME="$HOME/.cache" export XINITRC="${XDG_CONFIG_HOME:-$HOME/.config}/x11/xinitrc" #export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # This line will break some DMs. export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config" @@ -41,11 +44,12 @@ export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store" 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 GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go" +export GOBIN="${XDG_BIN_HOME:-$HOME/.local/bin}" +#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" -export DENO_INSTALL_ROOT="$HOME/.local/bin" +export DENO_INSTALL_ROOT="${XDG_BIN_HOME:-$HOME/.local/bin}" export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg" export UNISON="${XDG_DATA_HOME:-$HOME/.local/share}/unison" export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history" @@ -77,7 +81,6 @@ export MOZ_USE_XINPUT2="1" # Mozilla smooth scrolling/touchpads. export AWT_TOOLKIT="MToolkit wmname LG3D" #May have to install wmname export _JAVA_AWT_WM_NONREPARENTING=1 # Fix for Java applications in dwm export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java -export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java # This is the list for lf icons: export LF_ICONS="di=📁:\ -- cgit v1.2.3