From 4a706eabced186100c3fa5a61283f0ed54f10595 Mon Sep 17 00:00:00 2001
From: Plom Heller <plom@plomlompom.com>
Date: Sat, 12 Sep 2026 22:52:16 +0200
Subject: [PATCH] Split home skeletons into root and user, move aliases
 definitions into dotfile.

---
 home/root/.aliases                            |  2 ++
 home/user/.aliases                            |  1 +
 {home_user => home/user}/.config/sway/config  |  0
 .../user}/.config/sway/status.py              |  0
 {home_user => home/user}/.gitconfig           |  0
 {home_user => home/user}/.local/bin/backlight |  0
 setup_scripts/lib/augment_profile.sh          | 12 ----------
 setup_scripts/lib/link_home.sh                | 22 +++++++++++++++++++
 setup_scripts/lib/start_root.sh               |  4 ++--
 setup_scripts/start_user.sh                   | 21 ++----------------
 10 files changed, 29 insertions(+), 33 deletions(-)
 create mode 100644 home/root/.aliases
 create mode 100644 home/user/.aliases
 rename {home_user => home/user}/.config/sway/config (100%)
 rename {home_user => home/user}/.config/sway/status.py (100%)
 rename {home_user => home/user}/.gitconfig (100%)
 rename {home_user => home/user}/.local/bin/backlight (100%)
 delete mode 100644 setup_scripts/lib/augment_profile.sh
 create mode 100644 setup_scripts/lib/link_home.sh

diff --git a/home/root/.aliases b/home/root/.aliases
new file mode 100644
index 0000000..f0ff635
--- /dev/null
+++ b/home/root/.aliases
@@ -0,0 +1,2 @@
+alias ls="ls --color=auto"
+
diff --git a/home/user/.aliases b/home/user/.aliases
new file mode 100644
index 0000000..fbd9533
--- /dev/null
+++ b/home/user/.aliases
@@ -0,0 +1 @@
+alias ls="ls --color=auto"
diff --git a/home_user/.config/sway/config b/home/user/.config/sway/config
similarity index 100%
rename from home_user/.config/sway/config
rename to home/user/.config/sway/config
diff --git a/home_user/.config/sway/status.py b/home/user/.config/sway/status.py
similarity index 100%
rename from home_user/.config/sway/status.py
rename to home/user/.config/sway/status.py
diff --git a/home_user/.gitconfig b/home/user/.gitconfig
similarity index 100%
rename from home_user/.gitconfig
rename to home/user/.gitconfig
diff --git a/home_user/.local/bin/backlight b/home/user/.local/bin/backlight
similarity index 100%
rename from home_user/.local/bin/backlight
rename to home/user/.local/bin/backlight
diff --git a/setup_scripts/lib/augment_profile.sh b/setup_scripts/lib/augment_profile.sh
deleted file mode 100644
index d79f767..0000000
--- a/setup_scripts/lib/augment_profile.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-include FNAME_PROFILE
-include msg
-
-augment_profile() {
-    local ALIAS_LS='alias ls="ls --color=auto"'
-    local PATH_PROFILE="${HOME}/${FNAME_PROFILE}"
-    msg 'Augmenting user %s …' "${FNAME_PROFILE}"
-    # test ensures idempotency
-    grep -qxF "${ALIAS_LS}" "${PATH_PROFILE}" 2>/dev/null\
-        || echo "${ALIAS_LS}" >> "${PATH_PROFILE}"
-}
-
diff --git a/setup_scripts/lib/link_home.sh b/setup_scripts/lib/link_home.sh
new file mode 100644
index 0000000..a3ad4ad
--- /dev/null
+++ b/setup_scripts/lib/link_home.sh
@@ -0,0 +1,22 @@
+include FNAME_PROFILE
+include PATH_REPO
+include msg
+
+link_home() {
+    local PATH_SKEL="${PATH_REPO}/home/$1"
+    local DOT_ALIASFILE='. ${HOME}/.aliases'
+    local PATH_PROFILE="${HOME}/${FNAME_PROFILE}"
+    msg 'Linking %s files into home directory …' "${PATH_SKEL}"
+    find "${PATH_SKEL}" -mindepth 1 -maxdepth 1 | while IFS= read -r SRC; do
+        DEST="${HOME}/$(basename "${SRC}")"
+        if [ -e "${DEST}" ] || [ -L "${DEST}" ]; then
+            msg 'Skipping already-found %s …' "${DEST}"
+        else
+            ln -v -s "${SRC}" "${DEST}"
+        fi
+    done
+    msg 'Augmenting user %s …' "${FNAME_PROFILE}"
+    # test ensures idempotency
+    grep -qxF "${DOT_ALIASFILE}" "${PATH_PROFILE}" 2>/dev/null\
+        || printf '\n%s\n' "${DOT_ALIASFILE}" >> "${PATH_PROFILE}"
+}
diff --git a/setup_scripts/lib/start_root.sh b/setup_scripts/lib/start_root.sh
index b9ee529..6cd3afb 100644
--- a/setup_scripts/lib/start_root.sh
+++ b/setup_scripts/lib/start_root.sh
@@ -1,7 +1,7 @@
 include DIRNAME_SCRIPTS
 include PATH_REPO
 include USERNAME
-include augment_profile
+include link_home
 include msg
 include retry_until_success
 include try_quiet
@@ -37,5 +37,5 @@ start_root() {
     msg 'Setting system timezone to %s …' "${TIMEZONE}"
     timedatectl set-timezone "${TIMEZONE}"
 
-    augment_profile
+    link_home root
 }
diff --git a/setup_scripts/start_user.sh b/setup_scripts/start_user.sh
index e7c1284..7270cb1 100755
--- a/setup_scripts/start_user.sh
+++ b/setup_scripts/start_user.sh
@@ -1,22 +1,5 @@
 #!/bin/sh
 . "$(dirname "$0")/_lib.sh"
-include PATH_REPO
-include augment_profile
-include msg
+include link_home
 
-# constants we might want to change at some point
-DIRNAME_HOME_USER=home_user
-
-# constants derived from changeables
-PATH_SKEL_USER="${PATH_REPO}/${DIRNAME_HOME_USER}"
-
-augment_profile
-msg 'Linking %s files into home directory …' "${PATH_SKEL_USER}"
-find "${PATH_SKEL_USER}" -mindepth 1 -maxdepth 1 | while IFS= read -r SRC; do
-    DEST="${HOME}/$(basename "${SRC}")"
-    if [ -e "${DEST}" ] || [ -L "${DEST}" ]; then
-        msg 'Skipping already-found %s …' "${DEST}"
-    else
-        ln -v -s "${SRC}" "${DEST}"
-    fi
-done
+link_home user
-- 
2.30.2