From af5afd83c6c374fc53938c13fa9e3c29890cd0be Mon Sep 17 00:00:00 2001
From: SebClem <seb6596@gmail.com>
Date: Sun, 20 Nov 2022 18:59:29 +0100
Subject: [PATCH] Change users to antidote_users

---
 defaults/main.yml   | 2 +-
 tasks/configure.yml | 9 +++++----
 tasks/install.yml   | 5 ++---
 tests/test.yml      | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3870c02..ea13792 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,4 +4,4 @@
 antidote_version: "1.6.4"
 antidote_mirror: "https://github.com/mattmc3/antidote/archive/refs/tags/"
 antidote_download_dir: "{{ x_ansible_download_dir | default(ansible_env.HOME + '/.ansible/tmp/downloads') }}"
-users: []
+antidote_users: []
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 0d96ecd..5467ea9 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -5,7 +5,7 @@
     name: "{{ user.username }}"
     shell: /bin/zsh
   when: user.antidote_plugins is defined
-  loop: "{{ users }}"
+  loop: "{{ antidote_users }}"
   loop_control:
     loop_var: user
     label: "{{ user.username }}"
@@ -18,7 +18,7 @@
     dest: "~{{ user.username }}/.antidoterc"
     mode: "u=rw,go=r"
   when: user.antidote_plugins is defined
-  loop: "{{ users }}"
+  loop: "{{ antidote_users }}"
   loop_control:
     loop_var: user
     label: "{{ user.username }}"
@@ -31,7 +31,7 @@
     dest: "~{{ user.username }}/.zsh_plugins.txt"
     mode: "u=rw,go=r"
   when: user.antidote_plugins is defined
-  loop: "{{ users }}"
+  loop: "{{ antidote_users }}"
   loop_control:
     loop_var: user
     label: "{{ user.username }}"
@@ -42,10 +42,11 @@
   lineinfile:
     path: "~/.zshrc"
     line: "source ~/.antidoterc"
+    insertbefore: "source ~/.ansible_zshrc"
     create: yes
     mode: "u=rw,go=r"
   when: user.antidote_plugins is defined
-  loop: "{{ users }}"
+  loop: "{{ antidote_users }}"
   loop_control:
     loop_var: user
     label: "{{ user.username }}"
diff --git a/tasks/install.yml b/tasks/install.yml
index 0ee46cd..3b21041 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -28,7 +28,7 @@
     path: "~{{ username }}/.antidote"
     state: directory
     mode: "u=rwx,go=rx"
-  loop: "{{ users | map(attribute='username') | list }}"
+  loop: "{{ antidote_users | map(attribute='username') | list }}"
   loop_control:
     loop_var: username
 
@@ -40,9 +40,8 @@
     dest: "~{{ username }}/.antidote"
     extra_opts:
       - "--strip-components=1"
-    creates: "~{{ username }}/.antidote/antidote.zsh"
     owner: "{{ username }}"
     mode: "go-w"
-  loop: "{{ users | map(attribute='username') | list }}"
+  loop: "{{ antidote_users | map(attribute='username') | list }}"
   loop_control:
     loop_var: username
diff --git a/tests/test.yml b/tests/test.yml
index 895b456..26d86ab 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -3,7 +3,7 @@
   remote_user: root
   roles:
     - role: ansible-antidote-role
-      users:
+      antidote_users:
         - username: root
           antidote_plugins:
             - name: zsh-users/zsh-autosuggestions
@@ -12,5 +12,5 @@
               kind: defer
             - name: zsh-users/zsh-completions
             - name: ohmyzsh/ohmyzsh
-              path: lib/git.zsh
+              path: lib
             - name: romkatv/powerlevel10k