removed bool check

Signed-off-by: Matthew Stobbs <matthew.stobbs@ucalgary.ca>

tasks/config/cbfmt.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add cbfmt
-  when:
-    - cbfmt_configured is undefined
-  block:
-    - name: Load cbfmt configuration
-      ansible.builtin.include_tasks:
-        file: config/cbfmt.yml
+- name: Load cbfmt configuration
+  ansible.builtin.include_tasks:
+    file: config/cbfmt.yml
 
-    - name: Append cbfmt to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + cbfmt.pkgs }}"
-
-    - name: Set cbfmt_configured
-      ansible.builtin.set_fact:
-        cbfmt_configured: true
+- name: Append cbfmt to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + cbfmt.pkgs }}"

tasks/config/cmake-format.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add cmake-format
-  when:
-    - cmake_format_configured is undefined
-  block:
-    - name: Load cmake-format configuration
-      ansible.builtin.include_tasks:
-        file: config/cmake-format.yml
+- name: Load cmake-format configuration
+  ansible.builtin.include_tasks:
+    file: config/cmake-format.yml
 
-    - name: Append cmake-format to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + cmake_format.pkgs }}"
-
-    - name: Set cmake-format_configured
-      ansible.builtin.set_fact:
-        cmake_format_configured: true
+- name: Append cmake-format to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + cmake_format.pkgs }}"

tasks/pkgs/alacritty.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Append alacritty
-  when:
-    - alacritty_configured is undefined
   block:
     - name: Load alacritty configuration
       ansible.builtin.include_tasks:

tasks/pkgs/ansible-lint.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add ansible_lint
-  when:
-    - ansible_lint_configured is undefined
-  block:
-    - name: Append ansible-lint to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['ansible-lint'] }}"
-
-    - name: Set ansible_lint_configured
-      ansible.builtin.set_fact:
-        ansible_lint_configured: true
+- name: Append ansible-lint to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['ansible-lint'] }}"

tasks/pkgs/bat.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add bat
-  when:
-    - bat_configured is undefined
-  block:
-    - name: Append bat to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['bat'] }}"
-
-    - name: Set bat_configured
-      ansible.builtin.set_fact:
-        bat_configured: true
+- name: Append bat to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['bat'] }}"

tasks/pkgs/blender.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add blender
+- name: Append blender to pkg_sys
   when:
-    - blender_configured is undefined
-  block:
-    - name: Append blender to pkg_sys
-      when:
-        - ansible_system == 'Linux'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['blender'] }}"
+    - ansible_system == 'Linux'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['blender'] }}"
 
-    - name: Append blender to pkg_cask
-      when:
-        - ansible_system == 'Darwin'
-      ansible.builtin.set_fact:
-        pkg_cask: "{{ pkg_cask + ['blender'] }}"
-
-    - name: Set bitwarden_configured
-      ansible.builtin.set_fact:
-        bitwarden_configured: true
+- name: Append blender to pkg_cask
+  when:
+    - ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['blender'] }}"

tasks/pkgs/broot.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add broot
-  when:
-    - broot_configured is undefined
   block:
     - name: Load broot config
       ansible.builtin.include_tasks:

tasks/pkgs/btop.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add btop
-  when:
-    - btop_configured is undefined
-  block:
-    - name: Append btop to pkg_ssys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['btop'] }}"
-
-    - name: Set broot_configured
-      ansible.builtin.set_fact:
-        broot_configured: true
+- name: Append btop to pkg_ssys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['btop'] }}"

tasks/pkgs/carapace.yml

@@ -1,39 +1,31 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add carapace
+- name: Load carapace config
+  ansible.builtin.include_tasks:
+    file: config/carapace.yml
+
+- name: Enable carapace yum repository
   when:
-    - carapace_configured is undefined
-  block:
-    - name: Load carapace config
-      ansible.builtin.include_tasks:
-        file: config/carapace.yml
+    - ansible_os_family == 'RedHat'
+  become: true
+  ansible.builtin.yum_repository:
+    name: "{{ carapace.repo.name }}"
+    description: "{{ carapace.repo.description }}"
+    baseurl: "{{ carapace.repo.baseurl }}"
+    enabled: true
+    gpgcheck: false
+    state: present
 
-    - name: Enable carapace yum repository
-      when:
-        - ansible_os_family == 'RedHat'
-      become: true
-      ansible.builtin.yum_repository:
-        name: "{{ carapace.repo.name }}"
-        description: "{{ carapace.repo.description }}"
-        baseurl: "{{ carapace.repo.baseurl }}"
-        enabled: true
-        gpgcheck: false
-        state: present
+- name: Enable carapace apt repository
+  when:
+    - ansible_os_family == 'Debian'
+  become: true
+  ansible.builtin.apt_repository:
+    repo: "{{ carapace.repo.repo }}"
+    filename: "{{ carapace.repo.name }}"
+    state: present
+    update_cache: false
 
-    - name: Enable carapace apt repository
-      when:
-        - ansible_os_family == 'Debian'
-      become: true
-      ansible.builtin.apt_repository:
-        repo: "{{ carapace.repo.repo }}"
-        filename: "{{ carapace.repo.name }}"
-        state: present
-        update_cache: false
-
-    - name: Append carapace to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + carapace.pkgs }}"
-
-    - name: Set carapace_configured
-      ansible.builtin.set_fact:
-        carapace_configured: true
+- name: Append carapace to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + carapace.pkgs }}"

tasks/pkgs/choose.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add choose
-  when:
-    - choose_configured is undefined
   block:
     - name: Load choose config
       ansible.builtin.include_tasks:

tasks/pkgs/clangd.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add clangd
-  when:
-    - clangd_configured is undefined
-  block:
-    - name: Load clangd config
-      ansible.builtin.include_tasks:
-        file: config/clangd.yml
+- name: Load clangd config
+  ansible.builtin.include_tasks:
+    file: config/clangd.yml
 
-    - name: Append clangd to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + clangd.pkgs }}"
-
-    - name: Set clangd_configured
-      ansible.builtin.set_fact:
-        clangd_configured: true
+- name: Append clangd to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + clangd.pkgs }}"

tasks/pkgs/cmake.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add cmake
-  when:
-    - cmake_configured is undefined
-  block:
-    - name: Append cmake to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['cmake'] }}"
-
-    - name: Set cmake_configured
-      ansible.builtin.set_fact:
-        cmake_configured: true
+- name: Append cmake to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['cmake'] }}"

tasks/pkgs/cockpit.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add cockpit
-  when:
-    - cockpit_configured is undefined
-  block:
-    - name: Load cockpit configuration
-      ansible.builtin.include_tasks:
-        file: config/cockpit.yml
+- name: Load cockpit configuration
+  ansible.builtin.include_tasks:
+    file: config/cockpit.yml
 
-    - name: Append cockpit to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + cockpit.pkgs }}"
-
-    - name: Set cockpit_configured
-      ansible.builtin.set_fact:
-        cockpit_configured: true
+- name: Append cockpit to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + cockpit.pkgs }}"

tasks/pkgs/consul.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add consul
-  when:
-    - consul_configured is undefined
   block:
     - name: Load consul config
       ansible.builtin.include_tasks:

tasks/pkgs/direnv.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add direnv
-  when:
-    - direnv_configured is undefined
-  block:
-    - name: Append direnv to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['direnv'] }}"
-
-    - name: Set direnv_configured
-      ansible.builtin.set_fact:
-        direnv_configured: true
+- name: Append direnv to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['direnv'] }}"

tasks/pkgs/dust.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add dust
-  when:
-    - dust_configured is undefined
   block:
     - name: Append du-dust to pkg_cargo
       when:

tasks/pkgs/editorconfig.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add editorconfig
-  when:
-    - editorconfig_configured is undefined
-  block:
-    - name: Append editorconfig to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['editorconfig'] }}"
-
-    - name: Set editorconfig_configured
-      ansible.builtin.set_fact:
-        editorconfig_configured: true
+- name: Append editorconfig to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['editorconfig'] }}"

tasks/pkgs/fd.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add fd
-  when:
-    - fd_configured is undefined
-  block:
-    - name: Load fd config
-      ansible.builtin.include_tasks:
-        file: config/fd.yml
+- name: Load fd config
+  ansible.builtin.include_tasks:
+    file: config/fd.yml
 
-    - name: Append fd to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + fd.pkgs }}"
-
-    - name: Set fd_configured
-      ansible.builtin.set_fact:
-        fd_configured: true
+- name: Append fd to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + fd.pkgs }}"

tasks/pkgs/firefox.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add firefox
+- name: Append firefox to pkg_sys
   when:
-    - firefox_configured is undefined
-  block:
-    - name: Append firefox to pkg_sys
-      when:
-        - ansible_system == 'Linux'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['firefox'] }}"
+    - ansible_system == 'Linux'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['firefox'] }}"
 
-    - name: Append firefox to pkg_cask
-      when:
-        - ansible_system == 'Darwin'
-      ansible.builtin.set_fact:
-        pkg_cask: "{{ pkg_cask + ['firefox'] }}"
-
-    - name: Set firefox_configured
-      ansible.builtin.set_fact:
-        firefox_configured: true
+- name: Append firefox to pkg_cask
+  when:
+    - ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['firefox'] }}"

tasks/pkgs/firewalld.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add firewalld
-  when:
-    - firewalld_configured is undefined
-  block:
-    - name: Append firewalld to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['firewalld'] }}"
-
-    - name: Set firewalld_configured
-      ansible.builtin.set_fact:
-        firewalld_configured: true
+- name: Append firewalld to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['firewalld'] }}"

tasks/pkgs/flatpak.yml

@@ -1,15 +1,7 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add flatpak
+- name: Append flatpak to pkg_sys
   when:
-    - flatpak_configured is undefined
-  block:
-    - name: Append flatpak to pkg_sys
-      when:
-        - ansible_system == 'Linux'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['flatpak'] }}"
-
-    - name: Set flatpak_configured
-      ansible.builtin.set_fact:
-        flatpak_configured: true
+    - ansible_system == 'Linux'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['flatpak'] }}"

tasks/pkgs/fzf.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add cmake
-  when:
-    - cmake_configured is undefined
-  block:
-    - name: Append fzf to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['fzf'] }}"
-
-    - name: Set cmake_configured
-      ansible.builtin.set_fact:
-        cmake_configured: true
+- name: Append fzf to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['fzf'] }}"

tasks/pkgs/ghostty.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add ghostty
-  when:
-    - ghostty_configured is undefined
   block:
     - name: Load ghostty config
       ansible.builtin.include_tasks:

tasks/pkgs/git.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add git
-  when:
-    - git_configured is undefined
-  block:
-    - name: Load git config
-      ansible.builtin.include_tasks:
-        file: config/git.yml
+- name: Load git config
+  ansible.builtin.include_tasks:
+    file: config/git.yml
 
-    - name: Append git to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + git.pkgs }}"
-
-    - name: Set git_configured
-      ansible.builtin.set_fact:
-        git_configured: true
+- name: Append git to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + git.pkgs }}"

tasks/pkgs/go.yml

@@ -1,24 +1,16 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add go
+- name: Load go config
+  ansible.builtin.include_tasks:
+    file: config/go.yml
+
+- name: Append go to pkg_archive
   when:
-    - go_configured is undefined
-  block:
-    - name: Load go config
-      ansible.builtin.include_tasks:
-        file: config/go.yml
+    - go.method == 'archive'
+  ansible.builtin.set_fact:
+    pkg_archive: "{{ pkg_archive + ['go'] }}"
 
-    - name: Append go to pkg_archive
-      when:
-        - go.method == 'archive'
-      ansible.builtin.set_fact:
-        pkg_archive: "{{ pkg_archive + ['go'] }}"
-
-    - name: Append to pkg_sys
-        - go.method != 'archive'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['go'] }}"
-
-    - name: Set go_configured
-      ansible.builtin.set_fact:
-        go_configured: true
+- name: Append to pkg_sys
+    - go.method != 'archive'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['go'] }}"

tasks/pkgs/gping.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add gping
-  when:
-    - gping_configured is undefined
   block:
     - name: Append gping to pkg_sys
       when:

tasks/pkgs/greetd.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add greetd
-  when:
-    - greetd_configured is undefined
-  block:
-    - name: Load greetd config
-      ansible.builtin.include_tasks:
-        file: config/greetd.yml
+- name: Load greetd config
+  ansible.builtin.include_tasks:
+    file: config/greetd.yml
 
-    - name: Append greetd to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + greetd.pkgs }}"
-
-    - name: Set greetd_configured
-      ansible.builtin.set_fact:
-        greetd_configured: true
+- name: Append greetd to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + greetd.pkgs }}"

tasks/pkgs/hugo.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hugo
-  when:
-    - hugo_configured is undefined
-  block:
-    - name: Append hugo to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['hugo'] }}"
-
-    - name: Set hugo_configured
-      ansible.builtin.set_fact:
-        hugo_configured: true
+- name: Append hugo to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['hugo'] }}"

tasks/pkgs/hyperfine.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyperfine
-  when:
-    - hyperfine_configured is undefined
-  block:
-    - name: Append hyperfine to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['hyperfine'] }}"
-
-    - name: Set hyperfine_configured
-      ansible.builtin.set_fact:
-        hyperfine_configured: true
+- name: Append hyperfine to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['hyperfine'] }}"

tasks/pkgs/hyprcursor.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprcursor
-  when:
-    - hyprcursor_configured is undefined
-  block:
-    - name: Load hyprcursor config
-      ansible.builtin.include_tasks:
-        file: config/hyprcursor.yml
+- name: Load hyprcursor config
+  ansible.builtin.include_tasks:
+    file: config/hyprcursor.yml
 
-    - name: Append hyprcursor build deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprcursor.build_deps }}"
+- name: Append hyprcursor build deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprcursor.build_deps }}"
 
-    - name: Append hyprcursor to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprcursor'] }}"
-
-    - name: Set hyprcursor_configured
-      ansible.builtin.set_fact:
-        hyprcursor_configured: true
+- name: Append hyprcursor to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprcursor'] }}"

tasks/pkgs/hyprgraphics.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprgraphics
-  when:
-    - hyprgraphics_configured is undefined
-  block:
-    - name: Load hyprgraphics config
-      ansible.builtin.include_tasks:
-        file: config/hyprgraphics.yml
+- name: Load hyprgraphics config
+  ansible.builtin.include_tasks:
+    file: config/hyprgraphics.yml
 
-    - name: Append hyprgraphics build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprgraphics.build_deps }}"
+- name: Append hyprgraphics build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprgraphics.build_deps }}"
 
-    - name: Append hyprcursor to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprgraphics'] }}"
-
-    - name: Set hyprgraphics_configured
-      ansible.builtin.set_fact:
-        hyprgraphics_configured: true
+- name: Append hyprcursor to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprgraphics'] }}"

tasks/pkgs/hypridle.yml

@@ -1,30 +1,22 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hypridle
-  when:
-    - hypridle_configured is undefined
-  block:
-    - name: Load hypridle config
-      ansible.builtin.include_tasks:
-        file: config/hypridle.yml
+- name: Load hypridle config
+  ansible.builtin.include_tasks:
+    file: config/hypridle.yml
 
-    - name: Append hypridle pkg_deps
-      loop: "{{ hypridle.pkg_deps }}"
-      loop_control:
-        loop_var: hypridle_pkg_dep
-      vars:
-        pkg: "{{ hypridle_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ hypridle_pkg_dep }}.yml"
+- name: Append hypridle pkg_deps
+  loop: "{{ hypridle.pkg_deps }}"
+  loop_control:
+    loop_var: hypridle_pkg_dep
+  vars:
+    pkg: "{{ hypridle_pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: "pkgs/{{ hypridle_pkg_dep }}.yml"
 
-    - name: Append hypridle build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hypridle.build_deps }}"
+- name: Append hypridle build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hypridle.build_deps }}"
 
-    - name: Append hypridle to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hypridle'] }}"
-
-    - name: Set hypridle_configured
-      ansible.builtin.set_fact:
-        hypridle_configured: true
+- name: Append hypridle to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hypridle'] }}"

tasks/pkgs/hyprland.yml

@@ -1,30 +1,22 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprland
-  when:
-    - hyprland_configured is undefined
-  block:
-    - name: Load hyprland config
-      ansible.builtin.include_tasks:
-        file: config/hyprland.yml
+- name: Load hyprland config
+  ansible.builtin.include_tasks:
+    file: config/hyprland.yml
 
-    - name: Append hyprland pkg_deps
-      loop: "{{ hyprland.pkg_deps }}"
-      loop_control:
-        loop_var: hyprland_pkg_dep
-      vars:
-        pkg: "{{ hyprland_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ hyprland_pkg_dep }}.yml"
+- name: Append hyprland pkg_deps
+  loop: "{{ hyprland.pkg_deps }}"
+  loop_control:
+    loop_var: hyprland_pkg_dep
+  vars:
+    pkg: "{{ hyprland_pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: "pkgs/{{ hyprland_pkg_dep }}.yml"
 
-    - name: Append hyprland build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprland.build_deps }}"
+- name: Append hyprland build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprland.build_deps }}"
 
-    - name: Append hyprland to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprland'] }}"
-
-    - name: Set hyprland_configured
-      ansible.builtin.set_fact:
-        hyprland_configured: true
+- name: Append hyprland to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprland'] }}"

tasks/pkgs/hyprland_protocols.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprland-protocols
-  when:
-    - hyprland_protcols_configured is undefined
-  block:
-    - name: Load hyprland-protocols config
-      ansible.builtin.include_tasks:
-        file: config/hyprland_protocols.yml
+- name: Load hyprland-protocols config
+  ansible.builtin.include_tasks:
+    file: config/hyprland_protocols.yml
 
-    - name: Append hyprland-protocols build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprland_protocols.build_deps }}"
+- name: Append hyprland-protocols build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprland_protocols.build_deps }}"
 
-    - name: Append hyprland-protocols to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprland_protocols'] }}"
-
-    - name: Set hyprland_protcols_configured
-      ansible.builtin.set_fact:
-        hyprland_protcols_configured: true
+- name: Append hyprland-protocols to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprland_protocols'] }}"

tasks/pkgs/hyprland_qt_support.yml

@@ -1,30 +1,22 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprland_qt_support
-  when:
-    - hyprland_qt_support_configured is undefined
-  block:
-    - name: Load hyprland_qt_support config
-      ansible.builtin.include_tasks:
-        file: config/hyprland_qt_support.yml
+- name: Load hyprland_qt_support config
+  ansible.builtin.include_tasks:
+    file: config/hyprland_qt_support.yml
 
-    - name: Append hyprland_qt_support pkg_deps
-      loop: "{{ hyprland_qt_support.pkg_deps }}"
-      loop_control:
-        loop_var: hyprland_qt_support_pkg_dep
-      vars:
-        pkg: "{{ hyprland_qt_support_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ hyprland_qt_support_pkg_dep }}.yml"
+- name: Append hyprland_qt_support pkg_deps
+  loop: "{{ hyprland_qt_support.pkg_deps }}"
+  loop_control:
+    loop_var: hyprland_qt_support_pkg_dep
+  vars:
+    pkg: "{{ hyprland_qt_support_pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: "pkgs/{{ hyprland_qt_support_pkg_dep }}.yml"
 
-    - name: Append hyprland_qt_support build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprland_qt_support.build_deps }}"
+- name: Append hyprland_qt_support build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprland_qt_support.build_deps }}"
 
-    - name: Append hyprland_qt_support to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprland_qt_support'] }}"
-
-    - name: Set hyprland_qt_support_configured
-      ansible.builtin.set_fact:
-        hyprland_qt_support_configured: true
+- name: Append hyprland_qt_support to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprland_qt_support'] }}"

tasks/pkgs/hyprland_qtutils.yml

@@ -1,30 +1,22 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprland_qtutils
-  when:
-    - hyprland_qtutils_configured is undefined
-  block:
-    - name: Load hyprland_qtutils config
-      ansible.builtin.include_tasks:
-        file: config/hyprland_qtutils.yml
+- name: Load hyprland_qtutils config
+  ansible.builtin.include_tasks:
+    file: config/hyprland_qtutils.yml
 
-    - name: Append hyprland_qtutils pkg_deps
-      loop: "{{ hyprland_qtutils.pkg_deps }}"
-      loop_control:
-        loop_var: hyprland_qtutils_pkg_dep
-      vars:
-        pkg: "{{ hyprland_qtutils_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ hyprland_qtutils_pkg_dep }}.yml"
+- name: Append hyprland_qtutils pkg_deps
+  loop: "{{ hyprland_qtutils.pkg_deps }}"
+  loop_control:
+    loop_var: hyprland_qtutils_pkg_dep
+  vars:
+    pkg: "{{ hyprland_qtutils_pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: "pkgs/{{ hyprland_qtutils_pkg_dep }}.yml"
 
-    - name: Append hyprland_qtutils build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprland_qtutils.build_deps }}"
+- name: Append hyprland_qtutils build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprland_qtutils.build_deps }}"
 
-    - name: Append hyprland_qtutils to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprland_qtutils'] }}"
-
-    - name: Set hyprland_qtutils_configured
-      ansible.builtin.set_fact:
-        hyprland_qtutils_configured: true
+- name: Append hyprland_qtutils to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprland_qtutils'] }}"

tasks/pkgs/hyprlang.yml

@@ -1,30 +1,22 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprlang
-  when:
-    - hyprlang_configured is undefined
-  block:
-    - name: Load hyprlang config
-      ansible.builtin.include_tasks:
-        file: config/hyprlang.yml
+- name: Load hyprlang config
+  ansible.builtin.include_tasks:
+    file: config/hyprlang.yml
 
-    - name: Append hyprland pkg_deps
-      loop: "{{ hyprlang.pkg_deps }}"
-      loop_control:
-        loop_var: hyprlang_pkg_dep
-      vars:
-        pkg: "{{ hyprlang_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ hyprlang_pkg_dep }}.yml"
+- name: Append hyprland pkg_deps
+  loop: "{{ hyprlang.pkg_deps }}"
+  loop_control:
+    loop_var: hyprlang_pkg_dep
+  vars:
+    pkg: "{{ hyprlang_pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: "pkgs/{{ hyprlang_pkg_dep }}.yml"
 
-    - name: Append hyprlang build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprlang.build_deps }}"
+- name: Append hyprlang build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprlang.build_deps }}"
 
-    - name: Append hyprlang to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprlang'] }}"
-
-    - name: Set hyprlang_configured
-      ansible.builtin.set_fact:
-        hyprlang_configured: true
+- name: Append hyprlang to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprlang'] }}"

tasks/pkgs/hyprlock.yml

@@ -1,30 +1,22 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprlock
-  when:
-    - hyprlock_configured is undefined
-  block:
-    - name: Load hyprlock config
-      ansible.builtin.include_tasks:
-        file: config/hyprlock.yml
+- name: Load hyprlock config
+  ansible.builtin.include_tasks:
+    file: config/hyprlock.yml
 
-    - name: Append hyprlock pkg_deps
-      loop: "{{ hyprlock.pkg_deps }}"
-      loop_control:
-        loop_var: hyprlock_pkg_dep
-      vars:
-        pkg: "{{ hyprlock_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ hyprlock_pkg_dep }}.yml"
+- name: Append hyprlock pkg_deps
+  loop: "{{ hyprlock.pkg_deps }}"
+  loop_control:
+    loop_var: hyprlock_pkg_dep
+  vars:
+    pkg: "{{ hyprlock_pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: "pkgs/{{ hyprlock_pkg_dep }}.yml"
 
-    - name: Append hyprlock build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprlock.build_deps }}"
+- name: Append hyprlock build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprlock.build_deps }}"
 
-    - name: Append hyprlock to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprlock'] }}"
-
-    - name: Set hyprlock_configured
-      ansible.builtin.set_fact:
-        hyprlock_configured: true
+- name: Append hyprlock to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprlock'] }}"

tasks/pkgs/hyprpaper.yml

@@ -1,30 +1,22 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprpaper
-  when:
-    - hyprpaper_configured is undefined
-  block:
-    - name: Load hyprpaper config
-      ansible.builtin.include_tasks:
-        file: config/hyprpaper.yml
+- name: Load hyprpaper config
+  ansible.builtin.include_tasks:
+    file: config/hyprpaper.yml
 
-    - name: Append hyprpaper pkg_deps
-      loop: "{{ hyprpaper.pkg_deps }}"
-      loop_control:
-        loop_var: hyprpaper_pkg_dep
-      vars:
-        pkg: "{{ hyprpaper_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ hyprpaper_pkg_dep }}.yml"
+- name: Append hyprpaper pkg_deps
+  loop: "{{ hyprpaper.pkg_deps }}"
+  loop_control:
+    loop_var: hyprpaper_pkg_dep
+  vars:
+    pkg: "{{ hyprpaper_pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: "pkgs/{{ hyprpaper_pkg_dep }}.yml"
 
-    - name: Append hyprpaper build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprpaper.build_deps }}"
+- name: Append hyprpaper build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprpaper.build_deps }}"
 
-    - name: Append hyprpaper to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprpaper'] }}"
-
-    - name: Set hyprpaper_configured
-      ansible.builtin.set_fact:
-        hyprpaper_configured: true
+- name: Append hyprpaper to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprpaper'] }}"

tasks/pkgs/hyprpicker.yml

@@ -1,30 +1,22 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprpicker
-  when:
-    - hyprpicker_configured is undefined
-  block:
-    - name: Load hyprpicker config
-      ansible.builtin.include_tasks:
-        file: config/hyprpicker.yml
+- name: Load hyprpicker config
+  ansible.builtin.include_tasks:
+    file: config/hyprpicker.yml
 
-    - name: Append hyprpicker pkg_deps
-      loop: "{{ hyprpicker.pkg_deps }}"
-      loop_control:
-        loop_var: hyprpicker_pkg_dep
-      vars:
-        pkg: "{{ hyprpicker_pkg_dep }}"
-      ansible.builtin.include_tasks:
-        file: "pkgs/{{ hyprpicker_pkg_dep }}.yml"
+- name: Append hyprpicker pkg_deps
+  loop: "{{ hyprpicker.pkg_deps }}"
+  loop_control:
+    loop_var: hyprpicker_pkg_dep
+  vars:
+    pkg: "{{ hyprpicker_pkg_dep }}"
+  ansible.builtin.include_tasks:
+    file: "pkgs/{{ hyprpicker_pkg_dep }}.yml"
 
-    - name: Append hyprpicker build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprpicker.build_deps }}"
+- name: Append hyprpicker build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprpicker.build_deps }}"
 
-    - name: Append hyprpicker to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprpicker'] }}"
-
-    - name: Set hyprpicker_configured
-      ansible.builtin.set_fact:
-        hyprpicker_configured: true
+- name: Append hyprpicker to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprpicker'] }}"

tasks/pkgs/hyprpolkitagent.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprpolkitagent
-  when:
-    - hyprpolkitagent_configured is undefined
-  block:
-    - name: Load hyprpolkitagent config
-      ansible.builtin.include_tasks:
-        file: config/hyprpolkitagent.yml
+- name: Load hyprpolkitagent config
+  ansible.builtin.include_tasks:
+    file: config/hyprpolkitagent.yml
 
-    - name: Append hyprpolkitagent build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprpolkitagent.build_deps }}"
+- name: Append hyprpolkitagent build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprpolkitagent.build_deps }}"
 
-    - name: Append hyprpolkitagent to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprpolkitagent'] }}"
-
-    - name: Set hyprpolkitagent_configured
-      ansible.builtin.set_fact:
-        hyprpolkitagent_configured: true
+- name: Append hyprpolkitagent to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprpolkitagent'] }}"

tasks/pkgs/hyprutils.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprutils
-  when:
-    - hyprutils_configured is undefined
-  block:
-    - name: Load hyprutils config
-      ansible.builtin.include_tasks:
-        file: config/hyprutils.yml
+- name: Load hyprutils config
+  ansible.builtin.include_tasks:
+    file: config/hyprutils.yml
 
-    - name: Append hyprutils build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprutils.build_deps }}"
+- name: Append hyprutils build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprutils.build_deps }}"
 
-    - name: Append hyprutils to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprutils'] }}"
-
-    - name: Set hyprutils_configured
-      ansible.builtin.set_fact:
-        hyprutils_configured: true
+- name: Append hyprutils to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprutils'] }}"

tasks/pkgs/hyprwayland_scanner.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add hyprwayland-scanner
-  when:
-    - hyprwayland_scanner_configured is undefined
-  block:
-    - name: Load hyprwayland-scanner config
-      ansible.builtin.include_tasks:
-        file: config/hyprwayland_scanner.yml
+- name: Load hyprwayland-scanner config
+  ansible.builtin.include_tasks:
+    file: config/hyprwayland_scanner.yml
 
-    - name: Append hyprwayland-scanner build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + hyprwayland_scanner.build_deps }}"
+- name: Append hyprwayland-scanner build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + hyprwayland_scanner.build_deps }}"
 
-    - name: Append hyprwayland-scanner to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['hyprwayland_scanner'] }}"
-
-    - name: Set hyprwayland_scanner_configured
-      ansible.builtin.set_fact:
-        hyprwayland_scanner_configured: true
+- name: Append hyprwayland-scanner to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['hyprwayland_scanner'] }}"

tasks/pkgs/jq.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add jq
-  when:
-    - jq_configured is undefined
-  block:
-    - name: Append jq to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['jq'] }}"
-
-    - name: Set jq_configured
-      ansible.builtin.set_fact:
-        jq_configured: true
+- name: Append jq to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['jq'] }}"

tasks/pkgs/kitty.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add kitty
-  when:
-    - kitty_configured is undefined
-  block:
-    - name: Load kitty config
-      ansible.builtin.include_tasks:
-        file: config/kitty.yml
+- name: Load kitty config
+  ansible.builtin.include_tasks:
+    file: config/kitty.yml
 
-    - name: Append kitty to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + kitty.pkgs }}"
-
-    - name: Set kitty_configured
-      ansible.builtin.set_fact:
-        kitty_configured: true
+- name: Append kitty to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + kitty.pkgs }}"

tasks/pkgs/libreoffice.yml

@@ -1,31 +1,23 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add libreoffice
+- name: Load libreoffice config
+  ansible.builtin.include_tasks:
+    file: config/libreoffice.yml
+
+- name: Append libreoffice to pkg_flatpak
   when:
-    - libreoffice_configured is undefined
-  block:
-    - name: Load libreoffice config
-      ansible.builtin.include_tasks:
-        file: config/libreoffice.yml
+    - libreoffice.method == 'flatpak'
+  ansible.builtin.set_fact:
+    pkg_flatpak: "{{ pkg_flatpak + [libreoffice.flatpak] }}"
 
-    - name: Append libreoffice to pkg_flatpak
-      when:
-        - libreoffice.method == 'flatpak'
-      ansible.builtin.set_fact:
-        pkg_flatpak: "{{ pkg_flatpak + [libreoffice.flatpak] }}"
+- name: Append libreoffice to pkg_sys
+  when:
+    - libreoffice.method == 'sys'
+  ansible.builtin.set_fact:
+    sys_pkg: "{{ sys_pkg + libreoffice.pkgs }}"
 
-    - name: Append libreoffice to pkg_sys
-      when:
-        - libreoffice.method == 'sys'
-      ansible.builtin.set_fact:
-        sys_pkg: "{{ sys_pkg + libreoffice.pkgs }}"
-
-    - name: Append libreoffice to caskpkgs
-      when:
-        - libreoffice.method == 'cask'
-      ansible.builtin.set_fact:
-        pkg_cask: "{{ pkg_cask + libreoffice.pkgs }}"
-
-    - name: Set libreoffice_configured
-      ansible.builtin.set_fact:
-        libreoffice_configured: true
+- name: Append libreoffice to caskpkgs
+  when:
+    - libreoffice.method == 'cask'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + libreoffice.pkgs }}"

tasks/pkgs/luals.yml

@@ -1,25 +1,17 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add luals
+- name: Load luals config
+  ansible.builtin.include_tasks:
+    file: config/luals.yml
+
+- name: Append luals to pkg_archive
   when:
-    - luals_configured is undefined
-  block:
-    - name: Load luals config
-      ansible.builtin.include_tasks:
-        file: config/luals.yml
+    - ansible_system == 'Linux'
+  ansible.builtin.set_fact:
+    pkg_archive: "{{ pkg_archive + ['luals'] }}"
 
-    - name: Append luals to pkg_archive
-      when:
-        - ansible_system == 'Linux'
-      ansible.builtin.set_fact:
-        pkg_archive: "{{ pkg_archive + ['luals'] }}"
-
-    - name: Append lua-language-server to pkg_sys
-      when:
-        - ansible_system == 'Darwin'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['lua-language-server'] }}"
-
-    - name: Set luals_configured
-      ansible.builtin.set_fact:
-        luals_configured: true
+- name: Append lua-language-server to pkg_sys
+  when:
+    - ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['lua-language-server'] }}"

tasks/pkgs/mcfly.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add mcfly
-  when:
-    - mcfly_configured is undefined
   block:
     - name: Append mcfly to pkg_sys
       when:

tasks/pkgs/neovide.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add neovide
-  when:
-    - neovide_configured is undefined
   block:
     - name: Load neovide config
       ansible.builtin.include_tasks:

tasks/pkgs/neovim.yml

@@ -1,32 +1,24 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add neovim
+- name: Load neovim config
+  ansible.builtin.include_tasks:
+    file: config/neovim.yml
+
+- name: Append neovim to pkg_appimage
   when:
-    - neovim_configured is undefined
-  block:
-    - name: Load neovim config
-      ansible.builtin.include_tasks:
-        file: config/neovim.yml
+    - neovim.method == 'appimage'
+  ansible.builtin.set_fact:
+    pkg_appimage: "{{ pkg_appimage + ['neovim'] }}"
 
-    - name: Append neovim to pkg_appimage
-      when:
-        - neovim.method == 'appimage'
-      ansible.builtin.set_fact:
-        pkg_appimage: "{{ pkg_appimage + ['neovim'] }}"
+- name: Append neovim to pkg_sys
+  when:
+    - neovim.method == 'sys'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['neovim'] }}"
 
-    - name: Append neovim to pkg_sys
-      when:
-        - neovim.method == 'sys'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['neovim'] }}"
-
-    - name: Append neovim to pkg_src
-      when:
-        - neovim.method == 'src'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + neovim.build_deps }}"
-        pkg_src: "{{ pkg_src + ['neovim'] }}"
-
-    - name: Set neovim_configured
-      ansible.builtin.set_fact:
-        neovim_configured: true
+- name: Append neovim to pkg_src
+  when:
+    - neovim.method == 'src'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + neovim.build_deps }}"
+    pkg_src: "{{ pkg_src + ['neovim'] }}"

tasks/pkgs/nextcloud.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add nextcloud_client
-  when:
-    - nextcloud_client_configured is undefined
   block:
     - name: Load nextcloud-client config
       ansible.builtin.include_tasks:

tasks/pkgs/nfs_client.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add nfs_server
-  when:
-    - nfs_server_configured is undefined
-  block:
-    - name: Append nfs_server to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + nfs_client.pkgs }}"
-
-    - name: Set nfs_server_configured
-      ansible.builtin.set_fact:
-        nfs_server_configured: true
+- name: Append nfs_server to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + nfs_client.pkgs }}"

tasks/pkgs/nfs_server.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add nfs_server
-  when:
-    - nfs_server_configured is undefined
-  block:
-    - name: Append nfs_server to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + nfs_server.pkgs }}"
-
-    - name: Set nfs_server_configured
-      ansible.builtin.set_fact:
-        nfs_server_configured: true
+- name: Append nfs_server to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + nfs_server.pkgs }}"

tasks/pkgs/nodejs.yml

@@ -1,9 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-# - name: Add nodejs
-#   when:
-#     - nodejs_configured is undefined
-#   block:
 - name: Load nodejs config
   ansible.builtin.include_tasks:
     file: config/nodejs.yml
@@ -11,7 +7,3 @@
 - name: Append nodejs to pkg_sys
   ansible.builtin.set_fact:
     pkg_sys: "{{ pkg_sys + nodejs.pkgs }}"
-
-- name: Set nodejs_configured
-  ansible.builtin.set_fact:
-    nodejs_configured: true

tasks/pkgs/nomad.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add nomad
-  when:
-    - nomad_configured is undefined
   block:
     - name: Load nomad config
       ansible.builtin.include_tasks:

tasks/pkgs/nwg_hello.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add nwg-hello
-  when:
-    - nwg_hello_configured is undefined
-  block:
-    - name: Load nwg-hello config
-      ansible.builtin.include_tasks:
-        file: config/nwg_hello.yml
+- name: Load nwg-hello config
+  ansible.builtin.include_tasks:
+    file: config/nwg_hello.yml
 
-    - name: Append nwg-hello build_deps to sys_pkg
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + nwg_hello.build_deps }}"
-
-    - name: Append nwg-hello to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['nwg_hello'] }}"
+- name: Append nwg-hello build_deps to sys_pkg
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + nwg_hello.build_deps }}"

tasks/pkgs/packer.yml

@@ -1,34 +1,26 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add packer
+- name: Load packer config
+  ansible.builtin.include_tasks:
+    file: config/packer.yml
+
+- name: Append packer to pkg_tap
   when:
-    - packer_configured is undefined
-  block:
-    - name: Load packer config
-      ansible.builtin.include_tasks:
-        file: config/packer.yml
+    - packer.method == 'tap'
+  ansible.builtin.set_fact:
+    pkg_tap: "{{ pkg_tap + packer.pkgs }}"
 
-    - name: Append packer to pkg_tap
-      when:
-        - packer.method == 'tap'
-      ansible.builtin.set_fact:
-        pkg_tap: "{{ pkg_tap + packer.pkgs }}"
+- name: Append packer to pkg_sys
+  when:
+    - packer.method == 'sys'
+  notify:
+    - Depend hashicorp repo
+  changed_when: true
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + packer.pkgs }}"
 
-    - name: Append packer to pkg_sys
-      when:
-        - packer.method == 'sys'
-      notify:
-        - Depend hashicorp repo
-      changed_when: true
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + packer.pkgs }}"
-
-    - name: Append packer to pkg_archive
-      when:
-        - packer.method == 'archive'
-      ansible.builtin.set_fact:
-        pkg_archive: "{{ pkg_archive + ['packer'] }}"
-
-    - name: Set packer_configured
-      ansible.builtin.set_fact:
-        packer_configured: true
+- name: Append packer to pkg_archive
+  when:
+    - packer.method == 'archive'
+  ansible.builtin.set_fact:
+    pkg_archive: "{{ pkg_archive + ['packer'] }}"

tasks/pkgs/pandoc.yml

@@ -1,12 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add pandoc
-  when:
-    - pandoc_configured is undefined
-  block:
-    - name: Append pandoc to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['pandoc'] }}"
-    - name: Set pandoc_configured
-      ansible.builtin.set_fact:
-        pandoc_configured: true
+- name: Append pandoc to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['pandoc'] }}"

tasks/pkgs/podman.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add podman
-  when:
-    - podman_configured is undefined
-  block:
-    - name: Append podman to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['podman'] }}"
-
-    - name: Set podman_configured
-      ansible.builtin.set_fact:
-        podman_configured: true
+- name: Append podman to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['podman'] }}"

tasks/pkgs/pulumi.yml

@@ -1,25 +1,17 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add pulumi
+- name: Load pulumi config
+  ansible.builtin.include_tasks:
+    file: config/pulumi.yml
+
+- name: Append pulumi to pkg_archive
   when:
-    - pulumi_configured is undefined
-  block:
-    - name: Load pulumi config
-      ansible.builtin.include_tasks:
-        file: config/pulumi.yml
+    - ansible_system == 'Linux'
+  ansible.builtin.set_fact:
+    pkg_archive: "{{ pkg_archive + ['pulumi'] }}"
 
-    - name: Append pulumi to pkg_archive
-      when:
-        - ansible_system == 'Linux'
-      ansible.builtin.set_fact:
-        pkg_archive: "{{ pkg_archive + ['pulumi'] }}"
-
-    - name: Append to pulumi to pkg_sys
-      when:
-        - ansible_system == 'Darwin'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['pulumi'] }}"
-
-    - name: Set pulumi_configured
-      ansible.builtin.set_fact:
-        pulumi_configured: true
+- name: Append to pulumi to pkg_sys
+  when:
+    - ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['pulumi'] }}"

tasks/pkgs/python3.yml

@@ -1,17 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add python3
-  when:
-    - python3_configured is undefined
-  block:
-    - name: Load python3 config
-      ansible.builtin.include_tasks:
-        file: config/python3.yml
+- name: Load python3 config
+  ansible.builtin.include_tasks:
+    file: config/python3.yml
 
-    - name: Append python3 to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + python3.pkgs }}"
-
-    - name: Set python3_configured
-      ansible.builtin.set_fact:
-        python3_configured: true
+- name: Append python3 to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + python3.pkgs }}"

tasks/pkgs/restic.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add restic
-  when:
-    - restic_configured is undefined
-  block:
-    - name: Append restic to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['restic'] }}"
-
-    - name: Set restic_configured
-      ansible.builtin.set_fact:
-        restic_configured: true
+- name: Append restic to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['restic'] }}"

tasks/pkgs/ripgrep.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add ripgrep
-  when:
-    - ripgrep_configured is undefined
-  block:
-    - name: Append ripgrep to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['ripgrep'] }}"
-
-    - name: Set ripgrep_configured
-      ansible.builtin.set_fact:
-        ripgrep_configured: true
+- name: Append ripgrep to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['ripgrep'] }}"

tasks/pkgs/samba_client.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add samba_client
-  when:
-    - samba_client_configured is undefined
-  block:
-    - name: Append samba_client to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + samba_client.pkgs }}"
-
-    - name: Set samba_client_configured
-      ansible.builtin.set_fact:
-        samba_client_configured: true
+- name: Append samba_client to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + samba_client.pkgs }}"

tasks/pkgs/samba_server.yml

@@ -1,12 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add samba_server
-  when:
-    - samba_server_configured is undefined
-  block:
-    - name: Append samba_server to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + samba_server.pkgs }}"
-    - name: Set samba_server_configured
-      ansible.builtin.set_fact:
-        samba_server_configured: true
+- name: Append samba_server to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + samba_server.pkgs }}"

tasks/pkgs/sd.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add sd
-  when:
-    - sd_configured is undefined
   block:
     - name: Append sd to pkg_sys
       when:

tasks/pkgs/sdbus_cpp_2.yml

@@ -1,21 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add sdbus_cpp_2
-  when:
-    - sdbus_cpp_2_configured is undefined
-  block:
-    - name: Load sdbus-cpp-2 config
-      ansible.builtin.include_tasks:
-        file: config/sdbus_cpp_2.yml
+- name: Load sdbus-cpp-2 config
+  ansible.builtin.include_tasks:
+    file: config/sdbus_cpp_2.yml
 
-    - name: Append sdbus-cpp-2 build_deps to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + sdbus_cpp_2.build_deps }}"
+- name: Append sdbus-cpp-2 build_deps to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + sdbus_cpp_2.build_deps }}"
 
-    - name: Append sdbus-cpp-2 to pkg_src
-      ansible.builtin.set_fact:
-        pkg_src: "{{ pkg_src + ['sdbus_cpp_2'] }}"
-
-    - name: Set sdbus_cpp_2_configured
-      ansible.builtin.set_fact:
-        sdbus_cpp_2_configured: true
+- name: Append sdbus-cpp-2 to pkg_src
+  ansible.builtin.set_fact:
+    pkg_src: "{{ pkg_src + ['sdbus_cpp_2'] }}"

tasks/pkgs/stow.yml

@@ -1,13 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add stow
-  when:
-    - stow_configured is undefined
-  block:
-    - name: Append stow to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['stow'] }}"
+- name: Append stow to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['stow'] }}"
 
-    - name: Set stow_configured
-      ansible.builtin.set_fact:
-        stow_configured: true
+- name: Set stow_configured
+  ansible.builtin.set_fact:
+    stow_configured: true

tasks/pkgs/tailscale.yml

@@ -1,77 +1,69 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add tailscale
+- name: Load tailscale config
+  ansible.builtin.include_tasks:
+    file: config/tailscale.yml
+
+- name: Append tailscale for linux
   when:
-    - tailscale_configured is undefined
+    - ansible_system == 'Linux'
   block:
-    - name: Load tailscale config
-      ansible.builtin.include_tasks:
-        file: config/tailscale.yml
-
-    - name: Append tailscale for linux
+    - name: Append tailscale for RedHat distros
       when:
-        - ansible_system == 'Linux'
+        - ansible_os_family == 'RedHat'
       block:
-        - name: Append tailscale for RedHat distros
+        - name: Add tailscale repo for Fedora >=41
+          ansible.builtin.command:
+            creates: /etc/yum.repos.d/tailscale.repo
+            cmd: "dnf config-manager addrepo --from-repofile={{ tailscale.url_base }}/fedora/tailscale.repo"
+          become: true
           when:
-            - ansible_os_family == 'RedHat'
-          block:
-            - name: Add tailscale repo for Fedora >=41
-              ansible.builtin.command:
-                creates: /etc/yum.repos.d/tailscale.repo
-                cmd: "dnf config-manager addrepo --from-repofile={{ tailscale.url_base }}/fedora/tailscale.repo"
-              become: true
-              when:
-                - ansible_distribution == 'Fedora'
-                - ansible_distribution_major_version|int >= 41
+            - ansible_distribution == 'Fedora'
+            - ansible_distribution_major_version|int >= 41
 
-            - name: Add tailscale repo for Fedora <41
-              ansible.builtin.command:
-                creates: /etc/yum.repos.d/tailscale.repo
-                cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/fedora/tailscale.repo"
-              become: true
-              when:
-                - ansible_distribution == 'Fedora'
-                - ansible_distribution_major_version|int < 41
-
-            - name: Add tailscale for Rhel based distros
-              ansible.builtin.command:
-                creates: /etc/yum.repos.d/tailscale.repo
-                cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/rhel/{{ ansible_os_major_version }}/tailscale.repo"
-              become: true
-              when:
-                - ansible_distribution != 'Fedora'
-
-        - name: Append tailscale for Debian distros
+        - name: Add tailscale repo for Fedora <41
+          ansible.builtin.command:
+            creates: /etc/yum.repos.d/tailscale.repo
+            cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/fedora/tailscale.repo"
+          become: true
           when:
-            - ansible_os_family == 'Debian'
-          block:
-            - name: Install tailscale keyring
-              block:
-                - name: Get tailscal keyring
-                  become: "{{ sys_pkg_become }}"
-                  ansible.builtin.get_url:
-                    url: "{{ tailscale.url_base }}/debian/{{ tailscale.release.gpg }}"
-                    dest: /usr/share/keyrings/tailscale-archive-keyring.gpg
-                    mode: '0644'
+            - ansible_distribution == 'Fedora'
+            - ansible_distribution_major_version|int < 41
 
-                - name: Get tailscale repo list
-                  become: "{{ sys_pkg_become }}"
-                  ansible.builtin.get_url:
-                    url: "{{ tailscale.url_base }}/debian/{{ tailscale.release.list }}"
-                    dest: /etc/apt/sources.list.d/tailscale.list
-                    mode: '0644'
+        - name: Add tailscale for Rhel based distros
+          ansible.builtin.command:
+            creates: /etc/yum.repos.d/tailscale.repo
+            cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/rhel/{{ ansible_os_major_version }}/tailscale.repo"
+          become: true
+          when:
+            - ansible_distribution != 'Fedora'
 
-        - name: Append tailscale to pkg_sys
-          ansible.builtin.set_fact:
-            pkg_sys: "{{ pkg_sys + ['tailscale'] }}"
-
-    - name: Append tailscale to pkg_cask
+    - name: Append tailscale for Debian distros
       when:
-        - ansible_system == 'Darwin'
-      ansible.builtin.set_fact:
-        pkg_cask: "{{ pkg_cask + ['tailscale'] }}"
+        - ansible_os_family == 'Debian'
+      block:
+        - name: Install tailscale keyring
+          block:
+            - name: Get tailscal keyring
+              become: "{{ sys_pkg_become }}"
+              ansible.builtin.get_url:
+                url: "{{ tailscale.url_base }}/debian/{{ tailscale.release.gpg }}"
+                dest: /usr/share/keyrings/tailscale-archive-keyring.gpg
+                mode: '0644'
 
-    - name: Set tailscale_configured
+            - name: Get tailscale repo list
+              become: "{{ sys_pkg_become }}"
+              ansible.builtin.get_url:
+                url: "{{ tailscale.url_base }}/debian/{{ tailscale.release.list }}"
+                dest: /etc/apt/sources.list.d/tailscale.list
+                mode: '0644'
+
+    - name: Append tailscale to pkg_sys
       ansible.builtin.set_fact:
-        tailscale_configured: true
+        pkg_sys: "{{ pkg_sys + ['tailscale'] }}"
+
+- name: Append tailscale to pkg_cask
+  when:
+    - ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['tailscale'] }}"

tasks/pkgs/targetcli.yml

@@ -1,13 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add targetcli
-  when:
-    - targetcli_configured is undefined
-  block:
-    - name: Append targetcli to pkg_sys
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + targetcli.pkgs }}"
-
-    - name: Set targetcli_configured
-      ansible.builtin.set_fact:
-        targetcli_configured: true
+- name: Append targetcli to pkg_sys
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + targetcli.pkgs }}"

tasks/pkgs/terraform.yml

@@ -1,41 +1,33 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add terraform
+- name: Load terraform config
+  ansible.builtin.include_tasks:
+    file: config/terraform.yml
+
+- name: Append terraform
   when:
-    - terraform_configured is undefined
+    - terraform.method == 'sys'
   block:
-    - name: Load terraform config
-      ansible.builtin.include_tasks:
-        file: config/terraform.yml
-
-    - name: Append terraform
+    - name: Append terraform to pkg_tap
       when:
-        - terraform.method == 'sys'
-      block:
-        - name: Append terraform to pkg_tap
-          when:
-            - ansible_distribution == 'MacOSX'
-          notify:
-            - Depend hashicorp repo
-          changed_when: true
-          ansible.builtin.set_fact:
-            pkg_tap: "{{ pkg_tap + terraform.pkgs }}"
+        - ansible_distribution == 'MacOSX'
+      notify:
+        - Depend hashicorp repo
+      changed_when: true
+      ansible.builtin.set_fact:
+        pkg_tap: "{{ pkg_tap + terraform.pkgs }}"
 
-        - name: Append terraform to pkg_sys
-          when:
-            - ansible_system == 'Linux'
-          notify:
-            - Depend hashicorp repo
-          changed_when: true
-          ansible.builtin.set_fact:
-            pkg_sys: "{{ pkg_sys + terraform.pkgs }}"
-
-    - name: Append terraform to pkg_archive
+    - name: Append terraform to pkg_sys
       when:
-        - terraform.method == 'archive'
+        - ansible_system == 'Linux'
+      notify:
+        - Depend hashicorp repo
+      changed_when: true
       ansible.builtin.set_fact:
-        pkg_archive: "{{ pkg_archive + ['terraform'] }}"
+        pkg_sys: "{{ pkg_sys + terraform.pkgs }}"
 
-    - name: Set terraform_configured
-      ansible.builtin.set_fact:
-        terraform_configured: true
+- name: Append terraform to pkg_archive
+  when:
+    - terraform.method == 'archive'
+  ansible.builtin.set_fact:
+    pkg_archive: "{{ pkg_archive + ['terraform'] }}"

tasks/pkgs/terraformls.yml

@@ -1,41 +1,37 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add terraformls
+- name: Load terraformls config
+  ansible.builtin.include_tasks:
+    file: config/terraformls.yml
+
+- name: Append terraformls
   when:
-    - terraformls_configured is undefined
+    - terraformls.method == 'sys'
   block:
-    - name: Load terraformls config
-      ansible.builtin.include_tasks:
-        file: config/terraformls.yml
-
-    - name: Append terraformls
+    - name: Append terraformls to pkg_tap
       when:
-        - terraformls.method == 'sys'
-      block:
-        - name: Append terraformls to pkg_tap
-          when:
-            - ansible_system == 'Darwin'
-          notify:
-            - Depend hashicorp repo
-          changed_when: true
-          ansible.builtin.set_fact:
-            pkg_tap: "{{ pkg_tap + terraformls.pkgs }}"
+        - ansible_system == 'Darwin'
+      notify:
+        - Depend hashicorp repo
+      changed_when: true
+      ansible.builtin.set_fact:
+        pkg_tap: "{{ pkg_tap + terraformls.pkgs }}"
 
-        - name: Append terraformls to pkg_sys
-          when:
-            - ansible_system == 'Linux'
-          notify:
-            - Depend hashicorp repo
-          changed_when: true
-          ansible.builtin.set_fact:
-            pkg_sys: "{{ pkg_sys + terraformls.pkgs }}"
-
-    - name: Append terraformls to pkg_go
+    - name: Append terraformls to pkg_sys
       when:
-        - terraformls.method == 'gosrc'
+        - ansible_system == 'Linux'
+      notify:
+        - Depend hashicorp repo
+      changed_when: true
       ansible.builtin.set_fact:
-        pkg_go: "{{ pkg_go + [terraformls.gopkg] }}"
+        pkg_sys: "{{ pkg_sys + terraformls.pkgs }}"
 
-    - name: Set terraformls_configured
-      ansible.builtin.set_fact:
-        terraformls_configured: true
+- name: Append terraformls to pkg_go
+  when:
+    - terraformls.method == 'gosrc'
+  ansible.builtin.set_fact:
+    pkg_go: "{{ pkg_go + [terraformls.gopkg] }}"
+
+- name: Set terraformls_configured
+  ansible.builtin.set_fact:
+    terraformls_configured: true

tasks/pkgs/thunderbird.yml

@@ -1,21 +1,17 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: Add thunderbird
+- name: Append thunderbird to pkg_sys
   when:
-    - thunderbird_configured is undefined
-  block:
-    - name: Append thunderbird to pkg_sys
-      when:
-        - ansible_system == 'Linux'
-      ansible.builtin.set_fact:
-        pkg_sys: "{{ pkg_sys + ['thunderbird'] }}"
+    - ansible_system == 'Linux'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['thunderbird'] }}"
 
-    - name: Append thunderbird to pkg_cask
-      when:
-        - ansible_system == 'Darwin'
-      ansible.builtin.set_fact:
-        pkg_cask: "{{ pkg_cask + ['thunderbird'] }}"
+- name: Append thunderbird to pkg_cask
+  when:
+    - ansible_system == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cask: "{{ pkg_cask + ['thunderbird'] }}"
 
-    - name: Set thunderbird_configured
-      ansible.builtin.set_fact:
-        thunderbird_configured: true
+- name: Set thunderbird_configured
+  ansible.builtin.set_fact:
+    thunderbird_configured: true

tasks/pkgs/tidy.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add tidy
-  when:
-    - tidy_configured is undefined
   block:
     - name: Load tidy config
       ansible.builtin.include_tasks:

tasks/pkgs/tldr.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add tldr
-  when:
-    - tldr_configured is undefined
   block:
     - name: Append tldr to pkg_sys
       when:

tasks/pkgs/tmux.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add tmux
-  when:
-    - tmux_configured is undefined
   block:
     - name: Append tmux to pkg_sys
       ansible.builtin.set_fact:

tasks/pkgs/uwsm.yml

@@ -2,7 +2,6 @@
 ---
 - name: Add uwsm
   when:
-    - uwsm_configured is undefined
     - ansible_os_family != 'Alpine'
     - ansible_os_family != 'Darwin'
   block:

tasks/pkgs/vault.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add vault
-  when:
-    - vault_configured is undefined
   block:
     - name: Load vault config
       ansible.builtin.include_tasks:

tasks/pkgs/xdg_desktop_portal_hyprland.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add xdg-desktop-portal-hyprland
-  when:
-    - xdg_desktop_portal_hyprland_configured is undefined
   block:
     - name: Load xdg-desktop-portal-hyprland config
       when:

tasks/pkgs/xh.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add xh
-  when:
-    - xh_configured is undefined
   block:
     - name: Load xh config
       ansible.builtin.include_tasks:

tasks/pkgs/yazi.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add yazi-fm
-  when:
-    - yazi_fm_configured is undefined
   block:
     - name: Load yazi-fm config
       ansible.builtin.include_tasks:

tasks/pkgs/zfs.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add zfs
-  when:
-    - zfs_configured is undefined
   block:
     - name: Load zfs config
       ansible.builtin.include_tasks:

tasks/pkgs/zoxide.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add zoxide
-  when:
-    - zoxide_configured is undefined
   block:
     - name: Append zoxide to pkg_sys
       ansible.builtin.set_fact:

tasks/pkgs/zsh.yml

@@ -1,8 +1,6 @@
 # vim: set filetype=yaml.ansible :
 ---
 - name: Add zsh
-  when:
-    - zsh_configured is undefined
   block:
     - name: Append zsh to pkg_sys
       ansible.builtin.set_fact: