change layout for better management

- instead of just `syspkgs` and `srcpkgs` add more lists
  - `appimages`, `flatpkgs` and others as they come up

tasks/main.yml

@@ -1,64 +1,45 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: generate package installation lists
+- name: Determine OS and set facts for it
+  block:
+    - name: Set macOS facts
+      when: ansible_os_family == 'Darwin'
+      ansible.builtin.set_fact:
+        syspkg_become: false
+
+    - name: Set Linux facts
+      when: ansible_system == 'Linux'
+      ansible.builtin.set_fact:
+        syspkg_become: true
+
+- name: Generate package installation lists
   ansible.builtin.include_tasks:
     file: addpkg.yml
   loop: "{{ packages | unique }}"
   loop_control:
     loop_var: pkg
 
-- name: redhat based OS
-  block:
-    - name: upgrade dnf packages
-      ansible.builtin.dnf:
-        name: "*"
-        state: latest
-      become: true
-      when: full_upgrade
+- name: Install syspkgs list
+  become: "{{ syspkg_become }}"
+  ansible.builtin.package:
+    name: "{{ syspkgs | unique }}"
+    state: present
 
-    - name: install dnf packages
-      ansible.builtin.dnf:
-        name: "{{ syspkgs | unique }}"
-        state: "{{ install_state }}"
-      become: true
-      when:
-        - syspkgs|length > 0
-
-    - name: add flatpak repos
-      community.general.flatpak_remote:
-        enabled: true
-        flatpakrepo_url: "{{ repo.url }}"
-        method: system
-        name: "{{ repo.name }}"
-        state: present
-      loop: "{{ flatpkg_repo }}"
-      loop_control:
-        loop_var: repo
-      become: true
-      when:
-        - flatpkg_repo|length > 0
-        - flatpkgs|length > 0
-
-    - name: install flatpaks
-      community.general.flatpak:
-        method: "system"
-        name: "{{ flatpkgs }}"
-        state: latest
-      become: true
-      when:
-        - flatpkgs|length > 0
+- name: Redhat based OS
   when: ansible_os_family == 'RedHat'
-
-- name: debian based OS
   block:
-    - name: upgrade apt packages
-      ansible.builtin.apt:
-        name: "*"
-        state: latest
+    - name: Install dnf packages
       become: true
-      when: full_upgrade
+      when:
+        - syspkgs|length > 0
+      ansible.builtin.dnf:
+        name: "{{ syspkgs | unique }}"
+        state: present
 
-    - name: install apt packages
+- name: Debian based OS
+  when: ansible_os_family == 'Debian'
+  block:
+    - name: Install apt packages
       ansible.builtin.apt:
         name: "{{ syspkgs | unique }}"
         state: "{{ install_state }}"
@@ -66,66 +47,75 @@
       when:
         - syspkgs|length > 0
 
-    - name: add flatpak repos
-      community.general.flatpak_remote:
-        enabled: true
-        flatpakrepo_url: "{{ repo.url }}"
-        method: system
-        name: "{{ repo.name }}"
-        state: present
-      loop: "{{ flatpkg_repo | unique }}"
-      loop_control:
-        loop_var: repo
-      become: true
-      when:
-        - flatpkg_repo|length > 0
-        - flatpkgs|length > 0
-
-    - name: install flatpaks
-      community.general.flatpak:
-        method: "system"
-        name: "{{ flatpkgs | unique }}"
-        state: latest
-      become: true
-      when:
-        - flatpkgs|length > 0
-  when: ansible_os_family == 'Debian'
-
-- name: darwin/macOS based OS
+- name: Darwin/macOS based OS
+  when: ansible_os_family == 'Darwin'
   block:
-    - name: upgrade homebrew packages
+    - name: Upgrade homebrew packages
       community.general.homebrew:
         name: "*"
         state: latest
       when: full_upgrade
 
-    - name: tap homebrew taps
+    - name: Tap homebrew taps
       community.general.homebrew_tap:
         name: "{{ brewtaps | unique }}"
         state: present
       when: brewtaps|length > 0
 
-    - name: install homebrew packages
+    - name: Install homebrew packages
       community.general.homebrew:
         name: "{{ syspkgs | unique }}"
         state: "{{ install_state }}"
       when: syspkgs|length > 0
 
-    - name: install homebrew casks
+    - name: Install homebrew casks
       community.general.homebrew_cask:
         name: "{{ caskpkgs | unique }}"
         state: "{{ install_state }}"
       when: caskpkgs|length > 0
 
-    - name: workaround to install homebrew taps
+    - name: Workaround to install homebrew taps
       ansible.builtin.command:
         cmd: "brew install {{ tappkg }}"
       loop: "{{ tappkgs | unique }}"
       loop_control:
         loop_var: tappkg
-  when: ansible_os_family == 'Darwin'
+      # TODO: fix the need to have this workaround
 
-- name: ensure /usr/local/bin exists
+- name: Install flatpaks on Linux Systems
+  when:
+    - ansible_system == 'Linux'
+    - flatpkgs|length > 0
+  block:
+    - name: Add flatpak repos
+      become: true
+      loop: "{{ fpremotes | unique }}"
+      loop_control:
+        loop_var: remote
+      when:
+        - fpremotes|length > 0
+        - flatpkgs|length > 0
+      community.general.flatpak_remote:
+        enabled: true
+        method: system
+        state: present
+        flatpakrepo_url: "{{ remote.url }}"
+        name: "{{ remote.name }}"
+
+    - name: Install flatpaks
+      become: true
+      loop: "{{ flatpkgs | unique }}"
+      loop_control:
+        loop_var: flatpkg
+      when:
+        - flatpkgs|length > 0
+      community.general.flatpak:
+        state: latest
+        method: system
+        name: "{{ flatpkg.name }}"
+        remote: "{{ flatpkg.remote | default('flathub') }}"
+
+- name: Ensure /usr/local/bin exists
   ansible.builtin.file:
     state: directory
     path: /usr/local/bin
@@ -133,7 +123,7 @@
     mode: '0755'
   become: true
 
-- name: install srcpkgs
+- name: Install srcpkgs
   ansible.builtin.include_tasks:
     file: "build/{{ srcpkg }}.yml"
   loop: "{{ srcpkgs | unique }}"
@@ -141,11 +131,11 @@
     loop_var: srcpkg
   when: srcpkgs|length > 0
 
-- name: install cargo packages at specific version
+- name: Install cargo packages at specific version
   community.general.cargo:
     name: "{{ cargopkg.name }}"
     version: "{{ cargopkg.version }}"
-    path: "{{ cargopkg.path | default(default_config.install_prefix) }}"
+    path: "{{ cargopkg.path | default(default_install_prefix) }}"
     locked: "{{ cargopkg.locked | default(false) }}"
   become: true
   when: cargoversioned|length > 0
@@ -164,32 +154,33 @@
     loop_var: cargopkg
 
 - name: Install local go packages
+  loop: "{{ gopkgs | unique }}"
+  loop_control:
+    loop_var: gopkg
+  when: gopkgs|length > 0
   environment:
     GOROOT: /usr/local/go
     PATH: /usr/local/go/bin:$PATH
   ansible.builtin.command:
     cmd: "go install {{ gopkg }}"
-  loop: "{{ gopkgs | unique }}"
-  loop_control:
-    loop_var: gopkg
-  when: gopkgs|length > 0
+  #TODO: figure out how to check if the gopkg is already installed
 
 - name: Install local npm packages
-  community.general.npm:
-    global: true
-    name: "{{ npmpkg }}"
-    state: latest
   loop: "{{ npmpkgs | unique }}"
   loop_control:
     loop_var: npmpkg
   when: npmpkgs|length > 0
+  community.general.npm:
+    global: true
+    name: "{{ npmpkg }}"
+    state: latest
 
 - name: Install python pipx packages for user
-  community.general.pipx:
-    executable: "{% if ansible_os_family == 'Darwin' %}/opt/homebrew/bin/pipx{% else %}/usr/bin/pipx{% endif %}"
-    name: "{{ pipxpkg }}"
-    state: latest
   loop: "{{ pipxpkgs | unique }}"
   loop_control:
     loop_var: pipxpkg
   when: pipxpkgs|length > 0
+  community.general.pipx:
+    executable: "{% if ansible_os_family == 'Darwin' %}/opt/homebrew/bin/pipx{% else %}/usr/bin/pipx{% endif %}"
+    name: "{{ pipxpkg }}"
+    state: latest