Refactor playbook to simplify package installs for different OSs

3 files changed, 6 insertions, 15 deletions

diff --git a/roles/user/tasks/install-archlinux.yml b/roles/user/tasks/install-archlinux.yml
deleted file mode 100644
index 9bb06e00..00000000
--- a/roles/user/tasks/install-archlinux.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: "Ensure sudo installed"
-  become: true
-  community.general.pacman:
-    name: "sudo"
-    state: "present"
diff --git a/roles/user/tasks/install-debian.yml b/roles/user/tasks/install-debian.yml
deleted file mode 100644
index 3d731944..00000000
--- a/roles/user/tasks/install-debian.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: "Ensure sudo installed"
-  become: true
-  ansible.builtin.apt:
-    name: "sudo"
-    state: "present"
diff --git a/roles/user/tasks/main.yml b/roles/user/tasks/main.yml
index 71deaeed..76146491 100644
--- a/roles/user/tasks/main.yml
+++ b/roles/user/tasks/main.yml
@@ -1,6 +1,9 @@
 ---
-- name: "Install OS-specific packages"
-  ansible.builtin.include_tasks: "install-{{ ansible_os_family | lower }}.yml"
+- name: "Ensure sudo installed"
+  become: true
+  ansible.builtin.package:
+    name: "sudo"
+    state: "present"
 
 - name: "Set sudo group fact"
   ansible.builtin.set_fact:
@@ -28,8 +31,8 @@
     state: "present"
   with_items: "{{ user_groups }}"
 
-# noqa var-naming[no-role-prefix] username is more understandable than user_name
 - name: "Create user: {{ username }}"
+  # noqa var-naming[no-role-prefix] username is more understandable than user_name
   become: true
   ansible.builtin.user:
     name: "{{ username }}"