diff --git a/.homesick_subdir b/.homesick_subdir
index ae7f312..586b803 100644
--- a/.homesick_subdir
+++ b/.homesick_subdir
@@ -9,5 +9,6 @@
 .spacemacs.d/snippets/org-mode
 .spacemacs.d/snippets/message-mode
 .weechat
+.gnupg
 bin
-.local/share/applications
\ No newline at end of file
+.local/share/applications
diff --git a/home/.gnupg/dirmngr.conf b/home/.gnupg/dirmngr.conf
new file mode 100644
index 0000000..6712a24
--- /dev/null
+++ b/home/.gnupg/dirmngr.conf
@@ -0,0 +1,2 @@
+ldaptimeout 0
+keyserver hkps://keys.openpgp.org
\ No newline at end of file
diff --git a/home/.gnupg/gpg-agent.conf b/home/.gnupg/gpg-agent.conf
index dc7b957..7d34baa 100644
--- a/home/.gnupg/gpg-agent.conf
+++ b/home/.gnupg/gpg-agent.conf
@@ -1,6 +1,11 @@
-default-cache-ttl 300
+default-cache-ttl 1800
 max-cache-ttl 999999
 enable-ssh-support
 allow-emacs-pinentry
-pinentry-program /usr/bin/pinentry-qt
-extra-socket /home/bascht/.gnupg/S.gpg-agent.extra
\ No newline at end of file
+debug-level expert
+keep-display
+pinentry-program /usr/bin/pinentry-gtk
+extra-socket /run/user/1000/gnupg/S.gpg-agent.extra
+log-file /tmp/gpg-agent.log
+no-grab
+allow-preset-passphrase
\ No newline at end of file
diff --git a/home/.gnupg/gpg.conf b/home/.gnupg/gpg.conf
index 6507379..3c4dc01 100644
--- a/home/.gnupg/gpg.conf
+++ b/home/.gnupg/gpg.conf
@@ -1,6 +1,4 @@
-no-greeting
 default-key 6CEE42B4
-keyserver hkp://keys.gnupg.net
 keyserver-options auto-key-retrieve
 use-agent
-utf8-strings
\ No newline at end of file
+utf8-strings