diff --git a/apps/gpg/.gitignore b/apps/gpg/.gitignore
deleted file mode 100644
index e4c06c1..0000000
--- a/apps/gpg/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!gpg-agent.conf
diff --git a/apps/gpg/agent.conf b/apps/gpg/agent.conf
new file mode 100644
index 0000000..aefe8af
--- /dev/null
+++ b/apps/gpg/agent.conf
@@ -0,0 +1,3 @@
+pinentry-program /usr/bin/pinentry-curses
+max-cache-ttl 60480000
+default-cache-ttl 60480000
diff --git a/bin/undock b/env/laptop/bin/undock
similarity index 100%
rename from bin/undock
rename to env/laptop/bin/undock
diff --git a/setup.bash b/setup.bash
index f079d0f..ad515ee 100755
--- a/setup.bash
+++ b/setup.bash
@@ -70,7 +70,7 @@ links=(
 	"$dfp/apps/de/libinput/gestures.conf"    "$XDG_CONFIG_HOME/libinput-gestures.conf"
 
   # gpg config
-  "$dfp/apps/gpg/"                         "$HOME/.gnupg"
+  "$dfp/apps/gpg/agent.conf"               "$HOME/.gnupg/gpg-agent.conf"
 
 	# document viewer
 	"$dfp/apps/zathura/"                     "$XDG_CONFIG_HOME/zathura"
@@ -126,9 +126,8 @@ if [[ "$INTERACTIVE" = 1 ]]; then
 		"$dfp/bin/lib/sudo_setup"
 	fi
 
-	echo -e "Dotfiles Installed! Running 'exec bash'...\n"
-
 	# execute the user's shell
 	ush="$(getent passwd $LOGNAME | cut -d: -f7)"
+	echo -e "Dotfiles Installed! Running 'exec $ush'...\n"
 	exec "$ush"
 fi