From 2ed6f73532d6eff7c91745985e78b3118a550d3a Mon Sep 17 00:00:00 2001
From: Ohad Livne <libohad-dev@proton.me>
Date: Fri, 11 Jul 2025 00:30:47 +0300
Subject: [PATCH 1/2] Move profile envvars to separate files categorized by
 topic

---
 .config/environment/backup |  4 ++++
 .config/environment/editor |  5 +++++
 .config/environment/ime    |  5 +++++
 .config/environment/poetry |  3 +++
 .config/environment/utf-8  |  3 +++
 .config/environment/zoom   |  3 +++
 .profile                   | 15 ++++-----------
 7 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 .config/environment/backup
 create mode 100644 .config/environment/editor
 create mode 100644 .config/environment/ime
 create mode 100644 .config/environment/poetry
 create mode 100644 .config/environment/utf-8
 create mode 100644 .config/environment/zoom

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/.profile b/.profile
index 39944ac..9b2a274 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" ] &&

From 981403aa1d2e11cfedb918c7725c744c0dd05227 Mon Sep 17 00:00:00 2001
From: Ohad Livne <libohad-dev@proton.me>
Date: Fri, 11 Jul 2025 13:40:23 +0300
Subject: [PATCH 2/2] Remove gdm integration for sway sessions since I launch
 manually

---
 .config/setup/04-install-sway-session.sh | 3 ---
 .config/setup/sway.desktop               | 7 -------
 .local/bin/run-sway                      | 7 -------
 3 files changed, 17 deletions(-)
 delete mode 100755 .config/setup/04-install-sway-session.sh
 delete mode 100644 .config/setup/sway.desktop
 delete mode 100755 .local/bin/run-sway

diff --git a/.config/setup/04-install-sway-session.sh b/.config/setup/04-install-sway-session.sh
deleted file mode 100755
index e1f16a8..0000000
--- a/.config/setup/04-install-sway-session.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /usr/bin/sh
-
-sudo cp "$(systemd-path user-configuration)"/setup/sway.desktop /usr/share/wayland-sessions/
diff --git a/.config/setup/sway.desktop b/.config/setup/sway.desktop
deleted file mode 100644
index 175249e..0000000
--- a/.config/setup/sway.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Version=0.1
-Name=Sway
-Comment=An i3-compatible Wayland compositor
-Exec=/home/ohad/.local/bin/run-sway
-Type=Application
-DesktopNames=sway
diff --git a/.local/bin/run-sway b/.local/bin/run-sway
deleted file mode 100755
index c7f043d..0000000
--- a/.local/bin/run-sway
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /usr/bin/bash
-
-set -euo pipefail
-IFS=$'\n\t'
-
-source "$(systemd-path user)"/.profile
-exec /usr/bin/sway