diff --git a/.config/environment/backup b/.config/environment/backup
new file mode 100644
index 0000000..d9088c8
--- /dev/null
+++ b/.config/environment/backup
@@ -0,0 +1,4 @@
+# keep-sorted start
+export BORG_PASSCOMMAND="cat ${HOME}/.keys/borg-passphrase.txt"
+export BORG_REPO="/media/backup/"
+# keep-sorted end
diff --git a/.config/environment/editor b/.config/environment/editor
new file mode 100644
index 0000000..af438a9
--- /dev/null
+++ b/.config/environment/editor
@@ -0,0 +1,5 @@
+# keep-sorted start
+export EDITOR="emacsclient --create-frame --no-window-system"
+export SUDO_EDITOR="/usr/local/bin/emacs --no-init-file --no-splash --no-window-system"
+export VISUAL="emacsclient --create-frame --no-window-system"
+# keep-sorted end
diff --git a/.config/environment/ime b/.config/environment/ime
new file mode 100644
index 0000000..f92aced
--- /dev/null
+++ b/.config/environment/ime
@@ -0,0 +1,5 @@
+# keep-sorted start
+export GTK_IM_MODULE="fcitx"
+export QT_IM_MODULE="fcitx"
+export XMODIFIERS="@im=fcitx"
+# keep-sorted end
diff --git a/.config/environment/poetry b/.config/environment/poetry
new file mode 100644
index 0000000..2074a7a
--- /dev/null
+++ b/.config/environment/poetry
@@ -0,0 +1,3 @@
+# keep-sorted start
+export PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
+# keep-sorted end
diff --git a/.config/environment/utf-8 b/.config/environment/utf-8
new file mode 100644
index 0000000..4977d5f
--- /dev/null
+++ b/.config/environment/utf-8
@@ -0,0 +1,3 @@
+# keep-sorted start
+export LANG="en_IL.utf8"
+# keep-sorted end
diff --git a/.config/environment/zoom b/.config/environment/zoom
new file mode 100644
index 0000000..fc4c113
--- /dev/null
+++ b/.config/environment/zoom
@@ -0,0 +1,3 @@
+# keep-sorted start
+export XDG_CURRENT_DESKTOP="sway"
+# keep-sorted end
diff --git a/.config/setup/02-setup-packages.sh b/.config/setup/02-setup-packages.sh
index 5414418..859047f 100755
--- a/.config/setup/02-setup-packages.sh
+++ b/.config/setup/02-setup-packages.sh
@@ -2,7 +2,7 @@
 
 systemctl --user enable --now syncthing.service
 
-mkdir -p ~/Pictures/screenshots
+mkdir --parents ~/Pictures/screenshots
 
 pre-commit install
 
diff --git a/.profile b/.profile
index 39944ac..633f877 100644
--- a/.profile
+++ b/.profile
@@ -36,17 +36,10 @@ if [ -d "$(systemd-path user-state-private)"/git-sync ] ; then
 fi
 
 umask 0007
-export SUDO_EDITOR="/usr/local/bin/emacs --no-init-file --no-splash --no-window-system"
-export EDITOR="emacsclient --create-frame --no-window-system"
-export VISUAL="emacsclient --create-frame --no-window-system"
-export GTK_IM_MODULE="fcitx"
-export QT_IM_MODULE="fcitx"
-export XMODIFIERS="@im=fcitx"
-export LANG="en_IL.utf8"
-export BORG_REPO="/media/backup/"
-export BORG_PASSCOMMAND="cat ${HOME}/.keys/borg-passphrase.txt"
-export PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
-export XDG_CURRENT_DESKTOP="sway"
+
+for filename in $(systemd-path user-configuration)/environment/*; do
+    . "$filename"
+done
 
 # Autolaunch sway for tty1 logins
 [ "$(tty)" = "/dev/tty1" ] &&