zsh: move gpg to XDG dirs

diff --git a/zsh/lib/gpg.zsh b/zsh/lib/gpg.zsh
index 818e241f0955d656eecf7f2c8d1df2b0dca6dfce..aea97b37990728fff762920f612334305b82d357 100644 (file)
--- a/zsh/lib/gpg.zsh
+++ b/zsh/lib/gpg.zsh
@@ -11,8 +11,8 @@ if (( ! $+commands[gpg-agent] )); then
 fi
 
 # Set the default paths to gpg-agent files.
 fi
 
 # Set the default paths to gpg-agent files.

-_gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
-_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
+_gpg_agent_conf="$XDG_CONFIG_HOME/gnupg/gpg-agent.conf"
+_gpg_agent_env="$XDG_CACHE_HOME/gpg-agent-info"

 
 # Start gpg-agent if not started.
 if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then
 
 # Start gpg-agent if not started.
 if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then

diff --git a/zshenv b/zshenv
index bde8c3883eb3e6d74d0c681ffce964854f7f7771..710e9f661d0ffb68ff1443149c47c27558c8409b 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -5,7 +5,10 @@ export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CACHE_HOME="$HOME/.cache"
 export HOST=$(hostname)
 
 export XDG_CACHE_HOME="$HOME/.cache"
 export HOST=$(hostname)
 

-systemctl --user import-environment XDG_CACHE_HOME XDG_DATA_HOME XDG_CONFIG_HOME
+systemctl --user import-environment \
+    XDG_CACHE_HOME \
+    XDG_CONFIG_HOME \
+    XDG_DATA_HOME

 
 # vim stuff
 [[ -d "$XDG_CACHE_HOME/vim" ]] || mkdir -p "$XDG_CACHE_HOME/vim"
 
 # vim stuff
 [[ -d "$XDG_CACHE_HOME/vim" ]] || mkdir -p "$XDG_CACHE_HOME/vim"


@@ -31,3 +34,6 @@ export TASKRC="$XDG_CONFIG_HOME/taskrc"
 # mpv & mplayer
 export MPV_HOME="$XDG_CONFIG_HOME/mpv"
 export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer"
 # mpv & mplayer
 export MPV_HOME="$XDG_CONFIG_HOME/mpv"
 export MPLAYER_HOME="$XDG_CONFIG_HOME/mplayer"

+
+# gpg
+export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"