Refactoring fact files.

facts/system.yml

@@ -3,6 +3,7 @@
 
 - name: Set Pop!_OS FS Names
   ansible.builtin.set_fact:
+    flatpak_distro: yes
     lynis_install_dir: /usr/local/lynis
     lynis_report: /home/ling/lynis.log
     sudoers_install_dir: /etc/sudoers.d/ansible
@@ -12,6 +13,7 @@
 # TODO Needs tested
 - name: Set Ubuntu FS Names
   ansible.builtin.set_fact:
+    flatpak_distro: yes
     lynis_install_dir: /usr/local/lynis
     lynis_report: /root/lynis.log
     sudoers_install_dir: /etc/sudoers.d/ansible
@@ -20,6 +22,7 @@
 
 - name: Set FreeBSD FS Names
   ansible.builtin.set_fact:
+    flatpak_distro: no
     lynis_install_dir: /usr/local/lynis
     lynis_report: /root/lynis.log
     sudoers_install_dir: /usr/local/etc/sudoers.d/ansible

local.yml

@@ -8,10 +8,10 @@
   become: true  
 
   pre_tasks:
-    - include: facts/filesystem_names.yml
-    - include: facts/package_names.yml
-    - include: facts/service_names.yml
-    - include: facts/user_names.yml
+    - include: facts/system.yml
+    - include: facts/package.yml
+    - include: facts/service.yml
+    - include: facts/user.yml
 
   tasks:
     - include: tasks/packages.yml
@@ -30,6 +30,7 @@
   tasks:
     - include: tasks/flatpaks.yml
       when: ansible_distribution != "FreeBSD"
+        and "{{ flatpak_distro }} == yes"
 
 
 # FreeBSD Workstations