From e729dc11824b1f34ba9deed606e25a2c6ee75464 Mon Sep 17 00:00:00 2001
From: Stonewall Jackson <stonewall@sacredheartsc.com>
Date: Wed, 14 Jun 2023 20:22:19 -0400
Subject: local_homedirs: cleanup

---
 roles/local_homedirs/files/etc/profile.d/local-homedirs.sh          | 2 ++
 .../files/etc/systemd/user-environment-generators/local-homedirs.sh | 1 +
 roles/local_homedirs/tasks/main.yml                                 | 6 +++---
 roles/local_homedirs/vars/main.yml                                  | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'roles')

diff --git a/roles/local_homedirs/files/etc/profile.d/local-homedirs.sh b/roles/local_homedirs/files/etc/profile.d/local-homedirs.sh
index 439d888..c2b0361 100644
--- a/roles/local_homedirs/files/etc/profile.d/local-homedirs.sh
+++ b/roles/local_homedirs/files/etc/profile.d/local-homedirs.sh
@@ -15,6 +15,8 @@ if (( UID >= 1000 )); then
   ln -sfn "/opt/flatpak/${USER}" "${HOME}/.var"
 
   # kwallet
+  # The kwallet PAM modules hard-codes ~/.local/share/kwalletd, but kwallet
+  # itself honors XDG_DATA_HOME. Gross.
   if [ -f "${HOME}/.local/share/kwalletd/kdewallet.salt" ]; then
     mkdir -p "/usr/local/home/${USER}/.local/share/kwalletd"
     ln -sfn "${HOME}/.local/share/kwalletd/kdewallet.salt" "/usr/local/home/${USER}/.local/share/kwalletd/kdewallet.salt"
diff --git a/roles/local_homedirs/files/etc/systemd/user-environment-generators/local-homedirs.sh b/roles/local_homedirs/files/etc/systemd/user-environment-generators/local-homedirs.sh
index 2b760e2..20dddcd 100755
--- a/roles/local_homedirs/files/etc/systemd/user-environment-generators/local-homedirs.sh
+++ b/roles/local_homedirs/files/etc/systemd/user-environment-generators/local-homedirs.sh
@@ -10,4 +10,5 @@ if (( uid >= 1000 )); then
   echo "XDG_STATE_HOME=/usr/local/home/${username}/.local/state"
   echo "XDG_CACHE_HOME=/usr/local/home/${username}/.cache"
   echo "XDG_CONFIG_HOME=/usr/local/home/${username}/.config"
+  echo "KDEHOME=/usr/local/home/${username}/.kde"
 fi
diff --git a/roles/local_homedirs/tasks/main.yml b/roles/local_homedirs/tasks/main.yml
index 7e90959..c1bb862f 100644
--- a/roles/local_homedirs/tasks/main.yml
+++ b/roles/local_homedirs/tasks/main.yml
@@ -31,10 +31,10 @@
     src: etc/profile.d/local-homedirs.sh
     dest: /etc/profile.d/local-homedirs.sh
 
-- name: copy pam_env for XDG variables
+- name: configure pam_env for XDG environment variables
   copy:
-    src: '{{ local_homedir_pam_env_path[1:] }}'
-    dest: '{{ local_homedir_pam_env_path }}'
+    src: etc/security/pam_env_xdg.conf
+    dest: /etc/security/pam_env_xdg.conf
 
 - name: get fcontext equivalencies
   command: semanage fcontext -l -C
diff --git a/roles/local_homedirs/vars/main.yml b/roles/local_homedirs/vars/main.yml
index 46ee9b6..549112d 100644
--- a/roles/local_homedirs/vars/main.yml
+++ b/roles/local_homedirs/vars/main.yml
@@ -1,3 +1,2 @@
 local_homedir_script_sddm: /usr/local/sbin/create-local-homedir-gdm.sh
 local_homedir_script_ssh: /usr/local/sbin/create-local-homedir-ssh.sh
-local_homedir_pam_env_path: /etc/security/pam_env_xdg.conf
-- 
cgit