From f8585192d5c2523db92c38bc87115b1f9d0fb941 Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Fri, 24 Jan 2025 17:41:21 -0700
Subject: [PATCH] working on better pkgconfig

---
 tasks/build/go.yml |  12 ++---
 tasks/set_vars.yml | 127 +++++++++++++++++++++++++++++++++++++++++++++
 vars/main.yml      |  24 +++++++++
 3 files changed, 157 insertions(+), 6 deletions(-)
 create mode 100644 tasks/set_vars.yml

diff --git a/tasks/build/go.yml b/tasks/build/go.yml
index 277cd91..7d2dd56 100644
--- a/tasks/build/go.yml
+++ b/tasks/build/go.yml
@@ -15,7 +15,7 @@
     - name: set go arch
       ansible.builtin.set_fact:
         arch: "{{ _go.archmap[ansible_architecture] }}"
-    
+
     - name: set go archive filename
       ansible.builtin.set_fact:
         go_archive: "go{{ _go.version }}.{{ ansible_system | lower }}-{{ arch }}.{{ _go.extmap[ansible_system] }}"
@@ -23,13 +23,13 @@
         - dev
         - go
         - debug
-    
+
     - name: create temp path
       ansible.builtin.tempfile:
         state: directory
         prefix: go_dl.
       register: d_go_dl_tmp
-    
+
     - name: download go archive
       become: true
       ansible.builtin.get_url:
@@ -40,13 +40,13 @@
       tags:
         - dev
         - go
-    
+
     - name: ensure go install dir exists
       become: true
       ansible.builtin.file:
         path: "{{ _go.install_path }}"
         state: directory
-    
+
     - name: extract go package
       ansible.builtin.unarchive:
         dest: "{{ _go.install_path }}"
@@ -54,7 +54,7 @@
         remote_src: true
       when: ansible_system == 'Linux'
       become: true
-    
+
     - name: install go macOS use pkg file
       ansible.builtin.command:
         cmd: "installer -pkg {{ d_go_dl_tmp.path }}/{{ go_archive }} -target /"
diff --git a/tasks/set_vars.yml b/tasks/set_vars.yml
new file mode 100644
index 0000000..423c95e
--- /dev/null
+++ b/tasks/set_vars.yml
@@ -0,0 +1,127 @@
+# load namespaced variables and merge with passed in values
+---
+- ansible.builtin.include_vars:
+    file: alacritty.yml
+    name: _alacritty
+- ansible.builtin.set_fact:
+    pkgconfig.alacritty: "{{ _alacritty | ansible.builtin.combine(pkgconfig.alacritty) }}"
+
+- ansible.builtin.include_vars:
+    file: carapace.yml
+    name: _carapace
+- ansible.builtin.set_fact:
+    pkgconfig.carapace: "{{ _carapace | ansible.builtin.combine(pkgconfig.carapace) }}"
+
+- ansible.builtin.include_vars:
+    file: consul.yml
+    name: _consul
+- ansible.builtin.set_fact:
+    pkgconfig.consul: "{{ _consul | ansible.builtin.combine(pkgconfig.consul) }}"
+
+- ansible.builtin.include_vars:
+    file: git.yml
+    name: _git
+- ansible.builtin.set_fact:
+    pkgconfig.git: "{{ _git | ansible.builtin.combine(pkgconfig.git) }}"
+
+- ansible.builtin.include_vars:
+    file: go.yml
+    name: _go
+- ansible.builtin.set_fact:
+    pkgconfig.go: "{{ _go | ansible.builtin.combine(pkgconfig.go) }}"
+
+- ansible.builtin.include_vars:
+    file: hashicorp_repo.yml
+    name: _hashicorp_repo
+- ansible.builtin.set_fact:
+    pkgconfig.hashicorp_repo: "{{ _hashicorp_repo | ansible.builtin.combine(pkgconfig.hashicorp_repo) }}"
+
+- ansible.builtin.include_vars:
+    file: kitty.yml
+    name: _kitty
+- ansible.builtin.set_fact:
+    pkgconfig.kitty: "{{ _kitty | ansible.builtin.combine(pkgconfig.kitty) }}"
+
+- ansible.builtin.include_vars:
+    file: neovide.yml
+    name: _neovide
+- ansible.builtin.set_fact:
+    pkgconfig.neovide: "{{ _neovide | ansible.builtin.combine(pkgconfig.neovide) }}"
+
+- ansible.builtin.include_vars:
+    file: neovim.yml
+    name: _neovim
+- ansible.builtin.set_fact:
+    pkgconfig.neovim: "{{ _neovim | ansible.builtin.combine(pkgconfig.neovim) }}"
+
+- ansible.builtin.include_vars:
+    file: nerdfonts.yml
+    name: _nerdfonts
+- ansible.builtin.set_fact:
+    pkgconfig.nerdfonts: "{{ _nerdfonts | ansible.builtin.combine(pkgconfig.nerdfonts) }}"
+
+- ansible.builtin.include_vars:
+    file: nodejs.yml
+    name: _nodejs
+- ansible.builtin.set_fact:
+    pkgconfig.nodejs: "{{ _nodejs | ansible.builtin.combine(pkgconfig.nodejs) }}"
+
+- ansible.builtin.include_vars:
+    file: nomad.yml
+    name: _nomad
+- ansible.builtin.set_fact:
+    pkgconfig.nomad: "{{ _nomad | ansible.builtin.combine(pkgconfig.nomad) }}"
+
+- ansible.builtin.include_vars:
+    file: nushell.yml
+    name: _nushell
+- ansible.builtin.set_fact:
+    pkgconfig.nushell: "{{ _nushell | ansible.builtin.combine(pkgconfig.nushell) }}"
+
+- ansible.builtin.include_vars:
+    file: packer.yml
+    name: _packer
+- ansible.builtin.set_fact:
+    pkgconfig.packer: "{{ _packer | ansible.builtin.combine(pkgconfig.packer) }}"
+
+- ansible.builtin.include_vars:
+    file: python3.yml
+    name: _python3
+- ansible.builtin.set_fact:
+    pkgconfig.python3: "{{ _python3 | ansible.builtin.combine(pkgconfig.python3) }}"
+
+- ansible.builtin.include_vars:
+    file: rust.yml
+    name: _rust
+- ansible.builtin.set_fact:
+    pkgconfig.rust: "{{ _rust | ansible.builtin.combine(pkgconfig.rust) }}"
+
+- ansible.builtin.include_vars:
+    file: terraform.yml
+    name: _terraform
+- ansible.builtin.set_fact:
+    pkgconfig.terraform: "{{ _terraform | ansible.builtin.combine(pkgconfig.terraform) }}"
+
+- ansible.builtin.include_vars:
+    file: terrarepo.yml
+    name: _terrarepo
+- ansible.builtin.set_fact:
+    pkgconfig.terrarepo: "{{ _terrarepo | ansible.builtin.combine(pkgconfig.terrarepo) }}"
+
+- ansible.builtin.include_vars:
+    file: tidy.yml
+    name: _tidy
+- ansible.builtin.set_fact:
+    pkgconfig.tidy: "{{ _tidy | ansible.builtin.combine(pkgconfig.tidy) }}"
+
+- ansible.builtin.include_vars:
+    file: zfs.yml
+    name: _zfs
+- ansible.builtin.set_fact:
+    pkgconfig.zfs: "{{ _zfs | ansible.builtin.combine(pkgconfig.zfs) }}"
+
+- ansible.builtin.include_vars:
+    file: zig.yml
+    name: _zig
+- ansible.builtin.set_fact:
+    pkgconfig.zig: "{{ _zig | ansible.builtin.combine(pkgconfig.zig) }}"
diff --git a/vars/main.yml b/vars/main.yml
index ab77f7e..5023e48 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -15,3 +15,27 @@ pipxpkgs: []
 srcpkgs: []
 syspkgs: []
 tappkgs: []
+
+# namespaced package variables
+pkgconfig:
+  alacritty: {}
+  carapace: {}
+  consul: {}
+  git: {}
+  go: {}
+  hashicorp_repo: {}
+  kitty: {}
+  neovide: {}
+  neovim: {}
+  nerdfonts: {}
+  nodejs: {}
+  nomad: {}
+  nushell: {}
+  packer: {}
+  python3: {}
+  rust: {}
+  terraform: {}
+  terrarepo: {}
+  tidy: {}
+  zfs: {}
+  zig: {}