From 6d4b7227ceecee621ed43cf8d8d7494c0d7da59c Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Thu, 17 Jul 2025 16:10:39 +0200
Subject: [PATCH] Added variable desktop_username to identify the user on a
 single user pc workstation

---
 roles/desk-docker/tasks/main.yml           | 4 ++--
 roles/desk-gnome-caffeine/vars/main.yml    | 2 +-
 roles/desk-gnome-terminal/tasks/main.yml   | 4 ++--
 roles/desk-nextcloud/tasks/main.yml        | 8 ++++----
 roles/desk-nextcloud/vars/main.yml         | 4 ++--
 roles/util-desk-dev-arduino/tasks/main.yml | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/roles/desk-docker/tasks/main.yml b/roles/desk-docker/tasks/main.yml
index df17c596..fcfb6aaa 100644
--- a/roles/desk-docker/tasks/main.yml
+++ b/roles/desk-docker/tasks/main.yml
@@ -5,8 +5,8 @@
       - docker-compose
     state: present
 
-- name: Adding user {{users.client.username}} to relevant docker usergroup  
+- name: "Adding user {{ users[desktop_username].username }} to relevant docker usergroup"
   user: 
-    name: "{{users.client.username}}"
+    name: "{{ users[desktop_username].username }}"
     groups: docker
     append: yes
diff --git a/roles/desk-gnome-caffeine/vars/main.yml b/roles/desk-gnome-caffeine/vars/main.yml
index 1bdd4679..3853a6cc 100644
--- a/roles/desk-gnome-caffeine/vars/main.yml
+++ b/roles/desk-gnome-caffeine/vars/main.yml
@@ -1,2 +1,2 @@
-auto_start_directory: /home/{{users.client.username}}/.config/autostart/
+auto_start_directory: /home/{{ users[desktop_username].username }}/.config/autostart/
 application_id: desk-gnome-caffeine
diff --git a/roles/desk-gnome-terminal/tasks/main.yml b/roles/desk-gnome-terminal/tasks/main.yml
index 9db7d335..10c1f826 100644
--- a/roles/desk-gnome-terminal/tasks/main.yml
+++ b/roles/desk-gnome-terminal/tasks/main.yml
@@ -5,8 +5,8 @@
       - gnome-terminal
     state: present
 
-- name: "Set zsh as default shell for {{users.client.username}}"
+- name: "Set zsh as default shell for {{ users[desktop_username].username }}"
   user:
-    name: "{{users.client.username}}"
+    name: "{{ users[desktop_username].username }}"
     shell: /usr/bin/zsh
   become: true
\ No newline at end of file
diff --git a/roles/desk-nextcloud/tasks/main.yml b/roles/desk-nextcloud/tasks/main.yml
index f45fea68..6782a706 100644
--- a/roles/desk-nextcloud/tasks/main.yml
+++ b/roles/desk-nextcloud/tasks/main.yml
@@ -7,8 +7,8 @@
   ansible.builtin.file:
     src: "{{nextcloud_cloud_directory}}{{item}}"
     dest: "{{nextcloud_user_home_directory}}{{item}}"
-    owner: "{{users.client.username}}"
-    group: "{{users.client.username}}"
+    owner: "{{ users[desktop_username].username }}"
+    group: "{{ users[desktop_username].username }}"
     state: link
     force: yes
   ignore_errors: true # Just temporary @todo remove
@@ -29,6 +29,6 @@
   ansible.builtin.file:
     src: "{{nextcloud_cloud_directory}}InstantUpload"
     dest: "{{nextcloud_user_home_directory}}Dump"
-    owner: "{{users.client.username}}"
-    group: "{{users.client.username}}"
+    owner: "{{ users[desktop_username].username }}"
+    group: "{{ users[desktop_username].username }}"
     state: link
\ No newline at end of file
diff --git a/roles/desk-nextcloud/vars/main.yml b/roles/desk-nextcloud/vars/main.yml
index 3ec51eac..a573fba0 100644
--- a/roles/desk-nextcloud/vars/main.yml
+++ b/roles/desk-nextcloud/vars/main.yml
@@ -1,4 +1,4 @@
 application_id:                 desk-nextcloud
-nextcloud_user_home_directory:  "/home/{{users.client.username}}/"
+nextcloud_user_home_directory:  "/home/{{ users[desktop_username].username }}/"
 nextcloud_cloud_fqdn:           "{{ applications | get_app_conf(application_id, 'cloud_fqdn') }}"
-nextcloud_cloud_directory:      '{{nextcloud_user_home_directory}}Clouds/{{nextcloud_cloud_fqdn}}/{{users.client.username}}/'
+nextcloud_cloud_directory:      '{{nextcloud_user_home_directory}}Clouds/{{nextcloud_cloud_fqdn}}/{{ users[desktop_username].username }}/'
diff --git a/roles/util-desk-dev-arduino/tasks/main.yml b/roles/util-desk-dev-arduino/tasks/main.yml
index 1d52b6bb..779786e3 100644
--- a/roles/util-desk-dev-arduino/tasks/main.yml
+++ b/roles/util-desk-dev-arduino/tasks/main.yml
@@ -5,7 +5,7 @@
       - arduino-docs
     state: present
 
-- name: Adding user {{users.client.username}} to relevant arduino usergroups  
-  user: name={{users.client.username}}
+- name: Adding user {{ users[desktop_username].username }} to relevant arduino usergroups  
+  user: name={{ users[desktop_username].username }}
         groups=uucp lock
         append=yes