fixing and adding packages

tasks/Darwin/alacritty.yml

@@ -1,7 +1,7 @@
 ---
 - name: append alacritty to caskpkgs
   set_fact:
-    caskpkgs: "{{ (caskpkgs | default([])) + [ 'alacritty' ] }}"
+    caskpkgs: "{{ caskpkgs + [ 'alacritty' ] }}"
   tags:
     - MacOS
     - brew

tasks/Darwin/ansible.yml

@@ -1,7 +1,7 @@
 ---
 - name: append ansible to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'ansible' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'ansible' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/btop.yml

@@ -1,7 +1,7 @@
 ---
 - name: append btop to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'btop' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'btop' ]}}"
   tags:
     - MacOS
     - brew

tasks/Darwin/carapace.yml

@@ -1,7 +1,7 @@
 ---
 - name: append carapace to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'carapace' ] }}"
+    brewpkgs: "{{ brewpkgs + [ 'carapace' ] }}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/cmake.yml

@@ -1,7 +1,7 @@
 ---
 - name: append cmake to caskpkgs
   set_fact:
-    caskpkgs: "{{ (caskpkgs | default([])) + [ 'homebrew/cask/cmake' ] }}"
+    caskpkgs: "{{ caskpkgs + [ 'homebrew/cask/cmake' ] }}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/editorconfig.yml

@@ -1,7 +1,7 @@
 ---
 - name: append editorconfig to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'editorconfig' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'editorconfig' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/firefox.yml

@@ -1,7 +1,7 @@
 ---
 - name: append firefox to caskpkgs
   set_fact:
-    caskpkgs: "{{ (caskpkgs | default([])) + [ 'firefox' ] }}"
+    caskpkgs: "{{ caskpkgs + [ 'firefox' ] }}"
   tags:
     - packages
     - MacOS

tasks/Darwin/fzf.yml

@@ -1,7 +1,7 @@
 ---
 - name: append fzf to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'fzf' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'fzf' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/ghostty.yml

@@ -1,7 +1,7 @@
 ---
 - name: append ghostty to caskpkgs
   set_fact:
-    caskpkgs: "{{ (caskpkgs | default([])) + [ 'ghostty' ] }}"
+    caskpkgs: "{{ caskpkgs + [ 'ghostty' ] }}"
   tags:
     - MacOS
     - brew

tasks/Darwin/git.yml

@@ -13,7 +13,7 @@
 
 - name: append git to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + git_pkgs }}"
+    brewpkgs: "{{ brewpkgs + git_pkgs }}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/go.yml

@@ -1,35 +1,35 @@
 ---
-- name: Set go Filename
+- name: set go arch
   ansible.builtin.set_fact:
-    goFilename: "go{{ go.version }}.darwin-{{ arch[ansible_architecture] }}.{{ go.darwin.extension }}"
+    arch: "{% if ansible_archtecture == 'aarch64' %}arm64{% else %}amd64{% endif %}"
+
+- name: set go Filename
+  ansible.builtin.set_fact:
+    goFilename: "go{{ versions.go }}.darwin-{{ arch }}.pkg"
   tags:
     - dev
     - go
 
-- name: Download latest go package for MacOS
-  become: true
+- name: create temp path
+  ansible.builtin.tempfile:
+    state: directory
+    prefix: go_dl.
+  register: d_go_dl_tmp
+
+- name: download latest go package for macOS
   ansible.builtin.get_url:
-    dest: "/tmp/{{ goFilename }}"
+    dest: "{{ d_go_dl_tmp.path }}/{{ goFilename }}"
     url: "https://go.dev/dl/{{ goFilename }}"
-    checksum: "sha256:{{ go.darwin.sum[ansible_architecture] }}"
+    checksum: "{{ _go[versions.go].Darwin[arch] }}"
     decompress: false
   tags:
     - dev
     - go
 
-- name: Install go MacOS use pkg file
+- name: install go macOS use pkg file
   become: true
   ansible.builtin.command:
-    cmd: "installer -pkg /tmp/{{ goFilename }} -target /"
-  tags:
-    - dev
-    - go
-
-- name: Cleanup go package download
-  become: true
-  ansible.builtin.file:
-    path: "/tmp/{{ goFilename }}"
-    state: absent
+    cmd: "installer -pkg {{ d_go_dl_tmp.path }}/{{ goFilename }} -target /"
   tags:
     - dev
     - go

tasks/Darwin/hugo.yml

@@ -1,7 +1,7 @@
 ---
 - name: append hugo to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'hugo' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'hugo' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/iterm2.yml

@@ -1,4 +1,4 @@
 ---
 - name: append iterm2 to caskpkgs
   set_fact:
-    caskpkgs: "{{ (caskpkgs | default([])) + [ 'iterm2' ] }}"
+    caskpkgs: "{{ caskpkgs + [ 'iterm2' ] }}"

tasks/Darwin/jq.yml

@@ -1,7 +1,7 @@
 ---
 - name: append jq to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'jq' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'jq' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/neovide.yml

@@ -1,4 +1,4 @@
 ---
 - name: append neovide to caskpkgs
   set_fact:
-    caskpkgs: "{{ (caskpkgs | default([])) + [ 'neovide' ] }}"
+    caskpkgs: "{{ caskpkgs + [ 'neovide' ] }}"

tasks/Darwin/neovim.yml

@@ -1,7 +1,7 @@
 ---
 - name: append neovim to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'neovim' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'neovim' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/nerdfonts.yml

@@ -5,12 +5,12 @@
     state: present
 
 - name: generate nerdfont cask names
+  set_fact:
+    nerdfont_casks: "{{ (nerdfont_casks | default([])) + [ 'homebrew/cask/font-' + font.brew + '-nerd-font' ] }}"
   loop: "{{ nerdfonts }}"
   loop_control:
     loop_var: font
-  set_fact:
-    nerdfont_casks: "{{ (nerdfont_casks | default([])) + [ 'homebrew/cask/font-' + font.brew + '-nerd-font' ] }}"
 
 - name: append nerdfonts to caskpkgs
   set_fact:
-    caskpkgs: "{{ (caskpkgs | default([])) + nerdfont_casks }}"
+    caskpkgs: "{{ caskpkgs + nerdfont_casks }}"

tasks/Darwin/nodejs.yml

@@ -1,7 +1,7 @@
 ---
 - name: append node to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'node' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'node' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/nushell.yml

@@ -1,7 +1,7 @@
 ---
 - name: append nushell to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'nushell' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'nushell' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/pandoc.yml

@@ -1,7 +1,7 @@
 ---
 - name: append pandoc to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'pandoc' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'pandoc' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/pipx.yml

@@ -1,7 +1,7 @@
 ---
 - name: append pipx to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'pipx' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'pipx' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/python3-pip.yml

@@ -1,7 +1,7 @@
 ---
 - name: append python3 to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'python3' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'python3' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/ripgrep.yml

@@ -1,7 +1,7 @@
 ---
 - name: append ripgrep to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'ripgrep' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'ripgrep' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/rust.yml

@@ -1,7 +1,7 @@
 ---
 - name: append rust to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'rust' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'rust' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/stow.yml

@@ -1,7 +1,7 @@
 ---
 - name: append stow to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'stow' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'stow' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/terminal.yml

@@ -1,11 +0,0 @@
----
-# default on Linux is alacritty
-# edit config/users.yml:users:<user item>:terminal:os_name:package name
-# ie: config/users.yml:users:[name: stobbsm]:terminal:Fedora:konsole
-- name: install and configure system terminal emulator
-  loop: "{{ users }}"
-  ansible.builtin.include_tasks:
-    file: "packages/{{ ansible_os_family }}/{{ item.terminal[ansible_distribution] | default('alacritty') }}.yml"
-  tags:
-    - package
-    - Darwin

tasks/Darwin/terraform.yml

@@ -1,4 +1,4 @@
 ---
 - name: append terraform to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'terraform' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'terraform' ]}}"

tasks/Darwin/tidy.yml

@@ -1,7 +1,7 @@
 ---
 - name: append tidy-html5 to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'tidy-html5' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'tidy-html5' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/tmux.yml

@@ -1,7 +1,7 @@
 ---
 - name: append tmux to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'tmux' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'tmux' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/vivaldi.yml

@@ -1,4 +0,0 @@
----
-- name: append vivaldi to caskpkgs
-  set_fact:
-    caskpkgs: "{{ (caskpkgs | default([])) + [ 'vivaldi' ] }}"

tasks/Darwin/zoxide.yml

@@ -1,7 +1,7 @@
 ---
 - name: append zoxide to brewpkgs
   set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'zoxide' ]}}"
+    brewpkgs: "{{ brewpkgs + [ 'zoxide' ]}}"
   tags:
     - MacOS
     - homebrew

tasks/Darwin/zsh.yml

@@ -1,8 +0,0 @@
----
-- name: append zsh to brewpkgs
-  set_fact:
-    brewpkgs: "{{ (brewpkgs | default([])) + [ 'zsh' ]}}"
-  tags:
-    - MacOS
-    - homebrew
-    - package