diff --git a/.config/fish/config.fish b/.config/fish/config.fish
new file mode 100644
index 0000000..bca4704
--- /dev/null
+++ b/.config/fish/config.fish
@@ -0,0 +1,6 @@
+set -U -x EDITOR vim
+
+set -U fish_features stderr-nocaret qmark-noglob
+set -e fish_greeting
+
+alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
diff --git a/.pam_environment b/.pam_environment
new file mode 100644
index 0000000..b55fba7
--- /dev/null
+++ b/.pam_environment
@@ -0,0 +1,2 @@
+SSH_AGENT_PID	DEFAULT=
+SSH_AUTH_SOCK	DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"