diff --git a/tasks/cargo.yml b/tasks/cargo.yml index 3c22986..d163ac7 100644 --- a/tasks/cargo.yml +++ b/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) }}" diff --git a/tasks/config/broot.yml b/tasks/config/broot.yml new file mode 100644 index 0000000..89c6f1f --- /dev/null +++ b/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] }}" diff --git a/tasks/config/choose.yml b/tasks/config/choose.yml new file mode 100644 index 0000000..bdca115 --- /dev/null +++ b/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 diff --git a/tasks/config/git.yml b/tasks/config/git.yml new file mode 100644 index 0000000..174d937 --- /dev/null +++ b/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] }}" diff --git a/tasks/config/libreoffice.yml b/tasks/config/libreoffice.yml index be06690..da006a8 100644 --- a/tasks/config/libreoffice.yml +++ b/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] }}" diff --git a/tasks/config/neovide.yml b/tasks/config/neovide.yml index 79eea81..8f205ac 100644 --- a/tasks/config/neovide.yml +++ b/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 diff --git a/tasks/config/nushell.yml b/tasks/config/nushell.yml deleted file mode 100644 index 4bedf01..0000000 --- a/tasks/config/nushell.yml +++ /dev/null @@ -1,3 +0,0 @@ -# vim: set filetype=yaml.ansible : ---- -install_extra: true diff --git a/tasks/config/python3.yml b/tasks/config/python3.yml new file mode 100644 index 0000000..986bacb --- /dev/null +++ b/tasks/config/python3.yml @@ -0,0 +1,5 @@ +--- +- name: Set python3 config + ansible.builtin.set_fact: + python3: + pkgs: "{{ pkgconfig.python3.pkgs[ansible_system] }}" diff --git a/tasks/config/xh.yml b/tasks/config/xh.yml new file mode 100644 index 0000000..7a97674 --- /dev/null +++ b/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 diff --git a/tasks/config/zig.yml b/tasks/config/zig.yml index ca65e2c..48270c4 100644 --- a/tasks/config/zig.yml +++ b/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 diff --git a/tasks/pkgs/ansible-lint.yml b/tasks/pkgs/ansible-lint.yml index ae73c58..cd46295 100644 --- a/tasks/pkgs/ansible-lint.yml +++ b/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'] }}" diff --git a/tasks/pkgs/bat.yml b/tasks/pkgs/bat.yml index cfcbe11..1b86536 100644 --- a/tasks/pkgs/bat.yml +++ b/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'] }}" diff --git a/tasks/pkgs/blender.yml b/tasks/pkgs/blender.yml index eece2b2..4de466d 100644 --- a/tasks/pkgs/blender.yml +++ b/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' diff --git a/tasks/pkgs/broot.yml b/tasks/pkgs/broot.yml index 417266a..a91750b 100644 --- a/tasks/pkgs/broot.yml +++ b/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'] }}" diff --git a/tasks/pkgs/btop.yml b/tasks/pkgs/btop.yml index 2ca6525..96448e2 100644 --- a/tasks/pkgs/btop.yml +++ b/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'] }}" diff --git a/tasks/pkgs/choose.yml b/tasks/pkgs/choose.yml index 7df38b8..5bddfc7 100644 --- a/tasks/pkgs/choose.yml +++ b/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'] }}" diff --git a/tasks/pkgs/editorconfig.yml b/tasks/pkgs/editorconfig.yml index a1c9c50..3622ecd 100644 --- a/tasks/pkgs/editorconfig.yml +++ b/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'] }}" diff --git a/tasks/pkgs/fzf.yml b/tasks/pkgs/fzf.yml index 5bd7e5c..ee9ea30 100644 --- a/tasks/pkgs/fzf.yml +++ b/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'] }}" diff --git a/tasks/pkgs/git.yml b/tasks/pkgs/git.yml index f07bf34..f5ec4a5 100644 --- a/tasks/pkgs/git.yml +++ b/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 }}" diff --git a/tasks/pkgs/libreoffice.yml b/tasks/pkgs/libreoffice.yml index d8afbd4..a20c153 100644 --- a/tasks/pkgs/libreoffice.yml +++ b/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'] }}" diff --git a/tasks/pkgs/neovide.yml b/tasks/pkgs/neovide.yml index 3b2360b..3618477 100644 --- a/tasks/pkgs/neovide.yml +++ b/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'] }}" diff --git a/tasks/pkgs/nerdfonts.yml b/tasks/pkgs/nerdfonts.yml index cfc9d2e..b489d6b 100644 --- a/tasks/pkgs/nerdfonts.yml +++ b/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 diff --git a/tasks/pkgs/nushell.yml b/tasks/pkgs/nushell.yml deleted file mode 100644 index 332843e..0000000 --- a/tasks/pkgs/nushell.yml +++ /dev/null @@ -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 diff --git a/tasks/pkgs/pipx.yml b/tasks/pkgs/pipx.yml index 8c353c1..dcfe774 100644 --- a/tasks/pkgs/pipx.yml +++ b/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'] }}" diff --git a/tasks/pkgs/python3-pip.yml b/tasks/pkgs/python3-pip.yml index d568f87..f784fb4 100644 --- a/tasks/pkgs/python3-pip.yml +++ b/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 }}" diff --git a/tasks/pkgs/tmux.yml b/tasks/pkgs/tmux.yml index 98d489c..663e09d 100644 --- a/tasks/pkgs/tmux.yml +++ b/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'] }}" diff --git a/tasks/pkgs/xh.yml b/tasks/pkgs/xh.yml index b8afd36..2162acf 100644 --- a/tasks/pkgs/xh.yml +++ b/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] }}" diff --git a/tasks/src/nushell.yml b/tasks/src/nushell.yml deleted file mode 100644 index 94b1828..0000000 --- a/tasks/src/nushell.yml +++ /dev/null @@ -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 }}" diff --git a/vars/pkgs/broot.yml b/vars/pkgs/broot.yml index 69db166..40a9f2b 100644 --- a/vars/pkgs/broot.yml +++ b/vars/pkgs/broot.yml @@ -1,4 +1,5 @@ broot: + version: 1.44.7 build_deps: Debian: - build-essential diff --git a/vars/pkgs/choose.yml b/vars/pkgs/choose.yml new file mode 100644 index 0000000..b07ea00 --- /dev/null +++ b/vars/pkgs/choose.yml @@ -0,0 +1,2 @@ +choose: + version: 1.3.6 diff --git a/vars/pkgs/libreoffice.yml b/vars/pkgs/libreoffice.yml index 5604c0f..de536f6 100644 --- a/vars/pkgs/libreoffice.yml +++ b/vars/pkgs/libreoffice.yml @@ -1,6 +1,8 @@ libreoffice: + method: flatpak flatpak: - - org.libreoffice.LibreOffice + name: org.libreoffice.LibreOffice + remote: flathub Debian: - libreoffice RedHat: diff --git a/vars/pkgs/neovide.yml b/vars/pkgs/neovide.yml index f32e2f1..b26ee0c 100644 --- a/vars/pkgs/neovide.yml +++ b/vars/pkgs/neovide.yml @@ -1,4 +1,5 @@ neovide: + version: 0.14.0 git_repo: https://github.com/neovide/neovide.git build_deps: RedHat: diff --git a/vars/pkgs/nushell.yml b/vars/pkgs/nushell.yml deleted file mode 100644 index 6a58049..0000000 --- a/vars/pkgs/nushell.yml +++ /dev/null @@ -1,37 +0,0 @@ -nushell: - build_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 diff --git a/vars/pkgs/xh.yml b/vars/pkgs/xh.yml new file mode 100644 index 0000000..c0c70ac --- /dev/null +++ b/vars/pkgs/xh.yml @@ -0,0 +1,2 @@ +xh: + version: 0.24.0