more packages fixed

- removed nushell. Not using it, not going to use again anytime soon

tasks/cargo.yml

@@ -3,7 +3,7 @@
 - name: Install cargo pkg
   become: "{{ archive_become }}"
   community.general.cargo:
-    name: "{{ pkg.cargo.pkg }}"
-    version: "{{ pkg.ver }}"
+    name: "{{ pkg.name }}"
+    version: "{{ pkg.vers }}"
     path: "{{ paths.cargo }}"
-    locked: "{{ pkg.cargo.locked }}"
+    locked: "{{ pkg.locked | default(true) }}"

tasks/config/broot.yml

@@ -0,0 +1,8 @@
+---
+- name: Set broot config
+  ansible.builtin.set_fact:
+    broot:
+      vers: "{{ pkgconfig.broot.version }}"
+      name: broot
+      locked: true
+      deps: "{{ pkgconfig.broot.build_deps[ansible_os_family] }}"

tasks/config/choose.yml

@@ -0,0 +1,7 @@
+---
+- name: Set choose config
+  ansible.builtin.set_fact:
+    choose:
+      name: choose
+      vers: "{{ pkgconfig.choose.version }}"
+      locked: true

tasks/config/git.yml

@@ -0,0 +1,6 @@
+# vim: set filetype=yaml.ansible :
+---
+- name: Set git config
+  ansible.builtin.set_fact:
+    git:
+      pkgs: "{{ pkgconfig.git.pkgs[ansible_system] }}"

tasks/config/libreoffice.yml

@@ -1,3 +1,8 @@
 # vim: set filetype=yaml.ansible :
 ---
-use_flatpak: false
+- name: Set libreoffice config
+  ansible.builtin.set_fact:
+    libreoffice:
+      method: "{{ pkgconfig.libreoffice.method }}"
+      flatpak: "{{ pkgconfig.libreoffice.flatpak }}"
+      syspkgs: "{{ pkgconfig.libreoffice[ansible_os_family] }}"

tasks/config/neovide.yml

@@ -1,4 +1,9 @@
 # vim: set filetype=yaml.ansible :
 ---
-version: 0.14.0
-install_prefix: "{{ default_install_prefix }}"
+- name: Set neovide config
+  ansible.builtin.set_fact:
+    neovide:
+      name: neovide
+      deps: "{{ pkgconfig.neovide.build_deps[ansible_os_family] }}"
+      vers: "{{ pkgconfig.neovide.version }}"
+      locked: true

tasks/config/nushell.yml

@@ -1,3 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-install_extra: true

tasks/config/python3.yml

@@ -0,0 +1,5 @@
+---
+- name: Set python3 config
+  ansible.builtin.set_fact:
+    python3:
+      pkgs: "{{ pkgconfig.python3.pkgs[ansible_system] }}"

tasks/config/xh.yml

@@ -0,0 +1,7 @@
+---
+- name: Set xh config
+  ansible.builtin.set_fact:
+    xh:
+      vers: "{{ pkgconfig.xh.version }}"
+      name: xh
+      locked: true

tasks/config/zig.yml

@@ -1,5 +1,8 @@
 # vim: set filetype=yaml.ansible :
 ---
-version: 0.13.0
-install_prefix: "{{ default_install_prefix }}"
-install_path: /opt/zig
+- name: Set zig configuration
+  ansible.builtin.set_fact:
+    zig:
+      version: 0.13.0
+      install_prefix: "{{ default_install_prefix }}"
+      install_path: /opt/zig

tasks/pkgs/ansible-lint.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'ansible-lint' ] }}"
+    pkg_sys: "{{ pkg_sys + ['ansible-lint'] }}"

tasks/pkgs/bat.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to syspkgs
+- name: Append to pkg_sys
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'bat' ] }}"
+    pkg_sys: "{{ pkg_sys + ['bat'] }}"

tasks/pkgs/blender.yml

@@ -1,11 +1,11 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'blender' ] }}"
+    pkg_sys: "{{ pkg_sys + ['blender'] }}"
   when: ansible_os_family != 'Darwin'
 
-- name: append to caskpkgs
+- name: Append to caskpkgs
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'blender' ] }}"
+    pkg_cask: "{{ pkg_cask + ['blender'] }}"
   when: ansible_os_family == 'Darwin'

tasks/pkgs/broot.yml

@@ -1,21 +1,14 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: linux specific install
-  block:
-    - ansible.builtin.include_tasks:
-        file: "pkgs/rust.yml"
-      when: pkgconfig_rust is undefined
-
-    - name: append to syspkgs and cargopkgs
-      ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + pkgconfig.broot.deps[ansible_os_family] }}"
-        cargopkgs: "{{ cargopkgs + [ 'broot' ] }}"
-
+- name: Append to pkg_sys and pkg_cargo
   when:
     - ansible_os_family != 'Darwin'
-
-- name: append to syspkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'broot' ] }}"
+    pkg_sys: "{{ pkg_sys + broot.deps }}"
+    pkg_cargo: "{{ pkg_cargo + [broot] }}"
+
+- name: Append to pkg_sys
   when:
     - ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['broot'] }}"

tasks/pkgs/btop.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'btop' ] }}"
+    pkg_sys: "{{ pkg_sys + ['btop'] }}"

tasks/pkgs/choose.yml

@@ -1,19 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: linux specific
-  block:
-    - ansible.builtin.include_tasks:
-        file: "pkgs/rust.yml"
-      when:
-        - pkgconfig_rust is undefined
-    - name: append to cargopkgs
-      ansible.builtin.set_fact:
-        cargopkgs: "{{ cargopkgs + [ 'choose' ] }}"
+- name: Append to cargopkgs
   when:
     - ansible_os_family != 'Darwin'
-
-- name: append to syspkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'choose-rust' ] }}"
+    pkg_cargo: "{{ pkg_cargo + [choose] }}"
+
+- name: Append to pkg_sys
   when:
     - ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['choose-rust'] }}"

tasks/pkgs/editorconfig.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'editorconfig' ] }}"
+    pkg_sys: "{{ pkg_sys + ['editorconfig'] }}"

tasks/pkgs/fzf.yml

@@ -1,5 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'fzf' ] }}"
+    pkg_sys: "{{ pkg_sys + ['fzf'] }}"

tasks/pkgs/git.yml

@@ -1,8 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.set_fact:
-    git: true
-
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig.git.pkgs[ansible_system] }}"
+    pkg_sys: "{{ pkg_sys + git.pkgs }}"

tasks/pkgs/libreoffice.yml

@@ -1,30 +1,23 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
-    file: libreoffice.yml
-    name: _libreoffice
-- ansible.builtin.set_fact:
-    pkgconfig_libreoffice: "{{ _libreoffice | ansible.builtin.combine(pkgconfig.libreoffice) }}"
-
-- block:
-    - ansible.builtin.include_tasks:
-        file: pkgs/flatpak.yml
-      when: flatpak is undefined
-    - name: append to flatpkgs
+- name: Linux specific methods
+  when:
+    - ansible_system == 'Linux'
+  block:
+    - name: Append to flatpkgs
+      when:
+        - libreoffice.method == 'flatpak'
       ansible.builtin.set_fact:
-        flatpkgs: "{{ flatpkgs + pkgconfig_libreoffice.flatpak }}"
-  when:
-    - ansible_os_family != 'Darwin'
-    - pkgconfig_libreoffice.use_flatpak
+        flatpkgs: "{{ flatpkgs + libreoffice.flatpak }}"
 
-- block:
-    - ansible.builtin.set_fact:
-        syspkgs: "{{ syspkgs + pkgconfig_libreoffice[ansible_os_family] }}"
-  when:
-    - ansible_os_family != 'Darwin'
-    - not pkgconfig_libreoffice.use_flatpak
+    - name: Append to pkg_sys
+      when:
+        - libreoffice.method == 'sys'
+      ansible.builtin.set_fact:
+        sys_pkg: "{{ sys_pkg + libreoffice.syspkgs }}"
 
-- name: append to caskpkgs
+- name: Append to caskpkgs
+  when:
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'libreoffice' ] }}"
-  when: ansible_os_family == 'Darwin'
+    pkg_cask: "{{ pkg_cask + ['libreoffice'] }}"

tasks/pkgs/neovide.yml

@@ -1,21 +1,14 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.include_vars:
-    file: neovide.yml
-    name: _neovide
-- ansible.builtin.set_fact:
-    pkgconfig_neovide: "{{ _neovide | ansible.builtin.combine(pkgconfig.neovide) }}"
-- ansible.builtin.include_tasks:
-    file: pkgs/rust.yml
-  when: pkgconfig_rust is undefined
-
-- name: append to pkgs
+- name: Append to pkgs
+  when:
+    - ansible_system == 'Linux'
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig_neovide.deps[ansible_os_family] }}"
-    srcpkgs: "{{ srcpkgs + [ 'neovide' ] }}"
-  when: ansible_system == 'Linux'
+    pkg_sys: "{{ pkg_sys + neovide.deps }}"
+    pkg_cargo: "{{ pkg_cargo + [neovide] }}"
 
-- name: append neovide to caskpkgs
+- name: Append neovide to caskpkgs
+  when:
+    - ansible_system == 'Darwin'
   ansible.builtin.set_fact:
-    caskpkgs: "{{ caskpkgs + [ 'neovide' ] }}"
-  when: ansible_system == 'Darwin'
+    pkg_cask: "{{ pkg_cask + ['neovide'] }}"

tasks/pkgs/nerdfonts.yml

@@ -7,7 +7,7 @@
 
 - name: Append to caskpkgs
   ansible.builtin.set_fact:
-    pkg_cask: "{{ pkg_cask + [nerdfonts.fonts[font].brew] }}"
+    pkg_cask: "{{ pkg_cask + [pkgconfig.nerdfonts.fonts[font].brew] }}"
   loop: "{{ nerdfonts.fonts }}"
   loop_control:
     loop_var: font

tasks/pkgs/nushell.yml

@@ -1,26 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- ansible.builtin.include_vars:
-    file: nushell.yml
-    name: _nushell
-- ansible.builtin.set_fact:
-    pkgconfig_nushell: "{{ _nushell | ansible.builtin.combine(pkgconfig.nushell) }}"
-
-- ansible.builtin.include_tasks:
-    file: pkgs/rust.yml
-  when: pkgconfig_rust is undefined
-
-- ansible.builtin.include_tasks:
-    file: pkgs/carapace.yml
-  when: pkgconfig_carapace is undefined
-
-- name: append to pkgs
-  ansible.builtin.set_fact:
-    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/pipx.yml

@@ -1,7 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.set_fact:
-    pipx: true
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'pipx' ] }}"
+    pkg_sys: "{{ pkg_sys + ['pipx'] }}"

tasks/pkgs/python3-pip.yml

@@ -1,8 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- ansible.builtin.set_fact:
-    python3: true
-
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + pkgconfig.python3.pkgs[ansible_system] }}"
+    pkg_sys: "{{ pkg_sys + python3.pkgs }}"

tasks/pkgs/tmux.yml

@@ -1,7 +1,5 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to pkgs
+- name: Append to pkgs
   ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'tmux' ] }}"
-  tags:
-    - packages
+    pkg_sys: "{{ pkg_sys + ['tmux'] }}"

tasks/pkgs/xh.yml

@@ -1,19 +1,13 @@
 # vim: set filetype=yaml.ansible :
 ---
-- name: append to syspkgs
-  ansible.builtin.set_fact:
-    syspkgs: "{{ syspkgs + [ 'xh' ] }}"
+- name: Append to pkg_sys
   when:
     - ansible_os_family == 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_sys: "{{ pkg_sys + ['xh'] }}"
 
-- name: linux specific install
-  block:
-    - ansible.builtin.include_tasks:
-        file: "pkgs/rust.yml"
-      when: pkgconfig_rust is undefined
-
-    - name: add to cargopkgs
-      ansible.builtin.set_fact:
-        cargopkgs: "{{ cargopkgs + [ 'xh' ] }}"
+- name: Add to cargopkgs
   when:
     - ansible_os_family != 'Darwin'
+  ansible.builtin.set_fact:
+    pkg_cargo: "{{ pkg_cargo + [xh] }}"

tasks/src/nushell.yml

@@ -1,19 +0,0 @@
-# vim: set filetype=yaml.ansible :
----
-- ansible.builtin.include_vars:
-    file: nushell.yml
-    name: _nushell
-
-- name: install nushell via cargo
-  become: true
-  ansible.builtin.command:
-    cmd:
-      - cargo
-      - install
-      - --root
-      - "{{ _nushell.install_prefix }}"
-      - "{{ nuitem }}"
-      - --locked
-  loop_control:
-    loop_var: nuitem
-  loop: "{{ _nushell.nu_pkgs_list }}"