4 files changed, 28 insertions, 13 deletions
diff --git a/src/packages/tasks/dnf.yaml b/src/packages/tasks/dnf.yaml
new file mode 100644
index 0000000..e8748ae
--- /dev/null
+++ b/src/packages/tasks/dnf.yaml
@@ -0,0 +1,6 @@
+---
+- name: "Install {{ item }}"
+  ansible.builtin.dnf:
+    name: "{{ item }}"
+    state: latest
+  ignore_errors: true
diff --git a/src/packages/tasks/flatpak.yaml b/src/packages/tasks/flatpak.yaml
new file mode 100644
index 0000000..d24fbfa
--- /dev/null
+++ b/src/packages/tasks/flatpak.yaml
@@ -0,0 +1,5 @@
+- name: "Install {{ item }}"
+  community.general.flatpak:
+    name: "{{ item }}"
+    state: present 
+  ignore_errors: true
diff --git a/src/packages/tasks/main.yaml b/src/packages/tasks/main.yaml
index 2d8cc51..55e266d 100644
--- a/src/packages/tasks/main.yaml
+++ b/src/packages/tasks/main.yaml
@@ -12,19 +12,12 @@
       group: root
       mode: '0644'
 
-- name: Installing DNF Packages
-  ansible.builtin.dnf:
-    name: "{{ packages[item].dnf }}"
-    state: latest
-  ignore_errors: true
-  loop: "{{ packages }}"
-
 - name: Setup Flathub
   ansible.builtin.shell: 'flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo'
 
-- name: Installing Flatpaks
-  community.general.flatpak:
-    name: "{{ packages[item].flatpak }}"
-    state: present 
-  ignore_errors: true
-  loop: "{{ packages }}"
+- name: "Install Package Group: {{ group }}"
+  ansible.builtin.include_tasks: package.yaml
+  loop: "{{ package_groups }}"
+  loop_control:
+    loop_var: "group"
+
diff --git a/src/packages/tasks/package.yaml b/src/packages/tasks/package.yaml
new file mode 100644
index 0000000..7c29440
--- /dev/null
+++ b/src/packages/tasks/package.yaml
@@ -0,0 +1,11 @@
+---
+- name: Installing DNF Packages
+  ansible.builtin.include_tasks: dnf.yaml
+  loop: "{{ packages[group].dnf }}"
+
+- name: Installing Flatpak
+  ansible.builtin.include_tasks: flatpak.yaml
+  loop: "{{ packages[group].flatpak }}"
+
+
+