From cb57530810911baec195341e054806646068f013 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Sun, 5 May 2024 11:08:24 +0200
Subject: [PATCH] Move GPG

---
 dotfiles.yml    | 8 +++-----
 zsh/zprofile.j2 | 4 ++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dotfiles.yml b/dotfiles.yml
index ff07ed0..86508b1 100644
--- a/dotfiles.yml
+++ b/dotfiles.yml
@@ -1,6 +1,4 @@
 empty_directories:
-  - name: .gnupg
-    mode: '0700'
   - name: .config/nvim
   - name: .config/rofi
   - name: .config/gtk-3.0
@@ -21,12 +19,12 @@ dotfiles:
     to: .config/git/config
     template: true
   - from: gnupg/dirmngr.conf
-    to: .gnupg/dirmngr.conf
+    to: .local/state/gnupg/dirmngr.conf
   - from: gnupg/gpg-agent.conf
-    to: .gnupg/gpg-agent.conf
+    to: .local/state/gnupg/gpg-agent.conf
     template: true
   - from: gnupg/gpg.conf
-    to: .gnupg/gpg.conf
+    to: .local/state/gnupg/gpg.conf
     template: true
   - from: i3/config
     to: .config/i3/config
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index 3104797..aaded2b 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -27,8 +27,6 @@ export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"
 
-export GNUPGHOME="$HOME/.gnupg"
-
 export PASSWORD_STORE_DIR="$HOME/.password-store"
 
 export GTK2_RC_FILES=${XDG_CONFIG_HOME}/gtkrc-2.0
@@ -44,6 +42,8 @@ export ANSIBLE_GALAXY_CACHE_DIR="${XDG_CACHE_HOME}/ansible/galaxy_cache"
 
 export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
 
+export GNUPGHOME="$XDG_STATE_HOME"/gnupg
+
 umask 0022
 
 {% set env = machine.environment | combine(user.environment) %}