separate configuration, requirements and variables

tasks/pkgs/alacritty.yml

@@ -15,7 +15,7 @@
 
     - name: append to pkgs
       set_fact:
-        syspkgs: "{{ syspkgs + pkgconfig_alacritty.build_deps[ansible_distribution] }}"
+        syspkgs: "{{ syspkgs + pkgconfig_alacritty.deps[ansible_distribution] }}"
         srcpkgs: "{{ srcpkgs + [ 'alacritty' ] }}"
 
 - name: append alacritty to caskpkgs

tasks/pkgs/ansible-language-server.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/bashls.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/bitwarden.yml

@@ -9,7 +9,7 @@
   block:
     - ansible.builtin.include_tasks:
         file: pkgs/flatpak.yml
-      when: pkgconfig_flatpak is undefined
+      when: flatpak is undefined
 
     - ansible.builtin.set_fact:
         flatpkgs: "{{ flatpkgs + [ 'com.bitwarden.desktop' ] }}"

tasks/pkgs/clangd.yml

@@ -1,9 +1,6 @@
 ---
-- ansible.builtin.include_vars:
-    file: clangd.yml
-    name: _clangd
 - ansible.builtin.set_fact:
-    pkgconfig_clangd: "{{ _clangd | ansible.builtin.combine(pkgconfig.clangd) }}"
+    clangd: true
 
 - ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_clangd.pkgs[ansible_os_family] }}"
+    syspkgs: "{{ syspkgs + pkgconfig.clangd.pkgs[ansible_os_family] }}"

tasks/pkgs/cmakelang.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/pipx.yml
-  when: pkgconfig_pipx is undefined
+  when: pipx is undefined
 
 - name: add to pipxpkgs
   ansible.builtin.set_fact:

tasks/pkgs/commitlint-cli.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/commitlint-config-conventional.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/consul.yml

@@ -3,13 +3,13 @@
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
     file: "pkgs/hashicorp_repo.yml"
-  when: pkgconfig_hashicorp is undefined
+  when: hashicorp is undefined
 
 - name: append to syspkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ pkgconfig_hashicorp.consul[ansible_system] ] }}"
+    syspkgs: "{{ syspkgs + [ pkgconfig.consul[ansible_system] ] }}"
   when: ansible_system == 'Linux'
 
 - ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig_hashicorp.consul[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ pkgconfig.consul[ansible_system] ] }}"
   when: ansible_system == 'Darwin'

tasks/pkgs/cssls.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/dbeaver.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/flatpak.yml
-  when: pkgconfig_flatpkak is undefined
+  when: flatpkak is undefined
 
 - name: append to flatpkgs
   ansible.builtin.set_fact:

tasks/pkgs/dockerls.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/eslint.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/flatpak.yml

@@ -2,5 +2,5 @@
 - name: append to syspkgs
   ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'flatpak' ] }}"
-    pkgconfig_flatpak: {defined: true}
+    flatpak: true
   when: ansible_os_family != 'Darwin'

tasks/pkgs/ghostty.yml

@@ -9,7 +9,7 @@
   block:
     - ansible.builtin.include_tasks:
         file: "pkgs/terra_repo.yml"
-      when: pkgconfig_terrarepo is undefined
+      when: terrarepo is undefined
 
     - name: append to pkgs
       ansible.builtin.set_fact:
@@ -20,7 +20,7 @@
 - name: build ghostty from source
   block:
     - ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + pkgconfig_ghostty.build_deps[ansible_os_family] }}"
+        syspkgs: "{{ syspkgs + pkgconfig_ghostty.deps[ansible_os_family] }}"
         srcpkgs: "{{ srcpkgs + ['ghostty'] }}"
   when: (ansible_distribution != 'Fedora' and ansible_system == 'Linux') or
         pkgconfig_ghostty.build

tasks/pkgs/git.yml

@@ -1,10 +1,7 @@
 ---
-- ansible.builtin.include_vars:
-    file: git.yml
-    name: _git
 - ansible.builtin.set_fact:
-    pkgconfig_git: "{{ _git | ansible.builtin.combine(pkgconfig.git) }}"
+    git: true
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_git.pkgs[ansible_system] }}"
+    syspkgs: "{{ syspkgs + pkgconfig.git.pkgs[ansible_system] }}"

tasks/pkgs/godot.yml

@@ -2,7 +2,7 @@
 - block:
     - ansible.builtin.include_tasks:
         file: pkgs/flatpak.yml
-      when: pkgconfig_flatpkak is undefined
+      when: flatpak is undefined
     - name: append to flatpkgs
       ansible.builtin.set_fact:
         flatpkgs: "{{ flatpkgs + [ 'org.godotengine.Godot' ] }}"

tasks/pkgs/hashicorp_repo.yml

@@ -1,9 +1,6 @@
 ---
-- ansible.builtin.include_vars:
-    file: hashicorp_repo.yml
-    name: _hashicorp
 - ansible.builtin.set_fact:
-    pkgconfig_hashicorp: "{{ _hashicorp | ansible.builtin.combine(pkgconfig.hashicorp) }}"
+    hashicorp: true
 
 - name: RedHat repository
   when: ansible_os_family == 'RedHat'
@@ -15,7 +12,7 @@
         - ansible_distribution_major_version|int >= 41
       ansible.builtin.command:
         creates: /etc/yum.repos.d/hashicorp.repo
-        cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig_hashicorp.Linux.Fedora.repo }}"
+        cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig.hashicorp.Linux.Fedora.repo }}"
 
     - name: enable hashicorp repo for fedora <41
       become: true
@@ -24,7 +21,7 @@
         - ansible_distribution_major_version|int < 41
       ansible.builtin.command:
         creates: /etc/yum.repos.d/hashicorp.repo
-        cmd: "dnf config-manager --add-repo {{ pkgconfig_hashicorp.Linux.Fedora.repo }}"
+        cmd: "dnf config-manager --add-repo {{ pkgconfig.hashicorp.Linux.Fedora.repo }}"
 
     - name: enable hashicorp repo for RHEL like distribution
       become: true
@@ -32,7 +29,7 @@
         - ansible_distribution != 'Fedora'
       ansible.builtin.command:
         creates: /etc/yum.repos.d/hashicorp.repo
-        cmd: "dnf config-manager --add-repo {{ pkgconfig_hashicorp.Linux.RedHat.repo }}"
+        cmd: "dnf config-manager --add-repo {{ pkgconfig.hashicorp.Linux.RedHat.repo }}"
 
 - name: Debian based repository
   when: ansible_os_family == 'Debian'
@@ -59,7 +56,7 @@
 
     - name: enable hasicorp repo for debian
       ansible.builtin.apt_repository:
-        repo: "{{ pkgconfig_hashicorp.Linux.Debian.repo }}"
+        repo: "{{ pkgconfig.hashicorp.Linux.Debian.repo }}"
         state: present
         update_cache: false
 

tasks/pkgs/heroic.yml

@@ -2,7 +2,7 @@
 - block:
     - ansible.builtin.include_tasks:
         file: pkgs/flatpak.yml
-      when: pkgconfig_flatpkak is undefined
+      when: flatpak is undefined
     - name: append to flatpkgs
       ansible.builtin.set_fact:
         flatpkgs: "{{ flatpkgs + [ 'com.heroicgameslauncher.hgl' ] }}"

tasks/pkgs/htmlls.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/httpie.yml

@@ -2,7 +2,7 @@
 - block:
     - ansible.builtin.include_tasks:
         file: pkgs/flatpak.yml
-      when: pkgconfig_flatpak is undefined
+      when: flatpak is undefined
 
     - ansible.builtin.set_fact:
         flatpkgs: "{{ flatpkgs + [ 'io.httpie.Httpie' ] }}"

tasks/pkgs/intelephense.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/jsonls.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/kitty.yml

@@ -1,10 +1,4 @@
 ---
-- ansible.builtin.include_vars:
-    file: kitty.yml
-    name: _kitty
-- ansible.builtin.set_fact:
-    pkgconfig_kitty: "{{ _kitty | ansible.builtin.combine(pkgconfig.kitty) }}"
-
 - name: add to syspkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_kitty.pkgs[ansible_system] }}"
+    syspkgs: "{{ syspkgs + pkgconfig.kitty.pkgs[ansible_system] }}"

tasks/pkgs/libreoffice.yml

@@ -8,7 +8,7 @@
 - block:
     - ansible.builtin.include_tasks:
         file: pkgs/flatpak.yml
-      when: pkgconfig_flatpkak is undefined
+      when: flatpak is undefined
     - name: append to flatpkgs
       ansible.builtin.set_fact:
         flatpkgs: "{{ flatpkgs + pkgconfig_libreoffice.flatpak }}"

tasks/pkgs/markdownlint-cli.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/neovide.yml

@@ -10,7 +10,7 @@
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_neovide.pkgdeps[ansible_os_family] }}"
+    syspkgs: "{{ syspkgs + pkgconfig_neovide.deps[ansible_os_family] }}"
     srcpkgs: "{{ srcpkgs + [ 'neovide' ] }}"
   when: ansible_system == 'Linux'
 

tasks/pkgs/nextcloud.yml

@@ -3,7 +3,7 @@
   block:
     - ansible.builtin.include_tasks:
         file: pkgs/flatpak.yml
-      when: pkgconfig_flatpak is undefined
+      when: flatpak is undefined
 
     - ansible.builtin.set_fact:
         flatpkgs: "{{ flatpkgs + [ 'com.nextcloud.desktopclient.nextcloud' ] }}"

tasks/pkgs/nginxls.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/pipx.yml
-  when: pkgconfig_pipx is undefined
+  when: pipx is undefined
 
 - name: add to pipxpkgs
   ansible.builtin.set_fact:

tasks/pkgs/nodejs.yml

@@ -1,10 +1,7 @@
 ---
-- ansible.builtin.include_vars:
-    file: nodejs.yml
-    name: _nodejs
 - ansible.builtin.set_fact:
-    pkgconfig_nodejs: "{{ _nodejs | ansible.builtin.combine(pkgconfig.nodejs) }}"
+    nodejs: true
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_nodejs.pkgs[ansible_system] }}"
+    syspkgs: "{{ syspkgs + pkgconfig.nodejs.pkgs[ansible_system] }}"

tasks/pkgs/nomad.yml

@@ -2,9 +2,9 @@
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
     file: "pkgs/hashicorp_repo.yml"
-  when: pkgconfig_hashicorp is undefined
+  when: hashicorp is undefined
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig.hashicorp.nomad[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ pkgconfig.nomad[ansible_system] ] }}"
 

tasks/pkgs/nushell.yml

@@ -15,5 +15,11 @@
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_nushell.build_deps[ansible_os_family] }}"
-    cargopkgs: "{{ cargopkgs + pkgconfig_nushell.pkgs[ansible_os_family] + pkgconfig_nushell.pkgs_common }}"
+    syspkgs: "{{ syspkgs + pkgconfig_nushell.deps[ansible_os_family] }}"
+    cargopkgs: "{{ cargopkgs + pkgconfig_nushell.pkgs[ansible_os_family] }}"
+
+- name: add nushell extras
+  ansible.builtin.set_fact:
+    cargopkgs: "{{ cargopkgs  + pkgconfig_nushell.nupkgs_extra }}"
+  when:
+    pkgconfig_nushell.install_extra

tasks/pkgs/packer.yml

@@ -2,8 +2,8 @@
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
     file: "pkgs/hashicorp_repo.yml"
-  when: pkgconfig_hashicorp is undefined
+  when: hashicorp is undefined
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig_hashicorp.packer[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ pkgconfig.packer[ansible_system] ] }}"

tasks/pkgs/pgadmin.yml

@@ -2,7 +2,7 @@
 - block:
     - ansible.builtin.include_tasks:
         file: pkgs/flatpak.yml
-      when: pkgconfig_flatpak is undefined
+      when: flatpak is undefined
 
     - name: append to syspkgs
       ansible.builtin.set_fact:

tasks/pkgs/pipx.yml

@@ -1,4 +1,6 @@
 ---
+- ansbile.builtin.set_fact:
+    pipx: true
 - name: append to pkgs
   ansible.builtin.set_fact:
     syspkgs: "{{ syspkgs + [ 'pipx' ] }}"

tasks/pkgs/pyright.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/pipx.yml
-  when: pkgconfig_pipx is undefined
+  when: pipx is undefined
 
 - name: add to pipxpkgs
   ansible.builtin.set_fact:

tasks/pkgs/python3-pip.yml

@@ -1,10 +1,7 @@
 ---
-- ansible.builtin.include_vars:
-    file: python3.yml
-    name: _python3
 - ansible.builtin.set_fact:
-    pkgconfig_python3: "{{ _python3 | ansible.builtin.combine(pkgconfig.python3) }}"
+    python3: true
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_python3.pkgs[ansible_system] }}"
+    syspkgs: "{{ syspkgs + pkgconfig.python3.pkgs[ansible_system] }}"

tasks/pkgs/quobix-vacuum.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/sqlfluff.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/pipx.yml
-  when: pkgconfig_pipx is undefined
+  when: pipx is undefined
 
 - name: add to pipxpkgs
   ansible.builtin.set_fact:

tasks/pkgs/sqlls.yml

@@ -1,9 +1,10 @@
 # vim: filetype=yaml.ansible :
 ---
-- ansible.builtin.include_tasks:
+- name: Use nodejs
+  ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
-- name: add to npmpkgs
+- name: Add to npmpkgs
   ansible.builtin.set_fact:
     npmpkgs: "{{ npmpkgs + ['sql-language-server'] }}"

tasks/pkgs/tailscale.yml

@@ -1,9 +1,6 @@
 ---
-- ansible.builtin.include_vars:
-    file: tailscale.yml
-    name: _tailscale
 - ansible.builtin.set_fact:
-    pkgconfig_tailscale: "{{ _tailscale | ansible.builtin.combine(pkgconfig.tailscale) }}"
+    tailscale: true
 - name: enable for linux
   block:
     - name: enable for RedHat distros
@@ -11,7 +8,7 @@
         - name: fedora >=41
           ansible.builtin.command:
             creates: /etc/yum.repos.d/tailscale.repo
-            cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig_tailscale.url_base }}/fedora/tailscale.repo"
+            cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig.tailscale.url_base }}/fedora/tailscale.repo"
           become: true
           when:
             - ansible_distribution == 'Fedora'
@@ -20,7 +17,7 @@
         - name: fedora <41
           ansible.builtin.command:
             creates: /etc/yum.repos.d/tailscale.repo
-            cmd: "dnf config-manager --add-repo {{ pkgconfig_tailscale.url_base }}/fedora/tailscale.repo"
+            cmd: "dnf config-manager --add-repo {{ pkgconfig.tailscale.url_base }}/fedora/tailscale.repo"
           become: true
           when:
             - ansible_distribution == 'Fedora'
@@ -29,7 +26,7 @@
         - name: rhel based distros
           ansible.builtin.command:
             creates: /etc/yum.repos.d/tailscale.repo
-            cmd: "dnf config-manager --add-repo {{ pkgconfig_tailscale.url_base }}/rhel/{{ ansible_os_major_version }}/tailscale.repo"
+            cmd: "dnf config-manager --add-repo {{ pkgconfig.tailscale.url_base }}/rhel/{{ ansible_os_major_version }}/tailscale.repo"
           become: true
           when:
             - ansible_distribution != 'Fedora'
@@ -40,11 +37,11 @@
         - name: install tailscale keyring
           block:
             - ansible.builtin.get_url:
-                url: "{{ pkgconfig_tailscale.url_base }}/debian/{{ pkgconfig_tailscale.release[ansible_os_release].gpg }}"
+                url: "{{ pkgconfig.tailscale.url_base }}/debian/{{ pkgconfig.tailscale.release[ansible_os_release].gpg }}"
                 dest: /usr/share/keyrings/tailscale-archive-keyring.gpg
               become: true
             - ansible.builtin.get_url:
-                url: "{{ pkgconfig_tailscale.url_base }}/debian/{{ pkgconfig_tailscale.release[ansible_os_release].list }}"
+                url: "{{ pkgconfig.tailscale.url_base }}/debian/{{ pkgconfig.tailscale.release[ansible_os_release].list }}"
                 dest: /etc/apt/sources.list.d/tailscale.list
               become: true
       when: ansible_os_family == 'Debian'

tasks/pkgs/tailwindcss-languageserver.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/terra_repo.yml

@@ -1,10 +1,4 @@
 ---
-- ansible.builtin.include_vars:
-    file: terrarepo.yml
-    name: _terrarepo
-- ansible.builtin.set_fact:
-    pkgconfig_terrarepo: "{{ _terrarepo | ansible.builtin.combine(pkgconfig.terrarepo) }}"
-
 - name: enable terra repo for fedora
   when: ansible_distribution == 'Fedora'
   block:
@@ -13,14 +7,14 @@
       when: ansible_distribution_major_version|int >= 41
       ansible.builtin.command:
         creates: /etc/yum.repos.d/terra.repo
-        cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig_terrarepo.Fedora.repo }}"
+        cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig.terrarepo.repo }}"
 
     - name: enable terra repo for fedora < 41
       become: true
       when: ansible_distribution_major_version|int < 41
       ansible.builtin.command:
         creates: /etc/yum.repos.d/terra.repo
-        cmd: "dnf config-manager --add-repo {{ pkgconfig_terrarepo.Fedora.repo }}"
+        cmd: "dnf config-manager --add-repo {{ pkgconfig.terrarepo.repo }}"
 
     - ansible.builtin.dnf:
         name: terra-release

tasks/pkgs/terraform.yml

@@ -2,8 +2,8 @@
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
     file: "pkgs/hashicorp_repo.yml"
-  when: pkgconfig_hashicorp is undefined
+  when: hashicorp is undefined
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig_hashicorp.terraform[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ pkgconfig.terraform[ansible_system] ] }}"

tasks/pkgs/terraformls.yml

@@ -2,8 +2,8 @@
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
     file: "pkgs/hashicorp_repo.yml"
-  when: pkgconfig_hashicorp is undefined
+  when: hashicorp is undefined
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig_hashicorp.terraformls[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ pkgconfig.terraformls[ansible_system] ] }}"

tasks/pkgs/tidy.yml

@@ -1,10 +1,7 @@
 ---
-- ansible.builtin.include_vars:
-    file: tidy.yml
-    name: _tidy
 - ansible.builtin.set_fact:
-    pkgconfig_tidy: "{{ _tidy | ansible.builtin.combine(pkgconfig.tidy) }}"
+    tidy: true
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_tidy.pkgs[ansible_system] }}"
+    syspkgs: "{{ syspkgs + pkgconfig.tidy.pkgs[ansible_system] }}"

tasks/pkgs/vault.yml

@@ -2,8 +2,8 @@
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
     file: "pkgs/hashicorp_repo.yml"
-  when: pkgconfig_hashicorp is undefined
+  when: hashicorp is undefined
 
 - name: append to pkgs
   ansible.builtin.set_fact:
-    tappkgs: "{{ tappkgs + [ pkgconfig_hashicorp.vault[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ pkgconfig.vault[ansible_system] ] }}"

tasks/pkgs/yamlls.yml

@@ -1,7 +1,7 @@
 ---
 - ansible.builtin.include_tasks:
     file: pkgs/nodejs.yml
-  when: pkgconfig_nodejs is undefined
+  when: nodejs is undefined
 
 - name: add to npmpkgs
   ansible.builtin.set_fact:

tasks/pkgs/zfs.yml

@@ -1,10 +1,4 @@
 ---
-- ansible.builtin.include_vars:
-    file: zfs.yml
-    name: _zfs
-- ansible.builtin.set_fact:
-    pkgconfig_zfs: "{{ _zfs | ansible.builtin.combine(pkgconfig.zfs) }}"
-
 - name: Linux based installation
   block:
     - name: RedHat based configuration
@@ -17,20 +11,20 @@
 
         - name: add openzfs gpg_key
           ansible.builtin.rpm_key:
-            key: "{{ pkgconfig_zfs.gpg_key }}"
-            fingerprint: "{{ pkgconfig_zfs.gpg_key_fingerprint }}"
+            key: "{{ pkgconfig.zfs.gpg_key }}"
+            fingerprint: "{{ pkgconfig.zfs.gpg_key_fingerprint }}"
             state: present
           become: true
 
         - name: enable openzfs repository
           ansible.builtin.dnf:
-            name: "{{ pkgconfig_zfs.repo_base }}{{ rhname }}/zfs-release-{{ pkgconfig_zfs[rhname].release }}{{ rpm_dist.stdout }}.noarch.rpm"
+            name: "{{ pkgconfig.zfs.repo_base }}{{ rhname }}/zfs-release-{{ pkgconfig.zfs[rhname].release }}{{ rpm_dist.stdout }}.noarch.rpm"
             state: "{{ install_state }}"
           become: true
 
         - name: install zfs deps
           ansible.builtin.set_fact:
-            syspkgs: "{{ pkgconfig_zfs.deppkgs[ansible_os_family] }}"
+            syspkgs: "{{ pkgconfig.zfs.deps[ansible_os_family] }}"
       when: ansible_os_family == 'RedHat'
 
     - name: Debian configuration
@@ -58,12 +52,12 @@
 
         - name: install zfs deps
           ansible.builtin.set_fact:
-            syspkgs: "{{ pkgconfig_zfs.deppkgs[ansible_os_family] }}"
+            syspkgs: "{{ pkgconfig.zfs.deps[ansible_os_family] }}"
           become: true
 
     - name: append to pkgs
       ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + pkgconfig_zfs.pkgs[ansible_os_family] }}"
+        syspkgs: "{{ syspkgs + pkgconfig.zfs.pkgs[ansible_os_family] }}"
       become: true
   when: ansible_os_family != 'Darwin'