.config/environment/backup

@@ -1,4 +0,0 @@
-# keep-sorted start
-export BORG_PASSCOMMAND="cat ${HOME}/.keys/borg-passphrase.txt"
-export BORG_REPO="/media/backup/"
-# keep-sorted end

.config/environment/editor

@@ -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

.config/environment/ime

@@ -1,5 +0,0 @@
-# keep-sorted start
-export GTK_IM_MODULE="fcitx"
-export QT_IM_MODULE="fcitx"
-export XMODIFIERS="@im=fcitx"
-# keep-sorted end

.config/environment/poetry

@@ -1,3 +0,0 @@
-# keep-sorted start
-export PYTHON_KEYRING_BACKEND="keyring.backends.null.Keyring"
-# keep-sorted end

.config/environment/utf-8

@@ -1,3 +0,0 @@
-# keep-sorted start
-export LANG="en_IL.utf8"
-# keep-sorted end

.config/environment/zoom

@@ -1,3 +0,0 @@
-# keep-sorted start
-export XDG_CURRENT_DESKTOP="sway"
-# keep-sorted end

.config/setup/02-setup-packages.sh

@@ -2,7 +2,7 @@
 
 systemctl --user enable --now syncthing.service
 
-mkdir --parents ~/Pictures/screenshots
+mkdir -p ~/Pictures/screenshots
 
 pre-commit install
 

.profile

@@ -36,10 +36,17 @@ if [ -d "$(systemd-path user-state-private)"/git-sync ] ; then
 fi
 
 umask 0007
-
-for filename in $(systemd-path user-configuration)/environment/*; do
-    . "$filename"
-done
+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"
 
 # Autolaunch sway for tty1 logins
 [ "$(tty)" = "/dev/tty1" ] &&