diff --git a/.config/environment.d/backup.conf b/.config/environment.d/backup.conf
new file mode 100644
index 0000000..f4eee83
--- /dev/null
+++ b/.config/environment.d/backup.conf
@@ -0,0 +1,4 @@
+# keep-sorted start
+BORG_PASSCOMMAND="cat ${HOME}/.keys/borg-passphrase.txt"
+BORG_REPO="/media/backup/"
+# keep-sorted end
diff --git a/.config/environment.d/editor.conf b/.config/environment.d/editor.conf
new file mode 100644
index 0000000..42eb8e0
--- /dev/null
+++ b/.config/environment.d/editor.conf
@@ -0,0 +1,5 @@
+# keep-sorted start
+EDITOR="emacsclient --create-frame --no-window-system"
+SUDO_EDITOR="/usr/local/bin/emacs --no-init-file --no-splash --no-window-system"
+VISUAL="emacsclient --create-frame --no-window-system"
+# keep-sorted end
diff --git a/.config/environment.d/ime.conf b/.config/environment.d/ime.conf
new file mode 100644
index 0000000..1d33c97
--- /dev/null
+++ b/.config/environment.d/ime.conf
@@ -0,0 +1,5 @@
+# keep-sorted start
+GTK_IM_MODULE="fcitx"
+QT_IM_MODULE="fcitx"
+XMODIFIERS="@im=fcitx"
+# keep-sorted end
diff --git a/.config/environment.d/poetry.conf b/.config/environment.d/poetry.conf
new file mode 100644
index 0000000..7787852
--- /dev/null
+++ b/.config/environment.d/poetry.conf
@@ -0,0 +1,3 @@
+# keep-sorted start
+PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
+# keep-sorted end
diff --git a/.config/environment/utf-8 b/.config/environment.d/utf-8.conf
similarity index 60%
rename from .config/environment/utf-8
rename to .config/environment.d/utf-8.conf
index 4977d5f..f8c7e96 100644
--- a/.config/environment/utf-8
+++ b/.config/environment.d/utf-8.conf
@@ -1,3 +1,3 @@
 # keep-sorted start
-export LANG="en_IL.utf8"
+LANG="en_IL.utf8"
 # keep-sorted end
diff --git a/.config/environment.d/wallpaper.conf b/.config/environment.d/wallpaper.conf
new file mode 100644
index 0000000..a246445
--- /dev/null
+++ b/.config/environment.d/wallpaper.conf
@@ -0,0 +1,3 @@
+# keep-sorted start
+SWAY_WALLPAPER="${HOME}/Documents/wallpapers/solar-system.jpg"
+# keep-sorted end
diff --git a/.config/environment/zoom b/.config/environment.d/zoom.conf
similarity index 52%
rename from .config/environment/zoom
rename to .config/environment.d/zoom.conf
index fc4c113..0e6ffb2 100644
--- a/.config/environment/zoom
+++ b/.config/environment.d/zoom.conf
@@ -1,3 +1,3 @@
 # keep-sorted start
-export XDG_CURRENT_DESKTOP="sway"
+XDG_CURRENT_DESKTOP="sway"
 # keep-sorted end
diff --git a/.config/environment/backup b/.config/environment/backup
deleted file mode 100644
index d9088c8..0000000
--- a/.config/environment/backup
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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
deleted file mode 100644
index af438a9..0000000
--- a/.config/environment/editor
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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
deleted file mode 100644
index f92aced..0000000
--- a/.config/environment/ime
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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
deleted file mode 100644
index 2074a7a..0000000
--- a/.config/environment/poetry
+++ /dev/null
@@ -1,3 +0,0 @@
-# keep-sorted start
-export PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
-# keep-sorted end
diff --git a/.config/sway/config b/.config/sway/config
index fc77a2a..b76ca8f 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -303,4 +303,4 @@ include /etc/sway/config.d/*
 exec systemctl --user import-environment XDG_CURRENT_DESKTOP
 exec dbus-update-activation-environment --systemd XDG_CURRENT_DESKTOP=sway
 
-output * bg ~/Documents/wallpapers/solar-system.jpg fill
+output * bg ${SWAY_WALLPAPER} fill
diff --git a/.local/bin/get-nasa-apod b/.local/bin/get-nasa-apod
index 5e128b2..f0f2724 100755
--- a/.local/bin/get-nasa-apod
+++ b/.local/bin/get-nasa-apod
@@ -38,4 +38,4 @@ ln \
     --symbolic \
     "${outfile}" \
     "${WALLPAPERS}/today"
-swaymsg reload
+swaymsg output "*" bg "${SWAY_WALLPAPER}" fill
diff --git a/.profile b/.profile
index 9b2a274..0fb6ca3 100644
--- a/.profile
+++ b/.profile
@@ -37,9 +37,9 @@ fi
 
 umask 0007
 
-for filename in "$(systemd-path user-configuration)"/environment/*; do
-    . "$filename"
-done
+while read -r l; do
+    eval export $l
+done < <(/usr/lib/systemd/user-environment-generators/30-systemd-environment-d-generator)
 
 # Autolaunch sway for tty1 logins
 [ "$(tty)" = "/dev/tty1" ] &&