|
|
@@ -1,17 +1,20 @@
|
|
|
-export EDITOR="nvim"
|
|
|
-
|
|
|
-# Basic environment variables
|
|
|
-export TERMINAL="alacritty"
|
|
|
-export LANG=en_US.UTF-8
|
|
|
-
|
|
|
-export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
|
|
-
|
|
|
-# XDG Base Directory Spec
|
|
|
+# XDG Base Directory Spec (must come first)
|
|
|
export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
|
|
|
export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}"
|
|
|
export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
|
|
|
export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
|
|
|
|
|
|
+# GPG configuration (must come before SSH_AUTH_SOCK)
|
|
|
+export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
|
|
|
+
|
|
|
+# SSH via GPG agent
|
|
|
+export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
|
|
+
|
|
|
+# Basic environment variables
|
|
|
+export EDITOR="nvim"
|
|
|
+export TERMINAL="alacritty"
|
|
|
+export LANG=en_US.UTF-8
|
|
|
+
|
|
|
# Program-specific XDG configurations
|
|
|
export W3M_DIR=$XDG_DATA_HOME/w3m
|
|
|
export RANDFILE=$XDG_CACHE_HOME/.rnd
|
|
|
@@ -31,7 +34,6 @@ export JAVA_HOME="/usr/lib/jvm/default"
|
|
|
# export AWS_CONFIG_FILE="${XDG_CONFIG_HOME}/aws/config"
|
|
|
export CARGO_HOME="${XDG_DATA_HOME}/cargo"
|
|
|
export HISTFILE="${XDG_DATA_HOME}/bash/history"
|
|
|
-export GNUPGHOME="${XDG_DATA_HOME}/gnupg"
|
|
|
export GTK2_RC_FILES="${XDG_CONFIG_HOME}/gtk-2.0/gtkrc"
|
|
|
export _JAVA_OPTIONS="-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java"
|
|
|
export _JAVA_OPTIONS="-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java"
|