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'
 

vars/alacritty.yml

@@ -1,23 +1,3 @@
 ---
 version: 0.15.0
 install_prefix: "{{ default_config.install_prefix }}"
-
-# variables that aren't really configuration
-build_deps:
-  RedHat:
-    - cmake
-    - freetype-devel
-    - fontconfig-devel
-    - libxcb-devel
-    - libxkbcommon-devel
-    - g++
-  Debian:
-    - cmake
-    - pkg-config
-    - libfreetype6-dev
-    - libfontconfig1-dev
-    - libxcb-xfixes0-dev
-    - libxkbcommon-dev
-    - python3
-
-git_repo: https://github.com/alacritty/alacritty.git

vars/carapace.yml

@@ -1,8 +1,2 @@
 ---
 version: 1.1.1
-
-pkgs:
-  Linux:
-    - carapace-bin
-  Darwin:
-    - carapace

vars/clangd.yml

@@ -1,8 +0,0 @@
----
-pkgs:
-  RedHat:
-    - clang-devel
-  Debian:
-    - clangd-12
-  Darwin:
-    - llvm

vars/ghostty.yml

@@ -1,15 +1,7 @@
 ---
 version: v1.0.1
-git_repo: https://github.com/ghostty-org/ghostty
 optimize: ReleaseFast
 build: false
-become: true
+dobecome: true
 owner: root
 group: root
-build_deps:
-  Debian:
-    - libgtk-4-dev
-    - libadwaita-1-dev
-  RedHat:
-    - gtk4-devel
-    - libadwaita-devel

vars/git.yml

@@ -1,11 +0,0 @@
-pkgs:
-  Darwin:
-    - git
-    - git-delta
-    - git-extras
-    - git-lfs
-  Linux:
-    - git
-    - git-delta
-    - git-email
-    - git-lfs

vars/go.yml

@@ -1,29 +1,3 @@
 ---
 version: 1.23.6
 install_path: "{{ default_config.install_prefix }}"
-
-# checksums by version and ansible_system
-sums:
-  1.23.6:
-    Darwin:
-      amd64: sha256:7fa387c228b4dd69b518a5d9425638fa5c0d86ec8943de373e3802aff2e5b12a
-      arm64: sha256:a167758a44e08af6eddf844ed86a6acdbff1d3957248913bbca7ee4ef6ff07d0
-    Linux:
-      amd64: sha256:561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202
-      arm64: sha256:561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202
-  1.23.5:
-    Darwin:
-      amd64: sha256:d2b06bf0b8299e0187dfe2d8ad39bd3dd96a6d93fe4d1cfd42c7872452f4a0a2
-      arm64: sha256:f819ed94939e08a5016b9a607ec84ebbde6cb3fe59750c59d97aa300c3fd02df
-    Linux:
-      amd64: sha256:cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091
-      arm64: sha256:47c84d332123883653b70da2db7dd57d2a865921ba4724efcdf56b5da7021db0
-
-# maps used in variables
-archmap:
-  arm64: arm64
-  aarch64: arm64
-  x86_64: amd64
-extmap:
-  Darwin: pkg
-  Linux: tar.gz

vars/hashicorp_repo.yml

@@ -1,26 +0,0 @@
----
-Linux:
-  RedHat: &redhat
-    repo: https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
-  Fedora: &fedora
-    repo: https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
-  Debian: &debian
-    repo: "deb [arch={{ ansible_architecture }} signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com {{ ansible_distribution_release }} main"
-consul:
-  Linux: consul
-  Darwin: hashicorp/tap/consul
-nomad:
-  Linux: nomad
-  Darwin: hashicorp/tap/nomad
-terraform:
-  Linux: terraform
-  Darwin: hashicorp/tap/terraform
-terraformls:
-  Linux: terraform-ls
-  Darwin: hashicorp/tap/terraform-ls
-vault:
-  Linux: vault
-  Darwin: hashicorp/tap/vault
-packer:
-  Linux: packer
-  Darwin: packer

vars/jellyfin.yml

@@ -1,2 +0,0 @@
----
-doinstall: false

vars/kitty.yml

@@ -1,6 +0,0 @@
-pkgs:
-  Darwin:
-    - kitty
-  Linux:
-    - kitty
-    - kitty-shell-integration

vars/libreoffice.yml

@@ -1,8 +1,2 @@
 ---
 use_flatpak: false
-flatpak:
-  - org.libreoffice.LibreOffice
-Debian:
-  - libreoffice
-RedHat:
-  - libreoffice

vars/lua-language-server.yml

@@ -1,11 +1,3 @@
 version: 3.13.5
 install_prefix: "{{ default_config.install_prefix }}"
 install_path: /opt/lua-language-server
-base_url: https://github.com/LuaLS/lua-language-server/releases/download
-sysmap:
-  Darwin: darwin
-  Linux: linux
-archmap:
-  aarch64: arm64
-  arm64: arm64
-  x86_64: x64

vars/main.yml

@@ -31,7 +31,25 @@ tappkgs: []
 # when running the role by specifying
 # pkgconfig.<pkgname> as a dict
 pkgconfig:
-  alacritty: {}
+  alacritty:
+    deps:
+      RedHat:
+        - cmake
+        - freetype-devel
+        - fontconfig-devel
+        - libxcb-devel
+        - libxkbcommon-devel
+        - g++
+      Debian:
+        - cmake
+        - pkg-config
+        - libfreetype6-dev
+        - libfontconfig1-dev
+        - libxcb-xfixes0-dev
+        - libxkbcommon-dev
+        - python3
+    git_repo: https://github.com/alacritty/alacritty.git
+
   bitwarden: {}
   broot:
     deps:
@@ -43,9 +61,23 @@ pkgconfig:
         - libxcb-xfixes0-dev
       RedHat:
         - libxcb
-  carapace: {}
-  clangd: {}
-  consul: {}
+  carapace:
+    pkgs:
+      Linux:
+        - carapace-bin
+      Darwin:
+        - carapace
+  clangd:
+    pkgs:
+      RedHat:
+        - clang-devel
+      Debian:
+        - clangd-12
+      Darwin:
+        - llvm
+  consul:
+    Linux: consul
+    Darwin: hashicorp/tap/consul
   fd:
     pkg:
       Darwin:
@@ -54,28 +86,379 @@ pkgconfig:
         - fd-find
       Debian:
         - fd-find
-  ghostty: {}
-  git: {}
-  go: {}
-  hashicorp: {}
+  flatpak: {}
+  ghostty:
+    deps:
+      Debian:
+        - libgtk-4-dev
+        - libadwaita-1-dev
+      RedHat:
+        - gtk4-devel
+        - libadwaita-devel
+    git_repo: https://github.com/ghostty-org/ghostty
+  git:
+    pkgs:
+      Darwin:
+        - git
+        - git-delta
+        - git-extras
+        - git-lfs
+      Linux:
+        - git
+        - git-delta
+        - git-email
+        - git-lfs
+  go:
+    archmap:
+      arm64: arm64
+      aarch64: arm64
+      x86_64: amd64
+    extmap:
+      Darwin: pkg
+      Linux: tar.gz
+    sums:
+      1.23.6:
+        Darwin:
+          amd64: sha256:7fa387c228b4dd69b518a5d9425638fa5c0d86ec8943de373e3802aff2e5b12a
+          arm64: sha256:a167758a44e08af6eddf844ed86a6acdbff1d3957248913bbca7ee4ef6ff07d0
+        Linux:
+          amd64: sha256:561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202
+          arm64: sha256:561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202
+      1.23.5:
+        Darwin:
+          amd64: sha256:d2b06bf0b8299e0187dfe2d8ad39bd3dd96a6d93fe4d1cfd42c7872452f4a0a2
+          arm64: sha256:f819ed94939e08a5016b9a607ec84ebbde6cb3fe59750c59d97aa300c3fd02df
+        Linux:
+          amd64: sha256:cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091
+          arm64: sha256:47c84d332123883653b70da2db7dd57d2a865921ba4724efcdf56b5da7021db0
+  hashicorp:
+    Linux:
+      RedHat:
+        repo: https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
+      Fedora:
+        repo: https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
+      Debian:
+        repo: "deb [arch={{ ansible_architecture }} signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com {{ ansible_distribution_release }} main"
   jellyfin: {}
-  kitty: {}
-  libreoffice: {}
-  luals: {}
-  neovide: {}
-  neovim: {}
-  nerdfonts: {}
-  nodejs: {}
-  nomad: {}
-  nushell: {}
-  packer: {}
-  python3: {}
-  rust: {}
-  tailscale: {}
-  terraform: {}
-  terraformls: {}
-  terrarepo: {}
-  tidy: {}
-  zfs: {}
-  zig: {}
-  zls: {}
+  kitty:
+    pkgs:
+      Darwin:
+        - kitty
+      Linux:
+        - kitty
+        - kitty-shell-integration
+  libreoffice:
+    flatpak:
+      - org.libreoffice.LibreOffice
+    Debian:
+      - libreoffice
+    RedHat:
+      - libreoffice
+  luals:
+    base_url: https://github.com/LuaLS/lua-language-server/releases/download
+    sysmap:
+      Darwin: darwin
+      Linux: linux
+    archmap:
+      aarch64: arm64
+      arm64: arm64
+      x86_64: x64
+  neovide:
+    git_repo: https://github.com/neovide/neovide.git
+    deps:
+      RedHat:
+        - fontconfig-devel
+        - freetype-devel
+        - libX11-xcb
+        - libX11-devel
+        - libstdc++-static
+        - libstdc++-devel
+        - "@Development Tools"
+        - "@Development Libraries"
+      Debian:
+        - fontconfig-devel
+        - freetype-devel
+        - libX11-xcb
+        - libX11-devel
+        - libstdc++-static
+        - libstdc++-devel
+        - "@Development Tools"
+        - "@Development Libraries"
+  neovim:
+    git_repo: https://github.com/neovim/neovim
+    appimage_url_pfx: https://github.com/neovim/neovim/releases/download
+  nerdfonts:
+    fonts:
+      0xProto:
+        brew: font-0xproto-nerd-font
+      "3270":
+        brew: font-3270-nerd-font
+      Agave:
+        brew: font-agave-nerd-font
+      AnonymousPro:
+        brew: font-anonymice-nerd-font
+      Arimo:
+        brew: font-arimo-nerd-font
+      AurulentSansMono:
+        brew: font-aurulent-sans-mono-nerd-font
+      BigBlueTerminal:
+        brew: font-bigblue-terminal-nerd-font
+      BitstreamVeraSansMono:
+        brew: font-bitstream-vera-sans-mono-nerd-font
+      IBMPlexMono:
+        brew: font-blex-mono-nerd-font
+      CascadiaCode:
+        brew: font-caskaydia-cove-nerd-font
+      CascadiaMono:
+        brew: font-caskaydia-mono-nerd-font
+      CodeNewRoman:
+        brew: font-code-new-roman-nerd-font
+      ComicShannsMono:
+        brew: font-comic-shanns-mono-nerd-font
+      CommitMono:
+        brew: font-commit-mono-nerd-font
+      Cousine:
+        brew: font-cousine-nerd-font
+      D2Coding:
+        brew: font-d2coding-nerd-font
+      DaddyTimeMono:
+        brew: font-daddy-time-mono-nerd-font
+      DejaVuSansMono:
+        brew: font-dejavu-sans-mono-nerd-font
+      DepartureMono:
+        brew: font-departure-mono-nerd-font
+      DroidSansMono:
+        brew: font-droid-sans-mono-nerd-font
+      EnvyCodeR:
+        brew: font-envy-code-r-nerd-font
+      FantasqueSansMono:
+        brew: font-fantasque-sans-mono-nerd-font
+      FiraCode:
+        brew: font-fira-code-nerd-font
+      FiraMono:
+        brew: font-fira-mono-nerd-font
+      GeistMono:
+        brew: font-geist-mono-nerd-font
+      Go-Mono:
+        brew: font-go-mono-nerd-font
+      Gohu:
+        brew: font-gohufont-nerd-font
+      Hack:
+        brew: font-hack-nerd-font
+      Hasklig:
+        brew: font-hasklug-nerd-font
+      HeavyData:
+        brew: font-heavy-data-nerd-font
+      Hermit:
+        brew: font-hurmit-nerd-font
+      IA-Writer:
+        brew: font-im-writing-nerd-font
+      InconsolataGo:
+        brew: font-inconsolata-go-nerd-font
+      InconsolataLGC:
+        brew: font-inconsolata-lgc-nerd-font
+      Inconsolata:
+        brew: font-inconsolata-nerd-font
+      IntelOneMono:
+        brew: font-intone-mono-nerd-font
+      Iosevka:
+        brew: font-iosevka-nerd-font
+      IosevkaTerm:
+        brew: font-iosevka-term-nerd-font
+      IosevkaTermSlab:
+        brew: font-iosevka-term-slab-nerd-font
+      JetBrainsMono:
+        brew: font-jetbrains-mono-nerd-font
+      Lekton:
+        brew: font-lekton-nerd-font
+      LiberationMono:
+        brew: font-liberation-nerd-font
+      Lilex:
+        brew: font-lilex-nerd-font
+      MPlus:
+        brew: font-m+-nerd-font
+      MartianMono:
+        brew: font-martian-mono-nerd-font
+      Meslo:
+        brew: font-meslo-lg-nerd-font
+      Monaspace:
+        brew: font-monaspace-nerd-font
+      Monofur:
+        brew: font-monofur-nerd-font
+      Mononoki:
+        brew: font-mononoki-nerd-font
+      Monoid:
+        brew: font-monoid-nerd-font
+      NerdFontsSymbolsOnly:
+        brew: font-symbols-only-nerd-font
+      Noto:
+        brew: font-noto-nerd-font
+      OpenDyslexic:
+        brew: font-open-dyslexic-nerd-font
+      Overpass:
+        brew: font-overpass-nerd-font
+      ProFont:
+        brew: font-profont-nerd-font
+      ProggyClean:
+        brew: font-proggy-clean-tt-nerd-font
+      Recursive:
+        brew: font-recursive-mono-nerd-font
+      RobotoMono:
+        brew: font-roboto-mono-nerd-font
+      SourceCodePro:
+        brew: font-sauce-code-pro-nerd-font
+      ShareTechMono:
+        brew: font-shure-tech-mono-nerd-font
+      SpaceMono:
+        brew: font-space-mono-nerd-font
+      Terminus:
+        brew: font-terminess-ttf-nerd-font
+      Tinos:
+        brew: font-tinos-nerd-font
+      UbuntuMono:
+        brew: font-ubuntu-mono-nerd-font
+      Ubuntu:
+        brew: font-ubuntu-nerd-font
+      UbuntuSans:
+        brew: font-ubuntu-sans-nerd-font
+      VictorMono:
+        brew: font-victor-mono-nerd-font
+      ZedMono:
+        brew: font-zed-mono-nerd-font
+    base_url: https://github.com/ryanoasis/nerd-fonts/releases/latest/download
+  nodejs:
+    pkgs:
+      Darwin:
+        - node
+      Linux:
+        - nodejs
+        - npm
+  nomad:
+    Linux: nomad
+    Darwin: hashicorp/tap/nomad
+  nushell:
+    deps:
+      Darwin:
+        - openssl
+        - cmake
+      Debian:
+        - pkg-config
+        - libssl-dev
+        - build-essential
+      RedHat:
+        - libxcb
+        - openssl-devel
+        - libX11-devel
+    nupkgs_extra: []
+    nupkgs_common:
+      - nu
+      - nu_plugin_compress
+      - nu_plugin_desktop_notifications
+      - nu_plugin_dns
+      - nu_plugin_file_dialog
+      - nu_plugin_formats
+      - nu_plugin_gstat
+      - nu_plugin_hashes
+      - nu_plugin_hcl
+      - nu_plugin_highlight
+      - nu_plugin_inc
+      - nu_plugin_json_path
+      - nu_plugin_net
+      - nu_plugin_polars
+      - nu_plugin_query
+      - nu_plugin_selector
+    pkgs:
+      Darwin:
+        - nu_plugin_plist
+      Debian: []
+      RedHat:
+        - nu_plugin_rpm
+  packer:
+    Linux: packer
+    Darwin: packer
+  python3:
+    pkgs:
+      Darwin:
+        - python3
+      Linux:
+        - python3
+        - python3-pip
+  rust:
+    pkgs:
+      Darwin:
+        - rust
+      Linux:
+        - rustc
+        - cargo
+  tailscale:
+    url_base: https://pkgs.tailscale.com/stable
+    release:
+      bookworm:
+        gpg: bookworm.noarmor.gpg
+        list: bookworm.tailscale-keyring.list
+      bullseye:
+        gpg: bullseye.noarmor.gpg
+        list: bullseye.tailscale-keyring.list
+      buster:
+        gpg: buster.gpg
+        list: buster.list
+      stretch:
+        gpg: stretch.gpg
+        list: stretch.list
+  terraform:
+    Linux: terraform
+    Darwin: hashicorp/tap/terraform
+  terraformls:
+    Linux: terraform-ls
+    Darwin: hashicorp/tap/terraform-ls
+  terrarepo:
+    repo: https://terra.fyralabs.com/terra.repo
+  tidy:
+    pkgs:
+      Darwin:
+        - tidy-html5
+      Linux:
+        - tidy
+  vault:
+    Linux: vault
+    Darwin: hashicorp/tap/vault
+  zfs:
+    repo_base: https://zfsonlinux.org
+    gpg_key: https://raw.githubusercontent.com/zfsonlinux/zfsonlinux.github.com/master/zfs-release/RPM-GPG-KEY-openzfs-key2
+    gpg_key_fingerprint: 7DC7 299D CF7C 7FD9 CD87 701B A599 FD5E 9DB8 4141
+    fedora:
+      release: 2-6
+    epel:
+       release: 2-3
+    pkgs:
+      RedHat:
+        - zfs
+      Debian:
+        - zfs-dkms
+        - zfsutils-linux
+    deps:
+      RedHat:
+        - kernel-devel
+        - epel-release
+      Debian:
+        - dpkg-dev
+        - linux-headers-generic
+        - linux-image-generic
+  zig:
+    base_url: https://ziglang.org/download
+    sysmap:
+      Darwin: macos
+      Linux: linux
+    archmap:
+      aarch64: aarch64
+      arm64: aarch64
+      x86_64: x86_64
+  zls:
+    base_url: https://builds.zigtools.org
+    sysmap:
+      Darwin: macos
+      Linux: linux
+    archmap:
+      aarch64: aarch64
+      arm64: aarch64
+      x86_64: x86_64

vars/neovide.yml

@@ -1,25 +1,3 @@
 ---
 version: 0.14.0
 install_prefix: "{{ default_config.install_prefix }}"
-
-#required variables
-git_repo: https://github.com/neovide/neovide.git
-pkgdeps:
-  RedHat:
-    - fontconfig-devel
-    - freetype-devel
-    - libX11-xcb
-    - libX11-devel
-    - libstdc++-static
-    - libstdc++-devel
-    - "@Development Tools"
-    - "@Development Libraries"
-  Debian:
-    - fontconfig-devel
-    - freetype-devel
-    - libX11-xcb
-    - libX11-devel
-    - libstdc++-static
-    - libstdc++-devel
-    - "@Development Tools"
-    - "@Development Libraries"

vars/neovim.yml

@@ -6,7 +6,5 @@ use_appimage: true
 use_syspkg: true
 build_type: Release
 dobecome: true
-git_repo: https://github.com/neovim/neovim
-appimage_url_pfx: https://github.com/neovim/neovim/releases/download
 owner: root
 group: root

vars/nerdfonts.yml

@@ -7,144 +7,3 @@ install:
   - Monoid
   - NerdFontsSymbolsOnly
 system_install: false
-
-#mapping of fonts
-fonts:
-  0xProto:
-    brew: font-0xproto-nerd-font
-  "3270":
-    brew: font-3270-nerd-font
-  Agave:
-    brew: font-agave-nerd-font
-  AnonymousPro:
-    brew: font-anonymice-nerd-font
-  Arimo:
-    brew: font-arimo-nerd-font
-  AurulentSansMono:
-    brew: font-aurulent-sans-mono-nerd-font
-  BigBlueTerminal:
-    brew: font-bigblue-terminal-nerd-font
-  BitstreamVeraSansMono:
-    brew: font-bitstream-vera-sans-mono-nerd-font
-  IBMPlexMono:
-    brew: font-blex-mono-nerd-font
-  CascadiaCode:
-    brew: font-caskaydia-cove-nerd-font
-  CascadiaMono:
-    brew: font-caskaydia-mono-nerd-font
-  CodeNewRoman:
-    brew: font-code-new-roman-nerd-font
-  ComicShannsMono:
-    brew: font-comic-shanns-mono-nerd-font
-  CommitMono:
-    brew: font-commit-mono-nerd-font
-  Cousine:
-    brew: font-cousine-nerd-font
-  D2Coding:
-    brew: font-d2coding-nerd-font
-  DaddyTimeMono:
-    brew: font-daddy-time-mono-nerd-font
-  DejaVuSansMono:
-    brew: font-dejavu-sans-mono-nerd-font
-  DepartureMono:
-    brew: font-departure-mono-nerd-font
-  DroidSansMono:
-    brew: font-droid-sans-mono-nerd-font
-  EnvyCodeR:
-    brew: font-envy-code-r-nerd-font
-  FantasqueSansMono:
-    brew: font-fantasque-sans-mono-nerd-font
-  FiraCode:
-    brew: font-fira-code-nerd-font
-  FiraMono:
-    brew: font-fira-mono-nerd-font
-  GeistMono:
-    brew: font-geist-mono-nerd-font
-  Go-Mono:
-    brew: font-go-mono-nerd-font
-  Gohu:
-    brew: font-gohufont-nerd-font
-  Hack:
-    brew: font-hack-nerd-font
-  Hasklig:
-    brew: font-hasklug-nerd-font
-  HeavyData:
-    brew: font-heavy-data-nerd-font
-  Hermit:
-    brew: font-hurmit-nerd-font
-  IA-Writer:
-    brew: font-im-writing-nerd-font
-  InconsolataGo:
-    brew: font-inconsolata-go-nerd-font
-  InconsolataLGC:
-    brew: font-inconsolata-lgc-nerd-font
-  Inconsolata:
-    brew: font-inconsolata-nerd-font
-  IntelOneMono:
-    brew: font-intone-mono-nerd-font
-  Iosevka:
-    brew: font-iosevka-nerd-font
-  IosevkaTerm:
-    brew: font-iosevka-term-nerd-font
-  IosevkaTermSlab:
-    brew: font-iosevka-term-slab-nerd-font
-  JetBrainsMono:
-    brew: font-jetbrains-mono-nerd-font
-  Lekton:
-    brew: font-lekton-nerd-font
-  LiberationMono:
-    brew: font-liberation-nerd-font
-  Lilex:
-    brew: font-lilex-nerd-font
-  MPlus:
-    brew: font-m+-nerd-font
-  MartianMono:
-    brew: font-martian-mono-nerd-font
-  Meslo:
-    brew: font-meslo-lg-nerd-font
-  Monaspace:
-    brew: font-monaspace-nerd-font
-  Monofur:
-    brew: font-monofur-nerd-font
-  Mononoki:
-    brew: font-mononoki-nerd-font
-  Monoid:
-    brew: font-monoid-nerd-font
-  NerdFontsSymbolsOnly:
-    brew: font-symbols-only-nerd-font
-  Noto:
-    brew: font-noto-nerd-font
-  OpenDyslexic:
-    brew: font-open-dyslexic-nerd-font
-  Overpass:
-    brew: font-overpass-nerd-font
-  ProFont:
-    brew: font-profont-nerd-font
-  ProggyClean:
-    brew: font-proggy-clean-tt-nerd-font
-  Recursive:
-    brew: font-recursive-mono-nerd-font
-  RobotoMono:
-    brew: font-roboto-mono-nerd-font
-  SourceCodePro:
-    brew: font-sauce-code-pro-nerd-font
-  ShareTechMono:
-    brew: font-shure-tech-mono-nerd-font
-  SpaceMono:
-    brew: font-space-mono-nerd-font
-  Terminus:
-    brew: font-terminess-ttf-nerd-font
-  Tinos:
-    brew: font-tinos-nerd-font
-  UbuntuMono:
-    brew: font-ubuntu-mono-nerd-font
-  Ubuntu:
-    brew: font-ubuntu-nerd-font
-  UbuntuSans:
-    brew: font-ubuntu-sans-nerd-font
-  VictorMono:
-    brew: font-victor-mono-nerd-font
-  ZedMono:
-    brew: font-zed-mono-nerd-font
-
-base_url: https://github.com/ryanoasis/nerd-fonts/releases/latest/download

vars/nodejs.yml

@@ -1,7 +0,0 @@
----
-pkgs:
-  Darwin:
-    - node
-  Linux:
-    - nodejs
-    - npm

vars/nomad.yml

@@ -1,7 +0,0 @@
----
-Darwin:
-  pkgs:
-    - hashicorp/tap/nomad
-Linux:
-  pkgs:
-    - nomad

vars/nushell.yml

@@ -1,55 +1,2 @@
 ---
-deps:
-  - rust
-  - carapace
-build_deps:
-  Darwin:
-    - openssl
-    - cmake
-  Debian:
-    - pkg-config
-    - libssl-dev
-    - build-essential
-  RedHat:
-    - libxcb
-    - openssl-devel
-    - libX11-devel
-
-pkgs_common:
-  - nu
-  - nu_plugin_compress
-  - nu_plugin_desktop_notifications
-  - nu_plugin_dns
-  - nu_plugin_file_dialog
-  - nu_plugin_formats
-  - nu_plugin_gstat
-  - nu_plugin_gstat
-  - nu_plugin_hashes
-  - nu_plugin_hcl
-  - nu_plugin_highlight
-  - nu_plugin_inc
-  - nu_plugin_json_path
-  - nu_plugin_json_path
-  - nu_plugin_net
-  - nu_plugin_net
-  - nu_plugin_polars
-  - nu_plugin_prometheus
-  - nu_plugin_qr_maker
-  - nu_plugin_query
-  - nu_plugin_selector
-  - nu_plugin_semver
-  - nu_plugin_units
-  - nu_plugin_unzip
-  - nu_plugin_xpath
-
-pkgs:
-  Darwin:
-    - nu_plugin_plist
-  Debian:
-    - nu_plugin_dbus
-    - nu_plugin_rpm
-    - nu_plugin_sys
-  RedHat:
-    - nu_plugin_dbus
-    - nu_plugin_rpm
-    - nu_plugin_sys
+install_extra: true

vars/python3.yml

@@ -1,6 +0,0 @@
-pkgs:
-  Darwin:
-    - python3
-  Linux:
-    - python3
-    - python3-pip

vars/rust.yml

@@ -1,7 +1 @@
 rustup_managed: false
-pkgs:
-  Darwin:
-    - rust
-  Linux:
-    - rustc
-    - cargo

vars/tailscale.yml

@@ -1,15 +0,0 @@
----
-url_base: https://pkgs.tailscale.com/stable
-release:
-  bookworm:
-    gpg: bookworm.noarmor.gpg
-    list: bookworm.tailscale-keyring.list
-  bullseye:
-    gpg: bullseye.noarmor.gpg
-    list: bullseye.tailscale-keyring.list
-  buster:
-    gpg: buster.gpg
-    list: buster.list
-  stretch:
-    gpg: stretch.gpg
-    list: stretch.list

vars/terrarepo.yml

@@ -1,3 +0,0 @@
----
-Fedora:
-  repo: https://terra.fyralabs.com/terra.repo

vars/tidy.yml

@@ -1,5 +0,0 @@
-pkgs:
-  Darwin:
-    - tidy-html5
-  Linux:
-    - tidy

vars/zfs.yml

@@ -1,21 +0,0 @@
-repo_base: https://zfsonlinux.org
-gpg_key: https://raw.githubusercontent.com/zfsonlinux/zfsonlinux.github.com/master/zfs-release/RPM-GPG-KEY-openzfs-key2
-gpg_key_fingerprint: 7DC7 299D CF7C 7FD9 CD87 701B A599 FD5E 9DB8 4141
-fedora:
-  release: 2-6
-epel:
-   release: 2-3
-pkgs:
-  RedHat:
-    - zfs
-  Debian:
-    - zfs-dkms
-    - zfsutils-linux
-deppkgs:
-  RedHat:
-    - kernel-devel
-    - epel-release
-  Debian:
-    - dpkg-dev
-    - linux-headers-generic
-    - linux-image-generic

vars/zig.yml

@@ -2,11 +2,3 @@
 version: 0.13.0
 install_prefix: "{{ default_config.install_prefix }}"
 install_path: /opt/zig
-base_url: https://ziglang.org/download
-sysmap:
-  Darwin: macos
-  Linux: linux
-archmap:
-  aarch64: aarch64
-  arm64: aarch64
-  x86_64: x86_64

vars/zls.yml

@@ -2,11 +2,3 @@
 version: 0.13.0
 install_prefix: "{{ default_config.install_prefix }}"
 install_path: /opt/zls
-base_url: https://builds.zigtools.org
-sysmap:
-  Darwin: macos
-  Linux: linux
-archmap:
-  aarch64: aarch64
-  arm64: aarch64
-  x86_64: x86_64