diff --git a/files/global-environment b/files/global-environment
deleted file mode 100644
index a2d2910..0000000
--- a/files/global-environment
+++ /dev/null
@@ -1,5 +0,0 @@
-GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
-LANG=en_GB.UTF-8
-ARCHFLAGS="-arch x86_64"
-SSH_AUTH_SOCK=/tmp/ssh-agent-{{ user }}.sock
-MOZ_USE_XINPUT2=1
diff --git a/files/xprofile.sh b/files/xprofile.sh
new file mode 100644
index 0000000..ea7fbaf
--- /dev/null
+++ b/files/xprofile.sh
@@ -0,0 +1,11 @@
+export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+export LANG=en_GB.UTF-8
+export ARCHFLAGS="-arch x86_64"
+export MOZ_USE_XINPUT2=1
+
+if ! pgrep -u "$USER" ssh-agent > /dev/null; then
+    ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
+fi
+if [[ ! -f "$SSH_AUTH_SOCK" ]]; then
+    source "$XDG_RUNTIME_DIR/ssh-agent.env" >/dev/null
+fi
diff --git a/tasks/shell.yml b/tasks/shell.yml
index f739532..982d93f 100644
--- a/tasks/shell.yml
+++ b/tasks/shell.yml
@@ -51,14 +51,6 @@
     validate: zsh -n %s
     backup: true
 
-- name: Install global environment variables
-  template:
-    src: ./files/global-environment
-    dest: /etc/environment
-    mode: 0644
-    owner: root
-    group: root
-
 - name: Install tmux config
   template:
     src: ./files/tmux.conf
diff --git a/tasks/user.yml b/tasks/user.yml
index 452c3e8..39d566e 100644
--- a/tasks/user.yml
+++ b/tasks/user.yml
@@ -26,3 +26,11 @@
     create: true
     validate: visudo -cf %s
     mode: 0640
+
+- name: Install xprofile
+  template:
+    src: ./files/xprofile.sh
+    dest: "{{ home }}/.xprofile"
+    mode: 0644
+    owner: "{{ user }}"
+    group: "{{ user }}"