fixing and adding packages

tasks/RedHat/alacritty.yml

@@ -1,7 +1,7 @@
 ---
 - name: install rust and cargo
   ansible.builtin.include_tasks:
-    file: "packages/{{ ansible_os_family }}/rust.yml"
+    file: "{{ ansible_os_family }}/rust.yml"
   tags:
     - rust
     - dependency
@@ -18,8 +18,8 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + alacritty_deps }}"
-    altpkgs: "{{ (altpkgs | default([])) + [ 'packages/Linux/alacritty.yml' ] }}"
+    syspkgs: "{{ syspkgs + alacritty_deps }}"
+    altpkgs: "{{ altpkgs + [ 'Linux/alacritty.yml' ] }}"
   tags:
     - syspkgs
     - altpkgs

tasks/RedHat/ansible.yml

@@ -3,5 +3,5 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'ansible' ] }}"
+    syspkgs: "{{ (syspkgs + [ 'ansible' ] }}"
 

tasks/RedHat/btop.yml

@@ -1,5 +1,5 @@
 ---
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'btop' ] }}"
+    syspkgs: "{{ syspkgs + [ 'btop' ] }}"
 

tasks/RedHat/carapace.yml

@@ -2,6 +2,6 @@
 - name: install carapace RPM
   become: true
   ansible.builtin.dnf:
-    name: https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.7/carapace-bin_1.0.7_linux_amd64.rpm
+    name: "{{ _ghbase }}/carapace-sh/carapace-bin/releases/download/v{{ carapace_version }}/carapace-bin_{{ carapace_version }}_linux_amd64.rpm"
     state: present
     disable_gpg_check: true

tasks/RedHat/cmake.yml

@@ -1,7 +1,7 @@
 ---
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'cmake' ] }}"
+    syspkgs: "{{ syspkgs + [ 'cmake' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/consul.yml

@@ -1,9 +1,9 @@
 ---
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
-    file: packages/{{ ansible_os_family }}/hashicorp_repo.yml
+    file: "{{ ansible_os_family }}/hashicorp_repo.yml"
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'consul' ] }}"
+    syspkgs: "{{ (syspkgs + [ 'consul' ] }}"
 

tasks/RedHat/editorconfig.yml

@@ -1,7 +1,7 @@
 ---
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'editorconfig' ] }}"
+    syspkgs: "{{ syspkgs + [ 'editorconfig' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/firefox.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'firefox' ] }}"
+    syspkgs: "{{ syspkgs + [ 'firefox' ] }}"
   tags:
     - packages
     - RedHat

tasks/RedHat/fzf.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'fzf' ] }}"
+    syspkgs: "{{ syspkgs + [ 'fzf' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/ghostty.yml

@@ -10,6 +10,6 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'ghostty' ] }}"
+    syspkgs: "{{ syspkgs + [ 'ghostty' ] }}"
   tags:
     - syspkgs

tasks/RedHat/git.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'git', 'git-delta', 'git-email', 'git-lfs' ] }}"
+    syspkgs: "{{ syspkgs + [ 'git', 'git-delta', 'git-email', 'git-lfs' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/go.yml

@@ -2,4 +2,4 @@
 
 - name: append to pkgs
   set_fact:
-    altpkgs: "{{ (altpkgs | default([])) + [ 'packages/Linux/go.yml' ] }}"
+    altpkgs: "{{ altpkgs + [ 'packages/Linux/go.yml' ] }}"

tasks/RedHat/hugo.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'hugo' ] }}"
+    syspkgs: "{{ syspkgs + [ 'hugo' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/jq.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'jq' ] }}"
+    syspkgs: "{{ syspkgs + [ 'jq' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/konsole.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'konsole' ] }}"
+    syspkgs: "{{ syspkgs + [ 'konsole' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/neovide.yml

@@ -15,5 +15,5 @@
 - name: append to pkgs
   when: ansible_architecture != "aarch64"
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + neovide_deps }}"
-    altpkgs: "{{ (altpkgs | default([])) + [ 'packages/Linux/neovide.yml' ] }}"
+    syspkgs: "{{ syspkgs + neovide_deps }}"
+    altpkgs: "{{ altpkgs + [ 'Linux/neovide.yml' ] }}"

tasks/RedHat/neovim.yml

@@ -2,13 +2,13 @@
 - name: append to pkgs
   when: ansible_distribution == "Fedora"
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'neovim', 'python3-neovim' ] }}"
+    syspkgs: "{{ syspkgs + [ 'neovim', 'python3-neovim' ] }}"
   tags:
     - RedHat
     - linux
     - package
 
-- name: Install neovim appimage
+- name: install neovim appimage
   when: ansible_distribution != "Fedora"
   become: true
   ansible.builtin.get_url:

tasks/RedHat/nerdfonts.yml

@@ -1,4 +1,4 @@
 ---
 - name: append to pkgs
   set_fact:
-    altpkgs: "{{ (altpkgs | default([])) + [ 'packages/Linux/nerdfonts.yml' ] }}"
+    altpkgs: "{{ altpkgs + [ 'Linux/nerdfonts.yml' ] }}"

tasks/RedHat/nodejs.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'nodejs', 'npm' ] }}"
+    syspkgs: "{{ syspkgs + [ 'nodejs', 'npm' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/nomad.yml

@@ -1,9 +1,9 @@
 ---
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
-    file: packages/{{ ansible_os_family }}/hashicorp_repo.yml
+    file: "{{ ansible_os_family }}/hashicorp_repo.yml"
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'nomad' ] }}"
+    syspkgs: "{{ syspkgs + [ 'nomad' ] }}"
 

tasks/RedHat/nushell.yml

@@ -7,10 +7,10 @@
       - openssl-devel
       - libX11-devel
     nushell_altdeps:
-      - packages/Linux/nushell.yml
-      - packages/{{ ansible_os_family }}/carapace.yml
+      - Linux/nushell.yml
+      - "{{ ansible_os_family }}/carapace.yml"
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + nushell_pkgdeps }}"
-    altpkgs: "{{ (altpkgs | default([])) + nushell_altdeps }}"
+    syspkgs: "{{ syspkgs + nushell_pkgdeps }}"
+    altpkgs: "{{ altpkgs + nushell_altdeps }}"

tasks/RedHat/packer.yml

@@ -1,8 +1,8 @@
 ---
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
-    file: packages/{{ ansible_os_family }}/hashicorp_repo.yml
+    file: "{{ ansible_os_family }}/hashicorp_repo.yml"
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'packer' ] }}"
+    syspkgs: "{{ syspkgs + [ 'packer' ] }}"

tasks/RedHat/pandoc.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'pandoc' ] }}"
+    syspkgs: "{{ syspkgs + [ 'pandoc' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/pipx.yml

@@ -1,7 +1,7 @@
 ---
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'pipx' ] }}"
+    syspkgs: "{{ syspkgs + [ 'pipx' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/python3-pip.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'python3-pip' ] }}"
+    syspkgs: "{{ syspkgs + [ 'python3-pip' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/ripgrep.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'ripgrep' ] }}"
+    syspkgs: "{{ syspkgs + [ 'ripgrep' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/rust.yml

@@ -6,7 +6,7 @@
       - cargo
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + rust_pkgs }}"
+    syspkgs: "{{ syspkgs + rust_pkgs }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/stow.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'stow' ] }}"
+    syspkgs: "{{ syspkgs + [ 'stow' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/terminal.yml

@@ -1,12 +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
-    - RedHat

tasks/RedHat/terraform.yml

@@ -1,8 +1,8 @@
 ---
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
-    file: packages/{{ ansible_os_family }}/hashicorp_repo.yml
+    file: "{{ ansible_os_family }}/hashicorp_repo.yml"
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'terraform' ] }}"
+    syspkgs: "{{ syspkgs + [ 'terraform' ] }}"

tasks/RedHat/tidy.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'tidy' ] }}"
+    syspkgs: "{{ syspkgs + [ 'tidy' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/tmux.yml

@@ -2,7 +2,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'tmux' ] }}"
+    syspkgs: "{{ syspkgs + [ 'tmux' ] }}"
   tags:
     - RedHat
     - linux

tasks/RedHat/vault.yml

@@ -2,8 +2,8 @@
 ---
 - name: ensure hashicorp repo is active
   ansible.builtin.include_tasks:
-    file: packages/{{ ansible_os_family }}/hashicorp_repo.yml
+    file: "{{ ansible_os_family }}/hashicorp_repo.yml"
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'vault' ] }}"
+    syspkgs: "{{ syspkgs + [ 'vault' ] }}"

tasks/RedHat/vivaldi.yml

@@ -1,14 +0,0 @@
----
-- name: Configure RPM Repository
-  become: true
-  ansible.builtin.yum_repository:
-    name: vivaldi
-    baseurl: "https://repo.vivaldi.com/archive/rpm/{{ ansible_architecture }}"
-    description: vivaldi browser
-    gpgcheck: true
-    gpgkey: https://repo.vivaldi.com/archive/linux_signing_key.pub
-    state: present
-
-- name: append to pkgs
-  set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'vivaldi-stable' ] }}"

tasks/RedHat/zfs.yml

@@ -58,7 +58,7 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ (syspkgs | default([])) + [ 'zfs' ] }}"
+    syspkgs: "{{ syspkgs + [ 'zfs' ] }}"
   become: true
   tags:
     - RedHat

tasks/RedHat/zoxide.yml

@@ -14,4 +14,3 @@
     - RedHat
     - linux
     - package
-