From 2ce49c9b8579ab3a48c6e2963885f2f90cc792f8 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Mon, 3 Mar 2025 12:04:09 -0700 Subject: [PATCH] updated tasks so they are only run once --- tasks/addpkg.yml | 6 - tasks/pkgs/air.yml | 20 ++- tasks/pkgs/alacritty.yml | 40 +++--- tasks/pkgs/ansible-language-server.yml | 8 -- tasks/pkgs/ansible-lint.yml | 14 ++- tasks/pkgs/ansible_ls.yml | 16 +++ tasks/pkgs/aquamarine.yml | 40 ++++-- tasks/pkgs/bashls.yml | 20 ++- tasks/pkgs/bat.yml | 14 ++- tasks/pkgs/bitwarden.yml | 46 ++++--- tasks/pkgs/blender.yml | 26 ++-- tasks/pkgs/broot.yml | 38 ++++-- tasks/pkgs/btop.yml | 14 ++- tasks/pkgs/buf.yml | 20 ++- tasks/pkgs/bufls.yml | 20 ++- tasks/pkgs/carapace.yml | 56 +++++---- tasks/pkgs/cheat.yml | 20 ++- tasks/pkgs/checkmake.yml | 20 ++- tasks/pkgs/choose.yml | 36 ++++-- tasks/pkgs/clangd.yml | 18 ++- tasks/pkgs/cmake.yml | 14 ++- tasks/pkgs/cmakelang.yml | 20 ++- tasks/pkgs/commitlint-cli.yml | 20 ++- tasks/pkgs/commitlint-config-conventional.yml | 20 ++- tasks/pkgs/consul.yml | 42 ++++--- tasks/pkgs/cssls.yml | 20 ++- tasks/pkgs/curlie.yml | 20 ++- tasks/pkgs/dbeaver.yml | 32 +++-- tasks/pkgs/direnv.yml | 16 ++- tasks/pkgs/dockerls.yml | 20 ++- tasks/pkgs/dotenv-linter.yml | 20 ++- tasks/pkgs/duf.yml | 20 ++- tasks/pkgs/dust.yml | 32 +++-- tasks/pkgs/editorconfig.yml | 14 ++- tasks/pkgs/eslint.yml | 20 ++- tasks/pkgs/eza.yml | 20 ++- tasks/pkgs/fd.yml | 18 ++- tasks/pkgs/firefox.yml | 26 ++-- tasks/pkgs/flatpak.yml | 16 ++- tasks/pkgs/fzf.yml | 14 ++- tasks/pkgs/ghostty.yml | 78 +++++++----- tasks/pkgs/git.yml | 18 ++- tasks/pkgs/glow.yml | 20 ++- tasks/pkgs/go.yml | 28 +++-- tasks/pkgs/godot.yml | 32 +++-- tasks/pkgs/gopls.yml | 20 ++- tasks/pkgs/gping.yml | 32 +++-- tasks/pkgs/heroic.yml | 32 +++-- tasks/pkgs/htmlls.yml | 20 ++- tasks/pkgs/htmx-lsp.yml | 14 ++- tasks/pkgs/httpie.yml | 36 ++++-- tasks/pkgs/hugo.yml | 14 ++- tasks/pkgs/hyperfine.yml | 14 ++- tasks/pkgs/hyprcursor.yml | 24 +++- tasks/pkgs/hyprgraphics.yml | 24 +++- tasks/pkgs/hyprland.yml | 40 ++++-- tasks/pkgs/hyprland_protocols.yml | 24 +++- tasks/pkgs/hyprlang.yml | 40 ++++-- tasks/pkgs/hyprutils.yml | 24 +++- tasks/pkgs/hyprwayland_scanner.yml | 26 +++- tasks/pkgs/intelephense.yml | 20 ++- tasks/pkgs/jinja-lsp.yml | 20 ++- tasks/pkgs/jq.yml | 14 ++- tasks/pkgs/jsonls.yml | 20 ++- tasks/pkgs/kitty.yml | 18 ++- tasks/pkgs/lazygit.yml | 20 ++- tasks/pkgs/libreoffice.yml | 40 +++--- tasks/pkgs/luals.yml | 30 +++-- tasks/pkgs/markdownlint-cli.yml | 20 ++- tasks/pkgs/mcfly.yml | 26 ++-- tasks/pkgs/neovide.yml | 38 ++++-- tasks/pkgs/neovim.yml | 30 +++-- tasks/pkgs/nerdfonts.yml | 36 ++++-- tasks/pkgs/nextcloud.yml | 50 +++++--- tasks/pkgs/nginxls.yml | 20 ++- tasks/pkgs/nodejs.yml | 18 ++- tasks/pkgs/nomad.yml | 42 ++++--- tasks/pkgs/packer.yml | 36 ++++-- tasks/pkgs/pandoc.yml | 14 ++- tasks/pkgs/pgadmin.yml | 36 ++++-- tasks/pkgs/pipx.yml | 14 ++- tasks/pkgs/podman.yml | 14 ++- tasks/pkgs/pulumi.yml | 20 ++- tasks/pkgs/pyright.yml | 20 ++- tasks/pkgs/python3.yml | 18 ++- tasks/pkgs/quobix-vacuum.yml | 20 ++- tasks/pkgs/revive.yml | 20 ++- tasks/pkgs/ripgrep.yml | 14 ++- tasks/pkgs/rust.yml | 18 ++- tasks/pkgs/sd.yml | 32 +++-- tasks/pkgs/sdbus_cpp_2.yml | 24 +++- tasks/pkgs/sqlfluff.yml | 20 ++- tasks/pkgs/sqlls.yml | 20 ++- tasks/pkgs/starship.yml | 20 ++- tasks/pkgs/stow.yml | 14 ++- tasks/pkgs/tailscale.yml | 118 ++++++++++-------- tasks/pkgs/tailwindcss-languageserver.yml | 20 ++- tasks/pkgs/templ.yml | 20 ++- tasks/pkgs/terraform.yml | 46 ++++--- tasks/pkgs/terraformls.yml | 46 ++++--- tasks/pkgs/thunderbird.yml | 26 ++-- tasks/pkgs/tidy.yml | 18 ++- tasks/pkgs/tldr.yml | 26 ++-- tasks/pkgs/tmux.yml | 14 ++- tasks/pkgs/uwsm.yml | 22 +++- tasks/pkgs/vault.yml | 46 ++++--- tasks/pkgs/xdg_desktop_portal_hyprland.yml | 40 ++++-- tasks/pkgs/xh.yml | 30 +++-- tasks/pkgs/yamlls.yml | 20 ++- tasks/pkgs/zfs.yml | 106 +++++++++------- tasks/pkgs/zig.yml | 18 ++- tasks/pkgs/zls.yml | 24 +++- tasks/pkgs/zoxide.yml | 14 ++- tasks/pkgs/zsh.yml | 14 ++- tasks/repos/hashicorp.yml | 90 +++++++------ tasks/repos/terra.yml | 46 ++++--- tasks/src/hyprland_protocols.yml | 4 +- 117 files changed, 2129 insertions(+), 991 deletions(-) delete mode 100644 tasks/pkgs/ansible-language-server.yml create mode 100644 tasks/pkgs/ansible_ls.yml diff --git a/tasks/addpkg.yml b/tasks/addpkg.yml index 3935707..aa1e058 100644 --- a/tasks/addpkg.yml +++ b/tasks/addpkg.yml @@ -1,11 +1,5 @@ # vim: set filetype=yaml.ansible : --- -- name: "Load specialized configuration if it exists for {{ pkg }}" - when: - - pkgconfig[pkg] is defined - ansible.builtin.include_tasks: - file: "config/{{ pkg }}.yml" - - name: "Add include task for {{ pkg }}" ansible.builtin.include_tasks: file: "pkgs/{{ pkg }}.yml" diff --git a/tasks/pkgs/air.yml b/tasks/pkgs/air.yml index 9194eb7..8692efe 100644 --- a/tasks/pkgs/air.yml +++ b/tasks/pkgs/air.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/air-verse/air@latest'] }}" +- name: Add air + when: + - air_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/air-verse/air@latest'] }}" + + - name: Set air_configured + ansible.builtin.set_fact: + air_configured: true diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml index dfce7fb..6d6a75d 100644 --- a/tasks/pkgs/alacritty.yml +++ b/tasks/pkgs/alacritty.yml @@ -1,19 +1,31 @@ # vim: set filetype=yaml.ansible : --- -- name: Linux based installation +- name: Add alacritty when: - - ansible_system == 'Linux' + - alacritty_configured is undefined block: - - name: Append to pkgs - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + alacritty.deps }}" - pkg_cargo: "{{ pkg_cargo + [alacritty] }}" + - name: Load alacritty configuration + ansible.builtin.include_tasks: + file: config/alacritty.yml -- name: Append alacritty to caskpkgs - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + alacritty.cask }}" + - name: Linux based installation + when: + - ansible_system == 'Linux' + block: + - name: Append to pkgs + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + alacritty.deps }}" + pkg_cargo: "{{ pkg_cargo + [alacritty] }}" + + - name: Append alacritty to caskpkgs + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + alacritty.cask }}" + + - name: Set alacritty_configured + ansible.builtin.set_fact: + alacritty_configured: true diff --git a/tasks/pkgs/ansible-language-server.yml b/tasks/pkgs/ansible-language-server.yml deleted file mode 100644 index fd1724e..0000000 --- a/tasks/pkgs/ansible-language-server.yml +++ /dev/null @@ -1,8 +0,0 @@ -# vim: set filetype=yaml.ansible : ---- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['@ansible/ansible-language-server'] }}" diff --git a/tasks/pkgs/ansible-lint.yml b/tasks/pkgs/ansible-lint.yml index cd46295..e15f4d6 100644 --- a/tasks/pkgs/ansible-lint.yml +++ b/tasks/pkgs/ansible-lint.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['ansible-lint'] }}" +- name: Add ansible_lint + when: + - ansible_lint_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['ansible-lint'] }}" + + - name: Set ansible_lint_configured + ansible.builtin.set_fact: + ansible_lint_configured: true diff --git a/tasks/pkgs/ansible_ls.yml b/tasks/pkgs/ansible_ls.yml new file mode 100644 index 0000000..7f6ca2d --- /dev/null +++ b/tasks/pkgs/ansible_ls.yml @@ -0,0 +1,16 @@ +# vim: set filetype=yaml.ansible : +--- +- name: Add ansible_ls + when: + - ansible_ls_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['@ansible/ansible-language-server'] }}" + + - name: Set ansible_ls_configured + ansible.builtin.set_fact: + ansible_ls_configured: true diff --git a/tasks/pkgs/aquamarine.yml b/tasks/pkgs/aquamarine.yml index 7d01932..13c7f20 100644 --- a/tasks/pkgs/aquamarine.yml +++ b/tasks/pkgs/aquamarine.yml @@ -1,13 +1,29 @@ -- name: Ensure pkg_deps are added - loop: "{{ aquamarine.pkg_deps }}" - loop_control: - loop_var: pkg_dep - vars: - pkg: "{{ pkg_dep }}" - ansible.builtin.include_tasks: - file: addpkg.yml +# vim: set filetype=yaml.ansible : +--- +- name: Add aquamarine + when: + - aquamarine_configured is undefined + block: + - name: Load hyprland config + when: + - aquamarine is undefined + ansible.builtin.include_tasks: + file: config/aquamarine.yml -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + aquamarine.build_deps }}" - pkg_src: "{{ pkg_src + ['aquamarine'] }}" + - name: Ensure pkg_deps are added + loop: "{{ aquamarine.pkg_deps }}" + loop_control: + loop_var: aquamarine_pkg_dep + vars: + pkg: "{{ aquamarine_pkg_dep }}" + ansible.builtin.include_tasks: + file: "pkgs/{{ aquamarine_pkg_dep }}.yml" + + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + aquamarine.build_deps }}" + pkg_src: "{{ pkg_src + ['aquamarine'] }}" + + - name: Set aquamarine_configured + ansible.builtin.set_fact: + aquamarine_configured: true diff --git a/tasks/pkgs/bashls.yml b/tasks/pkgs/bashls.yml index a583217..d9f7278 100644 --- a/tasks/pkgs/bashls.yml +++ b/tasks/pkgs/bashls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['bash-language-server'] }}" +- name: Add bashls + when: + - bashls_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['bash-language-server'] }}" + + - name: Set bashls_configured + ansible.builtin.set_fact: + bashls_configured: true diff --git a/tasks/pkgs/bat.yml b/tasks/pkgs/bat.yml index 1b86536..cb44abb 100644 --- a/tasks/pkgs/bat.yml +++ b/tasks/pkgs/bat.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['bat'] }}" +- name: Add bat + when: + - bat_configured is undefined + block: + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['bat'] }}" + + - name: Set bat_configured + ansible.builtin.set_fact: + bat_configured: true diff --git a/tasks/pkgs/bitwarden.yml b/tasks/pkgs/bitwarden.yml index fb810e5..24449cd 100644 --- a/tasks/pkgs/bitwarden.yml +++ b/tasks/pkgs/bitwarden.yml @@ -1,22 +1,34 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_flatpak +- name: Add bitwarden when: - - bitwarden.method == 'flatpak' - notify: - - Depend flatpak - changed_when: true - ansible.builtin.set_fact: - pkg_flatpak: "{{ pkg_flatpak + [bitwarden.pkg] }}" + - bitwarden_configured is undefined + block: + - name: Load bitwarden config + ansible.builtin.include_tasks: + file: config/bitwarden.yml -- name: Append to pkg_appimage - when: - - bitwarden.method == 'appimage' - ansible.builtin.set_fact: - pkg_appimage: "{{ pkg_appimage + [bitwarden.pkg] }}" + - name: Append to pkg_flatpak + when: + - bitwarden.method == 'flatpak' + notify: + - Depend flatpak + changed_when: true + ansible.builtin.set_fact: + pkg_flatpak: "{{ pkg_flatpak + [bitwarden.pkg] }}" -- name: Append to pkg_cask - when: - - bitwarden.method == 'brew' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + [bitwarden] }}" + - name: Append to pkg_appimage + when: + - bitwarden.method == 'appimage' + ansible.builtin.set_fact: + pkg_appimage: "{{ pkg_appimage + [bitwarden.pkg] }}" + + - name: Append to pkg_cask + when: + - bitwarden.method == 'brew' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + [bitwarden] }}" + + - name: Set bitwarden_configured + ansible.builtin.set_fact: + bitwarden_configured: true diff --git a/tasks/pkgs/blender.yml b/tasks/pkgs/blender.yml index 1c80133..8b889a3 100644 --- a/tasks/pkgs/blender.yml +++ b/tasks/pkgs/blender.yml @@ -1,13 +1,21 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add blender when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['blender'] }}" + - blender_configured is undefined + block: + - name: Append to pkg_sys + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['blender'] }}" -- name: Append to pkg_cask - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['blender'] }}" + - name: Append to pkg_cask + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['blender'] }}" + + - name: Set bitwarden_configured + ansible.builtin.set_fact: + bitwarden_configured: true diff --git a/tasks/pkgs/broot.yml b/tasks/pkgs/broot.yml index 030a254..8a82811 100644 --- a/tasks/pkgs/broot.yml +++ b/tasks/pkgs/broot.yml @@ -1,17 +1,29 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys and pkg_cargo +- name: Add broot when: - - ansible_system == 'Linux' - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + broot.deps }}" - pkg_cargo: "{{ pkg_cargo + [broot] }}" + - broot_configured is undefined + block: + - name: Load broot config + ansible.builtin.include_tasks: + file: config/broot.yml -- name: Append to pkg_sys - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['broot'] }}" + - name: Append to pkg_sys and pkg_cargo + when: + - ansible_system == 'Linux' + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + broot.deps }}" + pkg_cargo: "{{ pkg_cargo + [broot] }}" + + - name: Append to pkg_sys + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['broot'] }}" + + - name: Set broot_configured + ansible.builtin.set_fact: + broot_configured: true diff --git a/tasks/pkgs/btop.yml b/tasks/pkgs/btop.yml index 63dc7d4..8206fc4 100644 --- a/tasks/pkgs/btop.yml +++ b/tasks/pkgs/btop.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_ssys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['btop'] }}" +- name: Add btop + when: + - btop_configured is undefined + block: + - name: Append to pkg_ssys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['btop'] }}" + + - name: Set broot_configured + ansible.builtin.set_fact: + broot_configured: true diff --git a/tasks/pkgs/buf.yml b/tasks/pkgs/buf.yml index 523da55..4a955b7 100644 --- a/tasks/pkgs/buf.yml +++ b/tasks/pkgs/buf.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/bufbuild/buf/cmd/buf@latest'] }}" +- name: Add buf + when: + - buf_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/bufbuild/buf/cmd/buf@latest'] }}" + + - name: Set buf_configured + ansible.builtin.set_fact: + buf_configured: true diff --git a/tasks/pkgs/bufls.yml b/tasks/pkgs/bufls.yml index 5c3ad91..e2591ca 100644 --- a/tasks/pkgs/bufls.yml +++ b/tasks/pkgs/bufls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/bufbuild/buf-language-server/cmd/bufls@latest'] }}" +- name: Add bufls + when: + - bufls_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/bufbuild/buf-language-server/cmd/bufls@latest'] }}" + + - name: Set bufls_configured + ansible.builtin.set_fact: + bufls_configured: true diff --git a/tasks/pkgs/carapace.yml b/tasks/pkgs/carapace.yml index 2d4d8a3..95fcf47 100644 --- a/tasks/pkgs/carapace.yml +++ b/tasks/pkgs/carapace.yml @@ -1,27 +1,39 @@ # vim: set filetype=yaml.ansible : --- -- name: Enable carapace yum repository +- name: Add carapace when: - - ansible_os_family == 'RedHat' - become: true - ansible.builtin.yum_repository: - name: "{{ carapace.repo.name }}" - description: "{{ carapace.repo.description }}" - baseurl: "{{ carapace.repo.baseurl }}" - enabled: true - gpgcheck: false - state: present + - carapace_configured is undefined + block: + - name: Load carapace config + ansible.builtin.include_tasks: + file: config/carapace.yml -- name: Enable carapace apt repository - when: - - ansible_os_family == 'Debian' - become: true - ansible.builtin.apt_repository: - repo: "{{ carapace.repo.repo }}" - filename: "{{ carapace.repo.name }}" - state: present - update_cache: false + - name: Enable carapace yum repository + when: + - ansible_os_family == 'RedHat' + become: true + ansible.builtin.yum_repository: + name: "{{ carapace.repo.name }}" + description: "{{ carapace.repo.description }}" + baseurl: "{{ carapace.repo.baseurl }}" + enabled: true + gpgcheck: false + state: present -- name: Add carapace to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + carapace.pkgs }}" + - name: Enable carapace apt repository + when: + - ansible_os_family == 'Debian' + become: true + ansible.builtin.apt_repository: + repo: "{{ carapace.repo.repo }}" + filename: "{{ carapace.repo.name }}" + state: present + update_cache: false + + - name: Add carapace to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + carapace.pkgs }}" + + - name: Set carapace_configured + ansible.builtin.set_fact: + carapace_configured: true diff --git a/tasks/pkgs/cheat.yml b/tasks/pkgs/cheat.yml index 7cfaaef..e53c748 100644 --- a/tasks/pkgs/cheat.yml +++ b/tasks/pkgs/cheat.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/cheat/cheat/cmd/cheat@latest'] }}" +- name: Add cheat + when: + - cheat_configured is undefined + block: + - name: Append to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/cheat/cheat/cmd/cheat@latest'] }}" + + - name: Set cheat_configured + ansible.builtin.set_fact: + cheat_configured: true diff --git a/tasks/pkgs/checkmake.yml b/tasks/pkgs/checkmake.yml index 3d52128..baa2400 100644 --- a/tasks/pkgs/checkmake.yml +++ b/tasks/pkgs/checkmake.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/mrtazz/checkmake/cmd/checkmake@latest'] }}" +- name: Add checkmake + when: + - checkmake_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/mrtazz/checkmake/cmd/checkmake@latest'] }}" + + - name: Set checkmake_configured + ansible.builtin.set_fact: + checkmake_configured: true diff --git a/tasks/pkgs/choose.yml b/tasks/pkgs/choose.yml index 55a9258..6d3b3d5 100644 --- a/tasks/pkgs/choose.yml +++ b/tasks/pkgs/choose.yml @@ -1,16 +1,28 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to cargopkgs +- name: Add choose when: - - ansible_system == 'Linux' - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + [choose] }}" + - choose_configured is undefined + block: + - name: Load choose config + ansible.builtin.include_task: + file: config/choose.yml -- name: Append to pkg_sys - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['choose-rust'] }}" + - name: Append to cargopkgs + when: + - ansible_system == 'Linux' + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + [choose] }}" + + - name: Append to pkg_sys + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['choose-rust'] }}" + + - name: Set choose_configured + ansible.builtin.set_fact: + choose_configured: true diff --git a/tasks/pkgs/clangd.yml b/tasks/pkgs/clangd.yml index d7ee19d..88a12fd 100644 --- a/tasks/pkgs/clangd.yml +++ b/tasks/pkgs/clangd.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Append clangd to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + clangd.pkgs }}" +- name: Add clangd + when: + - clangd_configured is undefined + block: + - name: Load clangd config + ansible.builtin.include_tasks: + file: config/clangd.yml + + - name: Append clangd to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + clangd.pkgs }}" + + - name: Set clangd_configured + ansible.builtin.set_fact: + clangd_configured: true diff --git a/tasks/pkgs/cmake.yml b/tasks/pkgs/cmake.yml index 8ffcabc..ed82cda 100644 --- a/tasks/pkgs/cmake.yml +++ b/tasks/pkgs/cmake.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['cmake'] }}" +- name: Add cmake + when: + - cmake_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['cmake'] }}" + + - name: Set cmake_configured + ansible.builtin.set_fact: + cmake_configured: true diff --git a/tasks/pkgs/cmakelang.yml b/tasks/pkgs/cmakelang.yml index 35696c2..763069c 100644 --- a/tasks/pkgs/cmakelang.yml +++ b/tasks/pkgs/cmakelang.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_pipx - notify: - - Depend pipx - changed_when: true - ansible.builtin.set_fact: - pkg_pipx: "{{ pkg_pipx + ['cmakelang'] }}" +- name: Add cmakelang + when: + - cmakelang_configured is undefined + block: + - name: Add to pkg_pipx + notify: + - Depend pipx + changed_when: true + ansible.builtin.set_fact: + pkg_pipx: "{{ pkg_pipx + ['cmakelang'] }}" + + - name: Set cmakelang_configured + ansible.builtin.set_fact: + cmakelang_configured: true diff --git a/tasks/pkgs/commitlint-cli.yml b/tasks/pkgs/commitlint-cli.yml index bd00686..cb07960 100644 --- a/tasks/pkgs/commitlint-cli.yml +++ b/tasks/pkgs/commitlint-cli.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['@commitlint/cli'] }}" +- name: Add commitlint-cli + when: + - commitlint_cli_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['@commitlint/cli'] }}" + + - name: Set commitlint_cli_configured + ansible.builtin.set_fact: + commitlint_cli_configured: true diff --git a/tasks/pkgs/commitlint-config-conventional.yml b/tasks/pkgs/commitlint-config-conventional.yml index 4b9a590..431f958 100644 --- a/tasks/pkgs/commitlint-config-conventional.yml +++ b/tasks/pkgs/commitlint-config-conventional.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['@commitlint/config-conventional'] }}" +- name: Add comitlint-config-conventional + when: + - comitlint_config_conventional_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['@commitlint/config-conventional'] }}" + + - name: Set comitlint_config_conventional_configured + ansible.builtin.set_fact: + comitlint_config_conventional_configured: true diff --git a/tasks/pkgs/consul.yml b/tasks/pkgs/consul.yml index 6cfeb6f..e0c4e27 100644 --- a/tasks/pkgs/consul.yml +++ b/tasks/pkgs/consul.yml @@ -1,19 +1,31 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add consul when: - - ansible_system == 'Linux' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + consul.pkgs }}" + - consul_configured is undefined + block: + - name: Load consul config + ansible.builtin.include_tasks: + file: config/consul.yml -- name: Append to pkg_tap - when: - - ansible_system == 'Darwin' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_tap: "{{ pkg_tap + consul.pkgs }}" + - name: Append to pkg_sys + when: + - ansible_system == 'Linux' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + consul.pkgs }}" + + - name: Append to pkg_tap + when: + - ansible_system == 'Darwin' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_tap: "{{ pkg_tap + consul.pkgs }}" + + - name: Set consul_configured + ansible.builtin.set_fact: + consul_configured: true diff --git a/tasks/pkgs/cssls.yml b/tasks/pkgs/cssls.yml index b529871..b1b7d20 100644 --- a/tasks/pkgs/cssls.yml +++ b/tasks/pkgs/cssls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}" +- name: Add cssls + when: + - cssls_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}" + + - name: Set cssls_configured + ansible.builtin.set_fact: + cssls_configured: true diff --git a/tasks/pkgs/curlie.yml b/tasks/pkgs/curlie.yml index 939d105..0f444d3 100644 --- a/tasks/pkgs/curlie.yml +++ b/tasks/pkgs/curlie.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/rs/curlie@latest'] }}" +- name: Add curlie + when: + - curlie_configured is undefined + block: + - name: Append to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/rs/curlie@latest'] }}" + + - name: Set curlie_configured + ansible.builtin.set_fact: + curlie_configured: true diff --git a/tasks/pkgs/dbeaver.yml b/tasks/pkgs/dbeaver.yml index bbfdd19..f6eb83a 100644 --- a/tasks/pkgs/dbeaver.yml +++ b/tasks/pkgs/dbeaver.yml @@ -1,16 +1,24 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_flatpak +- name: Add dbeaver when: - - ansible_system == 'Linux' - notify: - - Depend flatpak - changed_when: true - ansible.builtin.set_fact: - pkg_flatpak: "{{ pkg_flatpak + ['io.dbeaver.DBeaverCommunity'] }}" + - dbeaver_configured is undefined + block: + - name: Append to pkg_flatpak + when: + - ansible_system == 'Linux' + notify: + - Depend flatpak + changed_when: true + ansible.builtin.set_fact: + pkg_flatpak: "{{ pkg_flatpak + ['io.dbeaver.DBeaverCommunity'] }}" -- name: Append to pkg_cask - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['dbeaver-community'] }}" + - name: Append to pkg_cask + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['dbeaver-community'] }}" + + - name: Set dbeaver_configured + ansible.builtin.set_fact: + dbeaver_configured: true diff --git a/tasks/pkgs/direnv.yml b/tasks/pkgs/direnv.yml index 67accf7..16b399f 100644 --- a/tasks/pkgs/direnv.yml +++ b/tasks/pkgs/direnv.yml @@ -1,3 +1,13 @@ -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['direnv'] }}" +# vim: set filetype=yaml.ansible : +--- +- name: Add direnv + when: + - direnv_configured is undefined + block: + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['direnv'] }}" + + - name: Set direnv_configured + ansible.builtin.set_fact: + direnv_configured: true diff --git a/tasks/pkgs/dockerls.yml b/tasks/pkgs/dockerls.yml index b774028..85eb704 100644 --- a/tasks/pkgs/dockerls.yml +++ b/tasks/pkgs/dockerls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['dockerfile-language-server-nodejs'] }}" +- name: Add dockerls + when: + - dockerls_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['dockerfile-language-server-nodejs'] }}" + + - name: Set dockerls_configured + ansible.builtin.set_fact: + dockerls_configured: true diff --git a/tasks/pkgs/dotenv-linter.yml b/tasks/pkgs/dotenv-linter.yml index c4f6ffc..052b57c 100644 --- a/tasks/pkgs/dotenv-linter.yml +++ b/tasks/pkgs/dotenv-linter.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_cargo - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['dotenv-linter'] }}" +- name: Add dotenv-linter + when: + - dotenv_linter_configured is undefined + block: + - name: Add to pkg_cargo + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['dotenv-linter'] }}" + + - name: Set dotenv-linter_configured + ansible.builtin.set_fact: + dotenv_linter_configured: true diff --git a/tasks/pkgs/duf.yml b/tasks/pkgs/duf.yml index 3d553ea..fab8818 100644 --- a/tasks/pkgs/duf.yml +++ b/tasks/pkgs/duf.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/muesli/duf@latest'] }}" +- name: Add duf + when: + - duf_configured is undefined + block: + - name: Append to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/muesli/duf@latest'] }}" + + - name: Set duf_configured + ansible.builtin.set_fact: + duf_configured: true diff --git a/tasks/pkgs/dust.yml b/tasks/pkgs/dust.yml index 89b9842..6bb5a48 100644 --- a/tasks/pkgs/dust.yml +++ b/tasks/pkgs/dust.yml @@ -1,16 +1,24 @@ # vim: set filetype=yaml.ansible : --- -- name: Linux specific install +- name: Add dust when: - - ansible_system == 'Linux' - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['du-dust'] }}" + - dust_configured is undefined + block: + - name: Linux specific install + when: + - ansible_system == 'Linux' + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['du-dust'] }}" -- name: Append to pkg_sys - when: - - ansible_os_family == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['dust'] }}" + - name: Append to pkg_sys + when: + - ansible_os_family == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['dust'] }}" + + - name: Set dust_configured + ansible.builtin.set_fact: + dust_configured: true diff --git a/tasks/pkgs/editorconfig.yml b/tasks/pkgs/editorconfig.yml index 3622ecd..8b5be2f 100644 --- a/tasks/pkgs/editorconfig.yml +++ b/tasks/pkgs/editorconfig.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['editorconfig'] }}" +- name: Add editorconfig + when: + - editorconfig_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['editorconfig'] }}" + + - name: Set editorconfig_configured + ansible.builtin.set_fact: + editorconfig_configured: true diff --git a/tasks/pkgs/eslint.yml b/tasks/pkgs/eslint.yml index b529871..02ed10d 100644 --- a/tasks/pkgs/eslint.yml +++ b/tasks/pkgs/eslint.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}" +- name: Add eslint + when: + - eslint_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}" + + - name: Set eslint_configured + ansible.builtin.set_fact: + eslint_configured: true diff --git a/tasks/pkgs/eza.yml b/tasks/pkgs/eza.yml index f6bf6e1..f1c9e4a 100644 --- a/tasks/pkgs/eza.yml +++ b/tasks/pkgs/eza.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_cargo - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['eza'] }}" +- name: Add eza + when: + - eza_configured is undefined + block: + - name: Add to pkg_cargo + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['eza'] }}" + + - name: Set eza_configured + ansible.builtin.set_fact: + eza_configured: true diff --git a/tasks/pkgs/fd.yml b/tasks/pkgs/fd.yml index 9b534b1..2e053af 100644 --- a/tasks/pkgs/fd.yml +++ b/tasks/pkgs/fd.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + fd.pkgs }}" +- name: Add fd + when: + - fd_configured is undefined + block: + - name: Load fd config + ansible.builtin.include_tasks: + file: config/fd.yml + + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + fd.pkgs }}" + + - name: Set fd_configured + ansible.builtin.set_fact: + fd_configured: true diff --git a/tasks/pkgs/firefox.yml b/tasks/pkgs/firefox.yml index 0b86d43..0b8e45e 100644 --- a/tasks/pkgs/firefox.yml +++ b/tasks/pkgs/firefox.yml @@ -1,13 +1,21 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs +- name: Add firefox when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['firefox'] }}" + - firefox_configured is undefined + block: + - name: Append to pkgs + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['firefox'] }}" -- name: Append to pkg_cask - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['firefox'] }}" + - name: Append to pkg_cask + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['firefox'] }}" + + - name: Set firefox_configured + ansible.builtin.set_fact: + firefox_configured: true diff --git a/tasks/pkgs/flatpak.yml b/tasks/pkgs/flatpak.yml index 9253dcb..7be8c09 100644 --- a/tasks/pkgs/flatpak.yml +++ b/tasks/pkgs/flatpak.yml @@ -1,7 +1,15 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add flatpak when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['flatpak'] }}" + - flatpak_configured is undefined + block: + - name: Append to pkg_sys + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['flatpak'] }}" + + - name: Set flatpak_configured + ansible.builtin.set_fact: + flatpak_configured: true diff --git a/tasks/pkgs/fzf.yml b/tasks/pkgs/fzf.yml index ee9ea30..2116177 100644 --- a/tasks/pkgs/fzf.yml +++ b/tasks/pkgs/fzf.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['fzf'] }}" +- name: Add cmake + when: + - cmake_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['fzf'] }}" + + - name: Set cmake_configured + ansible.builtin.set_fact: + cmake_configured: true diff --git a/tasks/pkgs/ghostty.yml b/tasks/pkgs/ghostty.yml index 0a3f690..15fb2a2 100644 --- a/tasks/pkgs/ghostty.yml +++ b/tasks/pkgs/ghostty.yml @@ -1,40 +1,52 @@ # vim: set filetype=yaml.ansible : --- -- name: Source pkg installation +- name: Add ghostty when: - - ghostty.method == 'src' - - ansible_distribution != 'MacOSX' + - ghostty_configured is undefined block: - - name: Build ghostty from source - notify: - - Depend zig - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ghostty.deps }}" - pkg_src: "{{ pkg_src + ['ghostty'] }}" + - name: Load ghostty config + ansible.builtin.include_tasks: + file: config/ghostty.yml -- name: Appimage installation - when: - - ghostty.method == 'appimage' - - ansible_distribution != 'MacOSX' - ansible.builtin.set_fact: - pkg_appimage: "{{ pkg_appimage + ghostty_vars.appimage }}" - -- name: Sys pkg installation - when: - - ghostty.method == 'sys' - block: - - name: Append to pkgs + - name: Source pkg installation when: - - ansible_distribution == 'Fedora' - notify: - - Depend terra repo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['ghostty'] }}" + - ghostty.method == 'src' + - ansible_distribution != 'MacOSX' + block: + - name: Build ghostty from source + notify: + - Depend zig + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ghostty.deps }}" + pkg_src: "{{ pkg_src + ['ghostty'] }}" -- name: Cask pkg installation - when: - - ghostty.method == 'brew' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['ghostty'] }}" + - name: Appimage installation + when: + - ghostty.method == 'appimage' + - ansible_distribution != 'MacOSX' + ansible.builtin.set_fact: + pkg_appimage: "{{ pkg_appimage + ghostty_vars.appimage }}" + + - name: Sys pkg installation + when: + - ghostty.method == 'sys' + block: + - name: Append to pkgs + when: + - ansible_distribution == 'Fedora' + notify: + - Depend terra repo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['ghostty'] }}" + + - name: Cask pkg installation + when: + - ghostty.method == 'brew' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['ghostty'] }}" + + - name: Set ghostty_configured + ansible.builtin.set_fact: + ghostty_configured: true diff --git a/tasks/pkgs/git.yml b/tasks/pkgs/git.yml index f5ec4a5..8217cf3 100644 --- a/tasks/pkgs/git.yml +++ b/tasks/pkgs/git.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + git.pkgs }}" +- name: Add git + when: + - git_configured is undefined + block: + - name: Load git config + ansible.builtin.include_tasks: + file: config/git.yml + + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + git.pkgs }}" + + - name: Set git_configured + ansible.builtin.set_fact: + git_configured: true diff --git a/tasks/pkgs/glow.yml b/tasks/pkgs/glow.yml index 0d0c3e5..2069a8e 100644 --- a/tasks/pkgs/glow.yml +++ b/tasks/pkgs/glow.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/charmbracelet/glow@latest'] }}" +- name: Add glow + when: + - glow_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/charmbracelet/glow@latest'] }}" + + - name: Set glow_configured + ansible.builtin.set_fact: + glow_configured: true diff --git a/tasks/pkgs/go.yml b/tasks/pkgs/go.yml index 7431f03..625c235 100644 --- a/tasks/pkgs/go.yml +++ b/tasks/pkgs/go.yml @@ -1,12 +1,24 @@ # vim: set filetype=yaml.ansible : --- -- name: Install from archive +- name: Add go when: - - go.method == 'archive' - ansible.builtin.set_fact: - pkg_archive: "{{ pkg_archive + ['go'] }}" + - go_configured is undefined + block: + - name: Load go config + ansible.builtin.include_tasks: + file: config/go.yml -- name: Append to pkgs - - go.method != 'archive' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['go'] }}" + - name: Install from archive + when: + - go.method == 'archive' + ansible.builtin.set_fact: + pkg_archive: "{{ pkg_archive + ['go'] }}" + + - name: Append to pkgs + - go.method != 'archive' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['go'] }}" + + - name: Set go_configured + ansible.builtin.set_fact: + go_configured: true diff --git a/tasks/pkgs/godot.yml b/tasks/pkgs/godot.yml index 42e0718..006c2bd 100644 --- a/tasks/pkgs/godot.yml +++ b/tasks/pkgs/godot.yml @@ -1,16 +1,24 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_flatpak +- name: Add godot when: - - ansible_system == 'Linux' - notify: - - Depend flatpak - changed_when: true - ansible.builtin.set_fact: - pkg_flatpak: "{{ pkg_flatpak + ['org.godotengine.Godot'] }}" + - godot_configured is undefined + block: + - name: Append to pkg_flatpak + when: + - ansible_system == 'Linux' + notify: + - Depend flatpak + changed_when: true + ansible.builtin.set_fact: + pkg_flatpak: "{{ pkg_flatpak + ['org.godotengine.Godot'] }}" -- name: Append to pkg_cask - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['godot'] }}" + - name: Append to pkg_cask + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['godot'] }}" + + - name: Set godot_configured + ansible.builtin.set_fact: + godot_configured: true diff --git a/tasks/pkgs/gopls.yml b/tasks/pkgs/gopls.yml index 34ef4d8..dfc90b0 100644 --- a/tasks/pkgs/gopls.yml +++ b/tasks/pkgs/gopls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['golang.org/x/tools/gopls@latest'] }}" +- name: Add gopls + when: + - gopls_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['golang.org/x/tools/gopls@latest'] }}" + + - name: Set gopls_configured + ansible.builtin.set_fact: + gopls_configured: true diff --git a/tasks/pkgs/gping.yml b/tasks/pkgs/gping.yml index 9a26a35..f31bbae 100644 --- a/tasks/pkgs/gping.yml +++ b/tasks/pkgs/gping.yml @@ -1,16 +1,24 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add gping when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['gping'] }}" + - gping_configured is undefined + block: + - name: Append to pkg_sys + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['gping'] }}" -- name: Append to pkg_cargo - when: - - ansible_system == 'Linux' - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['gping'] }}" + - name: Append to pkg_cargo + when: + - ansible_system == 'Linux' + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['gping'] }}" + + - name: Set gping_configured + ansible.builtin.set_fact: + gping_configured: true diff --git a/tasks/pkgs/heroic.yml b/tasks/pkgs/heroic.yml index b8080a6..f497694 100644 --- a/tasks/pkgs/heroic.yml +++ b/tasks/pkgs/heroic.yml @@ -1,16 +1,24 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_flatpak +- name: Add heroic when: - - ansible_system == 'Linux' - notify: - - Depend flatpak - changed_when: true - ansible.builtin.set_fact: - pkg_flatpak: "{{ pkg_flatpak + ['com.heroicgameslauncher.hgl'] }}" + - heroic_configured is undefined + block: + - name: Append to pkg_flatpak + when: + - ansible_system == 'Linux' + notify: + - Depend flatpak + changed_when: true + ansible.builtin.set_fact: + pkg_flatpak: "{{ pkg_flatpak + ['com.heroicgameslauncher.hgl'] }}" -- name: Append to pkg_cask - when: - - ansible_os_family == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['heroic'] }}" + - name: Append to pkg_cask + when: + - ansible_os_family == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['heroic'] }}" + + - name: Set heroic_configured + ansible.builtin.set_fact: + heroic_configured: true diff --git a/tasks/pkgs/htmlls.yml b/tasks/pkgs/htmlls.yml index b529871..558715a 100644 --- a/tasks/pkgs/htmlls.yml +++ b/tasks/pkgs/htmlls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}" +- name: Add htmlls + when: + - htmlls_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}" + + - name: Set htmlls_configured + ansible.builtin.set_fact: + htmlls_configured: true diff --git a/tasks/pkgs/htmx-lsp.yml b/tasks/pkgs/htmx-lsp.yml index 32a7506..1ba267e 100644 --- a/tasks/pkgs/htmx-lsp.yml +++ b/tasks/pkgs/htmx-lsp.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_cargo - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['htmx-lsp'] }}" +- name: Add htmx_lsp + when: + - htmx_lsp_configured is undefined + block: + - name: Add to pkg_cargo + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['htmx-lsp'] }}" + + - name: Set htmx_lsp_configured + ansible.builtin.set_fact: + htmx_lsp_configured: true diff --git a/tasks/pkgs/httpie.yml b/tasks/pkgs/httpie.yml index d457a84..5faa1b3 100644 --- a/tasks/pkgs/httpie.yml +++ b/tasks/pkgs/httpie.yml @@ -1,16 +1,28 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_flatpak +- name: Add httpie when: - - ansible_system == 'Linux' - notify: - - Depend flatpak - changed_when: true - ansible.builtin.set_fact: - pkg_flatpak: "{{ pkg_flatpak + [httpie.pkg] }}" + - httpie_configured is undefined + block: + - name: Load httpie config + ansible.builtin.include_tasks: + file: config/httpie.yml -- name: Append to pkg_cask - when: - - ansible_os_family == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + [httpie.pkg] }}" + - name: Append to pkg_flatpak + when: + - ansible_system == 'Linux' + notify: + - Depend flatpak + changed_when: true + ansible.builtin.set_fact: + pkg_flatpak: "{{ pkg_flatpak + [httpie.pkg] }}" + + - name: Append to pkg_cask + when: + - ansible_os_family == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + [httpie.pkg] }}" + + - name: Set httpie_configured + ansible.builtin.set_fact: + httpie_configured: true diff --git a/tasks/pkgs/hugo.yml b/tasks/pkgs/hugo.yml index ca0ad61..cf7232b 100644 --- a/tasks/pkgs/hugo.yml +++ b/tasks/pkgs/hugo.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['hugo'] }}" +- name: Add hugo + when: + - hugo_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['hugo'] }}" + + - name: Set hugo_configured + ansible.builtin.set_fact: + hugo_configured: true diff --git a/tasks/pkgs/hyperfine.yml b/tasks/pkgs/hyperfine.yml index 1a393d5..10546ea 100644 --- a/tasks/pkgs/hyperfine.yml +++ b/tasks/pkgs/hyperfine.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['hyperfine'] }}" +- name: Add hyperfine + when: + - hyperfine_configured is undefined + block: + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['hyperfine'] }}" + + - name: Set hyperfine_configured + ansible.builtin.set_fact: + hyperfine_configured: true diff --git a/tasks/pkgs/hyprcursor.yml b/tasks/pkgs/hyprcursor.yml index 40ca930..4822e08 100644 --- a/tasks/pkgs/hyprcursor.yml +++ b/tasks/pkgs/hyprcursor.yml @@ -1,4 +1,20 @@ -- name: Append to pkg_src - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + hyprcursor.build_deps }}" - pkg_src: "{{ pkg_src + ['hyprcursor'] }}" +# vim: set filetype=yaml.ansible : +--- +- name: Add hyprcursor + when: + - hyprcursor_configured is undefined + block: + - name: Load hyprcursor config + when: + - hyprcursor is undefined + ansible.builtin.include_tasks: + file: config/hyprcursor.yml + + - name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprcursor.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprcursor'] }}" + + - name: Set hyprcursor_configured + ansible.builtin.set_fact: + hyprcursor_configured: true diff --git a/tasks/pkgs/hyprgraphics.yml b/tasks/pkgs/hyprgraphics.yml index 195fc8e..e6dfcc8 100644 --- a/tasks/pkgs/hyprgraphics.yml +++ b/tasks/pkgs/hyprgraphics.yml @@ -1,4 +1,20 @@ -- name: Append to pkg_src - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + hyprgraphics.build_deps }}" - pkg_src: "{{ pkg_src + ['hyprgraphics'] }}" +# vim: set filetype=yaml.ansible : +--- +- name: Add hyprgraphics + when: + - hyprgraphics_configured is undefined + block: + - name: Load hyprgraphics config + when: + - hyprgraphics is undefined + ansible.builtin.include_tasks: + file: config/hyprgraphics.yml + + - name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprgraphics.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprgraphics'] }}" + + - name: Set hyprgraphics_configured + ansible.builtin.set_fact: + hyprgraphics_configured: true diff --git a/tasks/pkgs/hyprland.yml b/tasks/pkgs/hyprland.yml index e2ad47b..e80fe8c 100644 --- a/tasks/pkgs/hyprland.yml +++ b/tasks/pkgs/hyprland.yml @@ -1,13 +1,29 @@ -- name: Ensure pkg_deps are added - loop: "{{ hyprland.pkg_deps }}" - loop_control: - loop_var: pkg_dep - vars: - pkg: "{{ pkg_dep }}" - ansible.builtin.include_tasks: - file: addpkg.yml +# vim: set filetype=yaml.ansible : +--- +- name: Add hyprland + when: + - hyprland_configured is undefined + block: + - name: Load hyprland config + when: + - hyprland is undefined + ansible.builtin.include_tasks: + file: config/hyprland.yml -- name: Append to pkg_src - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + hyprland.build_deps }}" - pkg_src: "{{ pkg_src + ['hyprland'] }}" + - name: Ensure pkg_deps are added + loop: "{{ hyprland.pkg_deps }}" + loop_control: + loop_var: hyprland_pkg_dep + vars: + pkg: "{{ hyprland_pkg_dep }}" + ansible.builtin.include_tasks: + file: "pkgs/{{ hyprland_pkg_dep }}.yml" + + - name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprland.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprland'] }}" + + - name: Set hyprland_configured + ansible.builtin.set_fact: + hyprland_configured: true diff --git a/tasks/pkgs/hyprland_protocols.yml b/tasks/pkgs/hyprland_protocols.yml index 8203b95..0cbc407 100644 --- a/tasks/pkgs/hyprland_protocols.yml +++ b/tasks/pkgs/hyprland_protocols.yml @@ -1,4 +1,20 @@ -- name: Append to pkg lists - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + hyprland_protocols.build_deps }}" - pkg_src: "{{ pkg_src + ['hyprland_protocols'] }}" +# vim: set filetype=yaml.ansible : +--- +- name: Add hyprland-protocols + when: + - hyprland_protcols_configured is undefined + block: + - name: Load hyprland-protocols config + when: + - hyprland_protocols is undefined + ansible.builtin.include_tasks: + file: config/hyprland_protocols.yml + + - name: Append to pkg lists + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprland_protocols.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprland_protocols'] }}" + + - name: Set hyprland_protcols_configured + ansible.builtin.set_fact: + hyprland_protcols_configured: true diff --git a/tasks/pkgs/hyprlang.yml b/tasks/pkgs/hyprlang.yml index 7ad8531..b788e26 100644 --- a/tasks/pkgs/hyprlang.yml +++ b/tasks/pkgs/hyprlang.yml @@ -1,13 +1,29 @@ -- name: Ensure pkg_deps are added - loop: "{{ hyprlang.pkg_deps }}" - loop_control: - loop_var: pkg_dep - vars: - pkg: "{{ pkg_dep }}" - ansible.builtin.include_tasks: - file: addpkg.yml +# vim: set filetype=yaml.ansible : +--- +- name: Add hyprlang + when: + - hyprlang_configured + block: + - name: Load hyprlang config + when: + - hyprlang is undefined + ansible.builtin.include_tasks: + file: config/hyprlang.yml -- name: Append to pkg_src - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + hyprlang.build_deps }}" - pkg_src: "{{ pkg_src + ['hyprlang'] }}" + - name: Ensure pkg_deps are added + loop: "{{ hyprlang.pkg_deps }}" + loop_control: + loop_var: hyprlang_pkg_dep + vars: + pkg: "{{ hyprlang_pkg_dep }}" + ansible.builtin.include_tasks: + file: "pkgs/{{ hyprlang_pkg_dep }}.yml" + + - name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprlang.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprlang'] }}" + + - name: Set hyprlang_configured + ansible.builtin.set_fact: + hyprlang_configured: true diff --git a/tasks/pkgs/hyprutils.yml b/tasks/pkgs/hyprutils.yml index 15d84eb..f9b6e74 100644 --- a/tasks/pkgs/hyprutils.yml +++ b/tasks/pkgs/hyprutils.yml @@ -1,4 +1,20 @@ -- name: Append to pkg_src - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + hyprutils.build_deps }}" - pkg_src: "{{ pkg_src + ['hyprutils'] }}" +# vim: set filetype=yaml.ansible : +--- +- name: Add hyprutils + when: + - hyprutils_configured is undefined + block: + - name: Load hyprutils config + when: + - hyprutils is undefined + ansible.builtin.include_tasks: + file: config/hyprutils.yml + + - name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprutils.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprutils'] }}" + + - name: Set hyprutils_configured + ansible.builtin.set_fact: + hyprutils_configured: true diff --git a/tasks/pkgs/hyprwayland_scanner.yml b/tasks/pkgs/hyprwayland_scanner.yml index 68a694e..07d600b 100644 --- a/tasks/pkgs/hyprwayland_scanner.yml +++ b/tasks/pkgs/hyprwayland_scanner.yml @@ -1,6 +1,22 @@ -- name: Append to pkg_sys and pkg_src +# vim: set filetype=yaml.ansible : +--- +- name: Add hyprwayland-scanner when: - - ansible_os_family == 'RedHat' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + hyprwayland_scanner.build_deps }}" - pkg_src: "{{ pkg_src + ['hyprwayland_scanner'] }}" + - hyprwayland_scanner_configured is undefined + block: + - name: Load hyprwayland-scanner config + when: + - hyprwayland_scanner is undefined + ansible.builtin.include_tasks: + file: config/hyprwayland_scanner.yml + + - name: Append to pkg_sys and pkg_src + when: + - ansible_os_family == 'RedHat' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + hyprwayland_scanner.build_deps }}" + pkg_src: "{{ pkg_src + ['hyprwayland_scanner'] }}" + + - name: Set hyprwayland_scanner_configured + ansible.builtin.set_fact: + hyprwayland_scanner_configured: true diff --git a/tasks/pkgs/intelephense.yml b/tasks/pkgs/intelephense.yml index cbfcc8d..9b9c138 100644 --- a/tasks/pkgs/intelephense.yml +++ b/tasks/pkgs/intelephense.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['intelephense'] }}" +- name: Add intelephense + when: + - intelephense_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['intelephense'] }}" + + - name: Set intelephense_configured + ansible.builtin.set_fact: + intelephense_configured: true diff --git a/tasks/pkgs/jinja-lsp.yml b/tasks/pkgs/jinja-lsp.yml index d983665..6cbec04 100644 --- a/tasks/pkgs/jinja-lsp.yml +++ b/tasks/pkgs/jinja-lsp.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_cargo - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['jinja-lsp'] }}" +- name: Add jinja_lsp + when: + - jinja_lsp_configured is undefined + block: + - name: Add to pkg_cargo + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['jinja-lsp'] }}" + + - name: Set jinja_lsp_configured + ansible.builtin.set_fact: + jinja_lsp_configured: true diff --git a/tasks/pkgs/jq.yml b/tasks/pkgs/jq.yml index 4911305..da6a9b0 100644 --- a/tasks/pkgs/jq.yml +++ b/tasks/pkgs/jq.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['jq'] }}" +- name: Add jq + when: + - jq_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['jq'] }}" + + - name: Set jq_configured + ansible.builtin.set_fact: + jq_configured: true diff --git a/tasks/pkgs/jsonls.yml b/tasks/pkgs/jsonls.yml index b529871..d5bc337 100644 --- a/tasks/pkgs/jsonls.yml +++ b/tasks/pkgs/jsonls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}" +- name: Add jsonls + when: + - jsonls_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['vscode-langservers-extracted'] }}" + + - name: Set jsonls_configured + ansible.builtin.set_fact: + jsonls_configured: true diff --git a/tasks/pkgs/kitty.yml b/tasks/pkgs/kitty.yml index a814194..2423f56 100644 --- a/tasks/pkgs/kitty.yml +++ b/tasks/pkgs/kitty.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + kitty.pkgs }}" +- name: Add kitty + when: + - kitty_configured is undefined + block: + - name: Load kitty config + ansible.builtin.include_tasks: + file: config/kitty.yml + + - name: Add to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + kitty.pkgs }}" + + - name: Set kitty_configured + ansible.builtin.set_fact: + kitty_configured: true diff --git a/tasks/pkgs/lazygit.yml b/tasks/pkgs/lazygit.yml index 750e785..0e08e0a 100644 --- a/tasks/pkgs/lazygit.yml +++ b/tasks/pkgs/lazygit.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/jesseduffield/lazygit@latest'] }}" +- name: Add lazygit + when: + - lazygit_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/jesseduffield/lazygit@latest'] }}" + + - name: Set lazygit_configured + ansible.builtin.set_fact: + lazygit_configured: true diff --git a/tasks/pkgs/libreoffice.yml b/tasks/pkgs/libreoffice.yml index 9cafca3..33beefe 100644 --- a/tasks/pkgs/libreoffice.yml +++ b/tasks/pkgs/libreoffice.yml @@ -1,19 +1,31 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_flatpak +- name: Add libreoffice when: - - libreoffice.method == 'flatpak' - ansible.builtin.set_fact: - pkg_flatpak: "{{ pkg_flatpak + [libreoffice.flatpak] }}" + - libreoffice_configured is undefined + block: + - name: Load libreoffice config + ansible.builtin.include_tasks: + file: config/libreoffice.yml -- name: Append to pkg_sys - when: - - libreoffice.method == 'sys' - ansible.builtin.set_fact: - sys_pkg: "{{ sys_pkg + libreoffice.pkgs }}" + - name: Append to pkg_flatpak + when: + - libreoffice.method == 'flatpak' + ansible.builtin.set_fact: + pkg_flatpak: "{{ pkg_flatpak + [libreoffice.flatpak] }}" -- name: Append to caskpkgs - when: - - libreoffice.method == 'cask' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + libreoffice.pkgs }}" + - name: Append to pkg_sys + when: + - libreoffice.method == 'sys' + ansible.builtin.set_fact: + sys_pkg: "{{ sys_pkg + libreoffice.pkgs }}" + + - name: Append to caskpkgs + when: + - libreoffice.method == 'cask' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + libreoffice.pkgs }}" + + - name: Set libreoffice_configured + ansible.builtin.set_fact: + libreoffice_configured: true diff --git a/tasks/pkgs/luals.yml b/tasks/pkgs/luals.yml index b64bb6d..2829b06 100644 --- a/tasks/pkgs/luals.yml +++ b/tasks/pkgs/luals.yml @@ -1,13 +1,25 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs +- name: Add luals when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_archive: "{{ pkg_archive + ['luals'] }}" + - luals_configured is undefined + block: + - name: Load luals config + ansible.builtin.include_tasks: + file: config/luals.yml -- name: Append to pkg_sys - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['lua-language-server'] }}" + - name: Append to pkgs + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_archive: "{{ pkg_archive + ['luals'] }}" + + - name: Append to pkg_sys + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['lua-language-server'] }}" + + - name: Set luals_configured + ansible.builtin.set_fact: + luals_configured: true diff --git a/tasks/pkgs/markdownlint-cli.yml b/tasks/pkgs/markdownlint-cli.yml index 978e3a9..6eeda64 100644 --- a/tasks/pkgs/markdownlint-cli.yml +++ b/tasks/pkgs/markdownlint-cli.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['markdownlint-cli'] }}" +- name: Add markdownlint_cli + when: + - markdownlint_cli_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['markdownlint-cli'] }}" + + - name: Set markdownlint_cli_configured + ansible.builtin.set_fact: + markdownlint_cli_configured: true diff --git a/tasks/pkgs/mcfly.yml b/tasks/pkgs/mcfly.yml index a90770e..b78bc86 100644 --- a/tasks/pkgs/mcfly.yml +++ b/tasks/pkgs/mcfly.yml @@ -1,13 +1,21 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add mcfly when: - - ansible_os_family == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['mcfly'] }}" + - mcfly_configured is undefined + block: + - name: Append to pkg_sys + when: + - ansible_os_family == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['mcfly'] }}" -- name: Add to pkg_cargo - when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['mcfly'] }}" + - name: Add to pkg_cargo + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['mcfly'] }}" + + - name: Set mcfly_configured + ansible.builtin.set_fact: + mcfly_configured: true diff --git a/tasks/pkgs/neovide.yml b/tasks/pkgs/neovide.yml index ba42265..e732e1f 100644 --- a/tasks/pkgs/neovide.yml +++ b/tasks/pkgs/neovide.yml @@ -1,17 +1,29 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs +- name: Add neovide when: - - ansible_system == 'Linux' - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + neovide.deps }}" - pkg_cargo: "{{ pkg_cargo + [neovide] }}" + - neovide_configured is undefined + block: + - name: Load neovide config + ansible.builtin.include_tasks: + file: config/neovide.yml -- name: Append neovide to pkg_cask - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['neovide'] }}" + - name: Append to pkgs + when: + - ansible_system == 'Linux' + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + neovide.deps }}" + pkg_cargo: "{{ pkg_cargo + [neovide] }}" + + - name: Append neovide to pkg_cask + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['neovide'] }}" + + - name: Set neovide_configured + ansible.builtin.set_fact: + neovide_configured: true diff --git a/tasks/pkgs/neovim.yml b/tasks/pkgs/neovim.yml index 77191b7..f313dd7 100644 --- a/tasks/pkgs/neovim.yml +++ b/tasks/pkgs/neovim.yml @@ -1,13 +1,25 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to appimages +- name: Add neovim when: - - neovim.method == 'appimage' - ansible.builtin.set_fact: - pkg_appimage: "{{ pkg_appimage + ['neovim'] }}" + - neovim_configured is undefined + block: + - name: Load neovim config + ansible.builtin.include_tasks: + file: config/neovim.yml -- name: Append neovim to pkg_sys - when: - - neovim.method == 'sys' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['neovim'] }}" + - name: Append to appimages + when: + - neovim.method == 'appimage' + ansible.builtin.set_fact: + pkg_appimage: "{{ pkg_appimage + ['neovim'] }}" + + - name: Append neovim to pkg_sys + when: + - neovim.method == 'sys' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['neovim'] }}" + + - name: Set neovim_configured + ansible.builtin.set_fact: + neovim_configured: true diff --git a/tasks/pkgs/nerdfonts.yml b/tasks/pkgs/nerdfonts.yml index 78a2548..c37b448 100644 --- a/tasks/pkgs/nerdfonts.yml +++ b/tasks/pkgs/nerdfonts.yml @@ -1,16 +1,28 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to srcpkgs +- name: Add nerdfonts when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_archive: "{{ pkg_archive + ['nerdfonts'] }}" + - nerdfonts_configured is undefined + block: + - name: Load nerdfonts config + ansible.builtin.include_tasks: + file: config/nerdfonts.yml -- name: Append to caskpkgs - when: - - ansible_system == 'Darwin' - loop: "{{ nerdfonts.fonts }}" - loop_control: - loop_var: font - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + [pkgconfig.nerdfonts.fonts[font].brew] }}" + - name: Append to srcpkgs + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_archive: "{{ pkg_archive + ['nerdfonts'] }}" + + - name: Append to caskpkgs + when: + - ansible_system == 'Darwin' + loop: "{{ nerdfonts.fonts }}" + loop_control: + loop_var: font + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + [pkgconfig.nerdfonts.fonts[font].brew] }}" + + - name: Set nerdfonts_configured + ansible.builtin.set_fact: + nerdfonts_configured: true diff --git a/tasks/pkgs/nextcloud.yml b/tasks/pkgs/nextcloud.yml index 8b0a9de..779ab30 100644 --- a/tasks/pkgs/nextcloud.yml +++ b/tasks/pkgs/nextcloud.yml @@ -1,24 +1,36 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_Flatpak +- name: Add nextcloud_client when: - - ansible_system == 'Linux' - - nextcloud.method == 'flatpak' - notify: - - Depend flatpak - changed_when: true - ansible.builtin.set_fact: - pkg_flatpak: "{{ pkg_flatpak + [nextcloud] }}" + - nextcloud_client_configured is undefined + block: + - name: Load nextcloud-client config + ansible.builtin.include_tasks: + file: config/nextcloud.yml -- name: Append to pkg_sys - when: - - ansible_system == 'Linux' - - nextcloud.method == 'sys' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['nextcloud'] }}" + - name: Append to pkg_Flatpak + when: + - ansible_system == 'Linux' + - nextcloud.method == 'flatpak' + notify: + - Depend flatpak + changed_when: true + ansible.builtin.set_fact: + pkg_flatpak: "{{ pkg_flatpak + [nextcloud] }}" -- name: Append to pkg_cask - when: - - ansible_os_family == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['nextcloud'] }}" + - name: Append to pkg_sys + when: + - ansible_system == 'Linux' + - nextcloud.method == 'sys' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['nextcloud'] }}" + + - name: Append to pkg_cask + when: + - ansible_os_family == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['nextcloud'] }}" + + - name: Set nextcloud_client_configured + ansible.builtin.set_fact: + nextcloud_client_configured: true diff --git a/tasks/pkgs/nginxls.yml b/tasks/pkgs/nginxls.yml index 844322c..5c769da 100644 --- a/tasks/pkgs/nginxls.yml +++ b/tasks/pkgs/nginxls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_pipx - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_pipx: "{{ pkg_pipx + ['nginx-language-server'] }}" +- name: Add nginxls + when: + - nginxls_configured is undefined + block: + - name: Add to pkg_pipx + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_pipx: "{{ pkg_pipx + ['nginx-language-server'] }}" + + - name: Set nginxls_configured + ansible.builtin.set_fact: + nginxls_configured: true diff --git a/tasks/pkgs/nodejs.yml b/tasks/pkgs/nodejs.yml index 4ee1ac1..2ce10d5 100644 --- a/tasks/pkgs/nodejs.yml +++ b/tasks/pkgs/nodejs.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + nodejs.pkgs }}" +- name: Add nodejs + when: + - nodejs_configured is undefined + block: + - name: Load nodejs config + ansible.builtin.include_tasks: + file: config/nodejs.yml + + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + nodejs.pkgs }}" + + - name: Set nodejs_configured + ansible.builtin.set_fact: + nodejs_configured: true diff --git a/tasks/pkgs/nomad.yml b/tasks/pkgs/nomad.yml index f353659..e1ba75f 100644 --- a/tasks/pkgs/nomad.yml +++ b/tasks/pkgs/nomad.yml @@ -1,19 +1,31 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_tap +- name: Add nomad when: - - ansible_distribution == 'MacOSX' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_tap: "{{ pkg_tap + nomad.pkgs }}" + - nomad_configured is undefined + block: + - name: Load nomad config + ansible.builtin.include_tasks: + file: config/nomad.yml -- name: Append to pkg_sys - when: - - ansible_system == 'Linux' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + nomad.pkgs }}" + - name: Append to pkg_tap + when: + - ansible_distribution == 'MacOSX' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_tap: "{{ pkg_tap + nomad.pkgs }}" + + - name: Append to pkg_sys + when: + - ansible_system == 'Linux' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + nomad.pkgs }}" + + - name: Set nomad_configured + ansible.builtin.set_fact: + nomad_configured: true diff --git a/tasks/pkgs/packer.yml b/tasks/pkgs/packer.yml index 7030445..fe474dc 100644 --- a/tasks/pkgs/packer.yml +++ b/tasks/pkgs/packer.yml @@ -1,16 +1,28 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_tap +- name: Add packer when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_tap: "{{ pkg_tap + packer.pkgs }}" + - packer_configured is undefined + block: + - name: Load packer config + ansible.builtin.include_tasks: + file: config/packer.yml -- name: Append to pkg_sys - when: - - ansible_system == 'Linux' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + packer.pkgs }}" + - name: Append to pkg_tap + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_tap: "{{ pkg_tap + packer.pkgs }}" + + - name: Append to pkg_sys + when: + - ansible_system == 'Linux' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + packer.pkgs }}" + + - name: Set packer_configured + ansible.builtin.set_fact: + packer_configured: true diff --git a/tasks/pkgs/pandoc.yml b/tasks/pkgs/pandoc.yml index 8da3c55..c5c947b 100644 --- a/tasks/pkgs/pandoc.yml +++ b/tasks/pkgs/pandoc.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['pandoc'] }}" +- name: Add pandoc + when: + - pandoc_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['pandoc'] }}" + + - name: Set pandoc_configured + ansible.builtin.set_fact: + pandoc_configured: true diff --git a/tasks/pkgs/pgadmin.yml b/tasks/pkgs/pgadmin.yml index 7df7ac8..786c911 100644 --- a/tasks/pkgs/pgadmin.yml +++ b/tasks/pkgs/pgadmin.yml @@ -1,16 +1,28 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_flatpak +- name: Add pgadmin when: - - pgadmin.method == 'flatpak' - notify: - - Depend flatpak - changed_when: true - ansible.builtin.set_fact: - pkg_flatpak: "{{ pkg_flatpak + [pgadmin.flatpak] }}" + - pgadmin_configured is undefined + block: + - name: Load pgadmin config + ansible.builtin.include_tasks: + file: config/pgadmin.yml -- name: Append to pkg_cask - when: - - pgadmin.method == 'cask' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + pgadmin.pkgs }}" + - name: Append to pkg_flatpak + when: + - pgadmin.method == 'flatpak' + notify: + - Depend flatpak + changed_when: true + ansible.builtin.set_fact: + pkg_flatpak: "{{ pkg_flatpak + [pgadmin.flatpak] }}" + + - name: Append to pkg_cask + when: + - pgadmin.method == 'cask' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + pgadmin.pkgs }}" + + - name: Set pgadmin_configured + ansible.builtin.set_fact: + pgadmin_configured: true diff --git a/tasks/pkgs/pipx.yml b/tasks/pkgs/pipx.yml index dcfe774..34f70d5 100644 --- a/tasks/pkgs/pipx.yml +++ b/tasks/pkgs/pipx.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['pipx'] }}" +- name: Add pipx + when: + - pipx_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['pipx'] }}" + + - name: Set pipx_configured + ansible.builtin.set_fact: + pipx_configured: true diff --git a/tasks/pkgs/podman.yml b/tasks/pkgs/podman.yml index 7183e96..5700a44 100644 --- a/tasks/pkgs/podman.yml +++ b/tasks/pkgs/podman.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['podman'] }}" +- name: Add podman + when: + - podman_configured is undefined + block: + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['podman'] }}" + + - name: Set podman_configured + ansible.builtin.set_fact: + podman_configured: true diff --git a/tasks/pkgs/pulumi.yml b/tasks/pkgs/pulumi.yml index 5407c4b..a36c012 100644 --- a/tasks/pkgs/pulumi.yml +++ b/tasks/pkgs/pulumi.yml @@ -1,3 +1,17 @@ -- name: Append pulumit to pkg_archive - ansible.builtin.set_fact: - pkg_archive: "{{ pkg_archive + ['pulumi'] }}" +# vim: set filetype=yaml.ansible : +--- +- name: Add pulumi + when: + - pulumi_configured is undefined + block: + - name: Load pulumi config + ansible.builtin.include_tasks: + file: config/pulumi.yml + + - name: Append pulumit to pkg_archive + ansible.builtin.set_fact: + pkg_archive: "{{ pkg_archive + ['pulumi'] }}" + + - name: Set pulumi_configured + ansible.builtin.set_fact: + pulumi_configured: true diff --git a/tasks/pkgs/pyright.yml b/tasks/pkgs/pyright.yml index 4269cf5..f8f699f 100644 --- a/tasks/pkgs/pyright.yml +++ b/tasks/pkgs/pyright.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_pipx - notify: - - Depend pipx - changed_when: true - ansible.builtin.set_fact: - pkg_pipx: "{{ pkg_pipx + ['pyright'] }}" +- name: Add pyright + when: + - pyright_configured is undefined + block: + - name: Add to pkg_pipx + notify: + - Depend pipx + changed_when: true + ansible.builtin.set_fact: + pkg_pipx: "{{ pkg_pipx + ['pyright'] }}" + + - name: Set pyright_configured + ansible.builtin.set_fact: + pyright_configured: true diff --git a/tasks/pkgs/python3.yml b/tasks/pkgs/python3.yml index f784fb4..1464dc5 100644 --- a/tasks/pkgs/python3.yml +++ b/tasks/pkgs/python3.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + python3.pkgs }}" +- name: Add python3 + when: + - python3_configured is undefined + block: + - name: Load python3 config + ansible.builtin.include_tasks: + file: config/python3.yml + + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + python3.pkgs }}" + + - name: Set python3_configured + ansible.builtin.set_fact: + python3_configured: true diff --git a/tasks/pkgs/quobix-vacuum.yml b/tasks/pkgs/quobix-vacuum.yml index 291b8a5..6c5c8cf 100644 --- a/tasks/pkgs/quobix-vacuum.yml +++ b/tasks/pkgs/quobix-vacuum.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['@quobix/vacuum'] }}" +- name: Add quobix_vacuum + when: + - quobix_vacuum_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['@quobix/vacuum'] }}" + + - name: Set quobix_vacuum_configured + ansible.builtin.set_fact: + quobix_vacuum_configured: true diff --git a/tasks/pkgs/revive.yml b/tasks/pkgs/revive.yml index b5e228c..bb3a58a 100644 --- a/tasks/pkgs/revive.yml +++ b/tasks/pkgs/revive.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/mgechev/revive@latest'] }}" +- name: Add revive + when: + - revive_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/mgechev/revive@latest'] }}" + + - name: Set revive_configured + ansible.builtin.set_fact: + revive_configured: true diff --git a/tasks/pkgs/ripgrep.yml b/tasks/pkgs/ripgrep.yml index 8edeef5..3871920 100644 --- a/tasks/pkgs/ripgrep.yml +++ b/tasks/pkgs/ripgrep.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['ripgrep'] }}" +- name: Add ripgrep + when: + - ripgrep_configured is undefined + block: + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['ripgrep'] }}" + + - name: Set ripgrep_configured + ansible.builtin.set_fact: + ripgrep_configured: true diff --git a/tasks/pkgs/rust.yml b/tasks/pkgs/rust.yml index 6ee7716..472a1e3 100644 --- a/tasks/pkgs/rust.yml +++ b/tasks/pkgs/rust.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + rust.pkgs }}" +- name: Add rust + when: + - rust_configured is undefined + block: + - name: Load rust config + ansible.builtin.include_tasks: + file: config/rust.yml + + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + rust.pkgs }}" + + - name: Set rust_configured + ansible.builtin.set_fact: + rust_configured: true diff --git a/tasks/pkgs/sd.yml b/tasks/pkgs/sd.yml index 058a056..89114ae 100644 --- a/tasks/pkgs/sd.yml +++ b/tasks/pkgs/sd.yml @@ -1,16 +1,24 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add sd when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['sd'] }}" + - sd_configured is undefined + block: + - name: Append to pkg_sys + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['sd'] }}" -- name: Add to pkg_cargo - when: - - ansible_system == 'Linux' - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['sd'] }}" + - name: Add to pkg_cargo + when: + - ansible_system == 'Linux' + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['sd'] }}" + + - name: Set sd_configured + ansible.builtin.set_fact: + sd_configured: true diff --git a/tasks/pkgs/sdbus_cpp_2.yml b/tasks/pkgs/sdbus_cpp_2.yml index a97a75d..8911ffa 100644 --- a/tasks/pkgs/sdbus_cpp_2.yml +++ b/tasks/pkgs/sdbus_cpp_2.yml @@ -1,4 +1,20 @@ -- name: Append to pkg list - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + sdbus_cpp_2.build_deps }}" - pkg_src: "{{ pkg_src + ['sdbus_cpp_2'] }}" +# vim: set filetype=yaml.ansible : +--- +- name: Add sdbus_cpp_2 + when: + - sdbus_cpp_2_configured is undefined + block: + - name: Load sdbus-cpp-2 config + when: + - sdbus_cpp_2 is undefined + ansible.builtin.include_tasks: + file: config/sdbus_cpp_2.yml + + - name: Append to pkg list + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + sdbus_cpp_2.build_deps }}" + pkg_src: "{{ pkg_src + ['sdbus_cpp_2'] }}" + + - name: Set sdbus_cpp_2_configured + ansible.builtin.set_fact: + sdbus_cpp_2_configured: true diff --git a/tasks/pkgs/sqlfluff.yml b/tasks/pkgs/sqlfluff.yml index 9199abf..9864809 100644 --- a/tasks/pkgs/sqlfluff.yml +++ b/tasks/pkgs/sqlfluff.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_pipx - notify: - - Depend pipx - changed_when: true - ansible.builtin.set_fact: - pkg_pipx: "{{ pkg_pipx + ['sqlfluff'] }}" +- name: Add sqlfluff + when: + - sqlfluff_configured is undefined + block: + - name: Add to pkg_pipx + notify: + - Depend pipx + changed_when: true + ansible.builtin.set_fact: + pkg_pipx: "{{ pkg_pipx + ['sqlfluff'] }}" + + - name: Set sqlfluff_configured + ansible.builtin.set_fact: + sqlfluff_configured: true diff --git a/tasks/pkgs/sqlls.yml b/tasks/pkgs/sqlls.yml index 745823a..42cb8b9 100644 --- a/tasks/pkgs/sqlls.yml +++ b/tasks/pkgs/sqlls.yml @@ -1,8 +1,16 @@ # vim: filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['sql-language-server'] }}" +- name: Add sqlls + when: + - sqlls_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['sql-language-server'] }}" + + - name: Set sqlls_configured + ansible.builtin.set_fact: + sqlls_configured: true diff --git a/tasks/pkgs/starship.yml b/tasks/pkgs/starship.yml index 1c8272a..5c4f364 100644 --- a/tasks/pkgs/starship.yml +++ b/tasks/pkgs/starship.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_cargo - notify: - - Depend cargo - changed_when: true - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['starship'] }}" +- name: Add starship + when: + - starship_configured is undefined + block: + - name: Add to pkg_cargo + notify: + - Depend cargo + changed_when: true + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['starship'] }}" + + - name: Set starship_configured + ansible.builtin.set_fact: + starship_configured: true diff --git a/tasks/pkgs/stow.yml b/tasks/pkgs/stow.yml index 52257a3..7f68c5e 100644 --- a/tasks/pkgs/stow.yml +++ b/tasks/pkgs/stow.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['stow'] }}" +- name: Add stow + when: + - stow_configured is undefined + block: + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['stow'] }}" + + - name: Set stow_configured + ansible.builtin.set_fact: + stow_configured: true diff --git a/tasks/pkgs/tailscale.yml b/tasks/pkgs/tailscale.yml index 3a710d3..6413946 100644 --- a/tasks/pkgs/tailscale.yml +++ b/tasks/pkgs/tailscale.yml @@ -1,65 +1,77 @@ # vim: set filetype=yaml.ansible : --- -- name: Enable for linux +- name: Add tailscale when: - - ansible_system == 'Linux' + - tailscale_configured is undefined block: - - name: Enable for RedHat distros + - name: Load tailscale config + ansible.builtin.include_tasks: + file: config/tailscale.yml + + - name: Enable for linux when: - - ansible_os_family == 'RedHat' + - ansible_system == 'Linux' block: - - name: Fedora >=41 - ansible.builtin.command: - creates: /etc/yum.repos.d/tailscale.repo - cmd: "dnf config-manager addrepo --from-repofile={{ tailscale.url_base }}/fedora/tailscale.repo" - become: true + - name: Enable for RedHat distros when: - - ansible_distribution == 'Fedora' - - ansible_distribution_major_version|int >= 41 - - - name: Fedora <41 - ansible.builtin.command: - creates: /etc/yum.repos.d/tailscale.repo - cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/fedora/tailscale.repo" - become: true - when: - - ansible_distribution == 'Fedora' - - ansible_distribution_major_version|int < 41 - - - name: Rhel based distros - ansible.builtin.command: - creates: /etc/yum.repos.d/tailscale.repo - cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/rhel/{{ ansible_os_major_version }}/tailscale.repo" - become: true - when: - - ansible_distribution != 'Fedora' - - - name: Enable for Debian distros - when: - - ansible_os_family == 'Debian' - block: - - name: Install tailscale keyring + - ansible_os_family == 'RedHat' block: - - name: Get tailscal keyring - become: "{{ sys_pkg_become }}" - ansible.builtin.get_url: - url: "{{ tailscale.url_base }}/debian/{{ tailscale.release.gpg }}" - dest: /usr/share/keyrings/tailscale-archive-keyring.gpg - mode: '0644' + - name: Fedora >=41 + ansible.builtin.command: + creates: /etc/yum.repos.d/tailscale.repo + cmd: "dnf config-manager addrepo --from-repofile={{ tailscale.url_base }}/fedora/tailscale.repo" + become: true + when: + - ansible_distribution == 'Fedora' + - ansible_distribution_major_version|int >= 41 - - name: Get tailscale repo list - become: "{{ sys_pkg_become }}" - ansible.builtin.get_url: - url: "{{ tailscale.url_base }}/debian/{{ tailscale.release.list }}" - dest: /etc/apt/sources.list.d/tailscale.list - mode: '0644' + - name: Fedora <41 + ansible.builtin.command: + creates: /etc/yum.repos.d/tailscale.repo + cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/fedora/tailscale.repo" + become: true + when: + - ansible_distribution == 'Fedora' + - ansible_distribution_major_version|int < 41 - - name: Append to pkg_sys + - name: Rhel based distros + ansible.builtin.command: + creates: /etc/yum.repos.d/tailscale.repo + cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/rhel/{{ ansible_os_major_version }}/tailscale.repo" + become: true + when: + - ansible_distribution != 'Fedora' + + - name: Enable for Debian distros + when: + - ansible_os_family == 'Debian' + block: + - name: Install tailscale keyring + block: + - name: Get tailscal keyring + become: "{{ sys_pkg_become }}" + ansible.builtin.get_url: + url: "{{ tailscale.url_base }}/debian/{{ tailscale.release.gpg }}" + dest: /usr/share/keyrings/tailscale-archive-keyring.gpg + mode: '0644' + + - name: Get tailscale repo list + become: "{{ sys_pkg_become }}" + ansible.builtin.get_url: + url: "{{ tailscale.url_base }}/debian/{{ tailscale.release.list }}" + dest: /etc/apt/sources.list.d/tailscale.list + mode: '0644' + + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['tailscale'] }}" + + - name: Append to pkg_cask + when: + - ansible_system == 'Darwin' ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['tailscale'] }}" + pkg_cask: "{{ pkg_cask + ['tailscale'] }}" -- name: Append to pkg_cask - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['tailscale'] }}" + - name: Set tailscale_configured + ansible.builtin.set_fact: + tailscale_configured: true diff --git a/tasks/pkgs/tailwindcss-languageserver.yml b/tasks/pkgs/tailwindcss-languageserver.yml index 04f47b6..166dd56 100644 --- a/tasks/pkgs/tailwindcss-languageserver.yml +++ b/tasks/pkgs/tailwindcss-languageserver.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['@tailwindcss/language-server'] }}" +- name: Add tailwindcss_languageserver + when: + - tailwindcss_languageserver_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['@tailwindcss/language-server'] }}" + + - name: Set tailwindcss_languageserver_configured + ansible.builtin.set_fact: + tailwindcss_languageserver_configured: true diff --git a/tasks/pkgs/templ.yml b/tasks/pkgs/templ.yml index 23dd68f..52ab59d 100644 --- a/tasks/pkgs/templ.yml +++ b/tasks/pkgs/templ.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_go - notify: - - Depend go - changed_when: true - ansible.builtin.set_fact: - pkg_go: "{{ pkg_go + ['github.com/a-h/templ/cmd/templ@latest'] }}" +- name: Add templ + when: + - templ_configured is undefined + block: + - name: Add to pkg_go + notify: + - Depend go + changed_when: true + ansible.builtin.set_fact: + pkg_go: "{{ pkg_go + ['github.com/a-h/templ/cmd/templ@latest'] }}" + + - name: Set templ_configured + ansible.builtin.set_fact: + templ_configured: true diff --git a/tasks/pkgs/terraform.yml b/tasks/pkgs/terraform.yml index 946eb53..f39867c 100644 --- a/tasks/pkgs/terraform.yml +++ b/tasks/pkgs/terraform.yml @@ -1,21 +1,33 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs +- name: Add terraform + when: + - terraform_configured is undefined block: - - name: MacOSX specific - when: - - ansible_distribution == 'MacOSX' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_tap: "{{ pkg_tap + terraform.pkgs }}" + - name: Load terraform config + ansible.builtin.include_tasks: + file: config/terraform.yml - - name: Linux specific - when: - - ansible_system == 'Linux' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + terraform.pkgs }}" + - name: Append to pkgs + block: + - name: MacOSX specific + when: + - ansible_distribution == 'MacOSX' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_tap: "{{ pkg_tap + terraform.pkgs }}" + + - name: Linux specific + when: + - ansible_system == 'Linux' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + terraform.pkgs }}" + + - name: Set terraform_configured + ansible.builtin.set_fact: + terraform_configured: true diff --git a/tasks/pkgs/terraformls.yml b/tasks/pkgs/terraformls.yml index e804669..a499bdc 100644 --- a/tasks/pkgs/terraformls.yml +++ b/tasks/pkgs/terraformls.yml @@ -1,21 +1,33 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs +- name: Add terraformls + when: + - terraformls_configured is undefined block: - - name: MacOS specific - when: - - ansible_system == 'Darwin' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_tap: "{{ pkg_tap + terraformls.pkgs }}" + - name: Load terraformls config + ansible.builtin.include_tasks: + file: config/terraformls.yml - - name: Linux specific - when: - - ansible_system == 'Linux' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + terraformls.pkgs }}" + - name: Append to pkgs + block: + - name: MacOS specific + when: + - ansible_system == 'Darwin' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_tap: "{{ pkg_tap + terraformls.pkgs }}" + + - name: Linux specific + when: + - ansible_system == 'Linux' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + terraformls.pkgs }}" + + - name: Set terraformls_configured + ansible.builtin.set_fact: + terraformls_configured: true diff --git a/tasks/pkgs/thunderbird.yml b/tasks/pkgs/thunderbird.yml index 9fa2bdb..2b40b5b 100644 --- a/tasks/pkgs/thunderbird.yml +++ b/tasks/pkgs/thunderbird.yml @@ -1,13 +1,21 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add thunderbird when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['thunderbird'] }}" + - thunderbird_configured is undefined + block: + - name: Append to pkg_sys + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['thunderbird'] }}" -- name: Append to pkg_cask - when: - - ansible_system == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['thunderbird'] }}" + - name: Append to pkg_cask + when: + - ansible_system == 'Darwin' + ansible.builtin.set_fact: + pkg_cask: "{{ pkg_cask + ['thunderbird'] }}" + + - name: Set thunderbird_configured + ansible.builtin.set_fact: + thunderbird_configured: true diff --git a/tasks/pkgs/tidy.yml b/tasks/pkgs/tidy.yml index 4404779..d588d3a 100644 --- a/tasks/pkgs/tidy.yml +++ b/tasks/pkgs/tidy.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + tidy.pkgs }}" +- name: Add tidy + when: + - tidy_configured is undefined + block: + - name: Load tidy config + ansible.builtin.include_tasks: + file: config/tidy.yml + + - name: Append to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + tidy.pkgs }}" + + - name: Set tidy_configured + ansible.builtin.set_fact: + tidy_configured: true diff --git a/tasks/pkgs/tldr.yml b/tasks/pkgs/tldr.yml index 9eafc22..4d62996 100644 --- a/tasks/pkgs/tldr.yml +++ b/tasks/pkgs/tldr.yml @@ -1,13 +1,21 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add tldr when: - - ansible_os_family == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['tlrc'] }}" + - tldr_configured is undefined + block: + - name: Append to pkg_sys + when: + - ansible_os_family == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['tlrc'] }}" -- name: Add to pkg_cargo - when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + ['tlrc'] }}" + - name: Add to pkg_cargo + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + ['tlrc'] }}" + + - name: Set tldr_configured + ansible.builtin.set_fact: + tldr_configured: true diff --git a/tasks/pkgs/tmux.yml b/tasks/pkgs/tmux.yml index 663e09d..8ab27d9 100644 --- a/tasks/pkgs/tmux.yml +++ b/tasks/pkgs/tmux.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['tmux'] }}" +- name: Add tmux + when: + - tmux_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['tmux'] }}" + + - name: Set tmux_configured + ansible.builtin.set_fact: + tmux_configured: true diff --git a/tasks/pkgs/uwsm.yml b/tasks/pkgs/uwsm.yml index df78063..69c881b 100644 --- a/tasks/pkgs/uwsm.yml +++ b/tasks/pkgs/uwsm.yml @@ -1,4 +1,18 @@ -- name: Append to pkg_src - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + uwsm.build_deps + uswm.deps }}" - pkg_src: "{{ pkg_src + ['uwsm'] }}" +# vim: set filetype=yaml.ansible : +--- +- name: Add uwsm + when: + - uwsm_configured is undefined + block: + - name: Load uwsm config + ansible.builtin.include_tasks: + file: config/uwsm.yml + + - name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + uwsm.build_deps + uswm.deps }}" + pkg_src: "{{ pkg_src + ['uwsm'] }}" + + - name: Set uwsm_configured + ansible.builtin.set_fact: + uwsm_configured: true diff --git a/tasks/pkgs/vault.yml b/tasks/pkgs/vault.yml index 82c63dd..6267d15 100644 --- a/tasks/pkgs/vault.yml +++ b/tasks/pkgs/vault.yml @@ -1,21 +1,33 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs +- name: Add vault + when: + - vault_configured is undefined block: - - name: MacOS specific - when: - - ansible_system == 'Darwin' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_tap: "{{ pkg_tap + vault.pkgs }}" + - name: Load vault config + ansible.builtin.include_tasks: + file: config/vault.yml - - name: Linux specific - when: - - ansible_system == 'Linux' - notify: - - Depend hashicorp repo - changed_when: true - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + vault.pkgs }}" + - name: Append to pkgs + block: + - name: MacOS specific + when: + - ansible_system == 'Darwin' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_tap: "{{ pkg_tap + vault.pkgs }}" + + - name: Linux specific + when: + - ansible_system == 'Linux' + notify: + - Depend hashicorp repo + changed_when: true + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + vault.pkgs }}" + + - name: Set vault_configured + ansible.builtin.set_fact: + vault_configured: true diff --git a/tasks/pkgs/xdg_desktop_portal_hyprland.yml b/tasks/pkgs/xdg_desktop_portal_hyprland.yml index 8e245c1..9b206c0 100644 --- a/tasks/pkgs/xdg_desktop_portal_hyprland.yml +++ b/tasks/pkgs/xdg_desktop_portal_hyprland.yml @@ -1,13 +1,29 @@ -- name: Ensure pkg_deps are added - loop: "{{ xdg_desktop_portal_hyprland.pkg_deps }}" - loop_control: - loop_var: pkg_dep - vars: - pkg: "{{ pkg_dep }}" - ansible.builtin.include_tasks: - file: addpkg.yml +# vim: set filetype=yaml.ansible : +--- +- name: Add xdg-desktop-portal-hyprland + when: + - xdg_desktop_portal_hyprland_configured is undefined + block: + - name: Load xdg-desktop-portal-hyprland config + when: + - xdg_desktop_portal_hyprland is undefined + ansible.builtin.include_tasks: + file: config/xdg_desktop_portal_hyprland.yml -- name: Append to pkg_src - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + xdg_desktop_portal_hyprland.build_deps }}" - pkg_src: "{{ pkg_src + ['xdg_desktop_portal_hyprland'] }}" + - name: Ensure pkg_deps are added + loop: "{{ xdg_desktop_portal_hyprland.pkg_deps }}" + loop_control: + loop_var: xdg_pkg_dep + vars: + pkg: "{{ xdg_pkg_dep }}" + ansible.builtin.include_tasks: + file: "pkgs/{{ xdg_pkg_dep }}.yml" + + - name: Append to pkg_src + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + xdg_desktop_portal_hyprland.build_deps }}" + pkg_src: "{{ pkg_src + ['xdg_desktop_portal_hyprland'] }}" + + - name: Set xdg_desktop_portal_hyprland_configured + ansible.builtin.set_fact: + xdg_desktop_portal_hyprland_configured: true diff --git a/tasks/pkgs/xh.yml b/tasks/pkgs/xh.yml index 8a51d68..045c7f3 100644 --- a/tasks/pkgs/xh.yml +++ b/tasks/pkgs/xh.yml @@ -1,13 +1,25 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkg_sys +- name: Add xh when: - - ansible_os_family == 'Darwin' - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['xh'] }}" + - xh_configured is undefined + block: + - name: Load xh config + ansible.builtin.include_tasks: + file: config/xh.yml -- name: Add to cargopkgs - when: - - ansible_system == 'Linux' - ansible.builtin.set_fact: - pkg_cargo: "{{ pkg_cargo + [xh] }}" + - name: Append to pkg_sys + when: + - ansible_os_family == 'Darwin' + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['xh'] }}" + + - name: Add to cargopkgs + when: + - ansible_system == 'Linux' + ansible.builtin.set_fact: + pkg_cargo: "{{ pkg_cargo + [xh] }}" + + - name: Set xh_configured + ansible.builtin.set_fact: + xh_configured: true diff --git a/tasks/pkgs/yamlls.yml b/tasks/pkgs/yamlls.yml index a27b45f..1cf54cf 100644 --- a/tasks/pkgs/yamlls.yml +++ b/tasks/pkgs/yamlls.yml @@ -1,8 +1,16 @@ # vim: set filetype=yaml.ansible : --- -- name: Add to pkg_npm - notify: - - Depend node - changed_when: true - ansible.builtin.set_fact: - pkg_npm: "{{ pkg_npm + ['yaml-language-server'] }}" +- name: Add yamlls + when: + - yamlls_configured is undefined + block: + - name: Add to pkg_npm + notify: + - Depend node + changed_when: true + ansible.builtin.set_fact: + pkg_npm: "{{ pkg_npm + ['yaml-language-server'] }}" + + - name: Set yamlls_configured + ansible.builtin.set_fact: + yamlls_configured: true diff --git a/tasks/pkgs/zfs.yml b/tasks/pkgs/zfs.yml index ad78de3..fcbc3b8 100644 --- a/tasks/pkgs/zfs.yml +++ b/tasks/pkgs/zfs.yml @@ -1,58 +1,70 @@ # vim: set filetype=yaml.ansible : --- -- name: Linux based installation +- name: Add zfs when: - - ansible_system == 'Linux' + - zfs_configured is undefined block: - - name: RedHat based configuration + - name: Load zfs config + ansible.builtin.include_tasks: + file: config/zfs.yml + + - name: Linux based installation when: - - ansible_os_family == 'RedHat' + - ansible_system == 'Linux' block: - - name: Add openzfs gpg_key - become: "{{ sys_pkg_become }}" - ansible.builtin.rpm_key: - key: "{{ zfs.gpg_key }}" - fingerprint: "{{ zfs.gpg_fp }}" - state: present + - name: RedHat based configuration + when: + - ansible_os_family == 'RedHat' + block: + - name: Add openzfs gpg_key + become: "{{ sys_pkg_become }}" + ansible.builtin.rpm_key: + key: "{{ zfs.gpg_key }}" + fingerprint: "{{ zfs.gpg_fp }}" + state: present - - name: Enable openzfs repository - become: "{{ sys_pkg_become }}" - ansible.builtin.dnf: - name: "{{ zfs.repo_pkg }}" - disable_gpg_check: "{{ zfs.skip_gpg_check }}" - state: present + - name: Enable openzfs repository + become: "{{ sys_pkg_become }}" + ansible.builtin.dnf: + name: "{{ zfs.repo_pkg }}" + disable_gpg_check: "{{ zfs.skip_gpg_check }}" + state: present - - name: Debian configuration + - name: Debian configuration + when: + - ansible_os_family == 'Debian' + block: + - name: Enable openzfs repository + become: "{{ sys_pkg_become }}" + ansible.builtin.apt_repository: + repo: | + deb http://deb.debian.org/debian {{ zfs.release }}-backports main contrib + deb-src http://deb.debian.org/debian {{ zfs.release }}-backports main contrib + filename: "{{ zfs.release }}-backports" + state: present + update_cache: false + + - name: Pin zfs package to backports + become: "{{ sys_pkg_become }}" + ansible.builtin.copy: + dest: /etc/apt/preferences.d/90_zfs + state: file + mode: '0644' + content: | + Package: src:zfs-linux + Pin: release n={{ zfs.release }}-backports + Pin-Priority: 990 + + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + zfs.deps + zfs.pkgs }}" + + - name: Append to caskpkgs when: - - ansible_os_family == 'Debian' - block: - - name: Enable openzfs repository - become: "{{ sys_pkg_become }}" - ansible.builtin.apt_repository: - repo: | - deb http://deb.debian.org/debian {{ zfs.release }}-backports main contrib - deb-src http://deb.debian.org/debian {{ zfs.release }}-backports main contrib - filename: "{{ zfs.release }}-backports" - state: present - update_cache: false - - - name: Pin zfs package to backports - become: "{{ sys_pkg_become }}" - ansible.builtin.file: - dest: /etc/apt/preferences.d/90_zfs - state: file - mode: '0644' - content: | - Package: src:zfs-linux - Pin: release n={{ zfs.release }}-backports - Pin-Priority: 990 - - - name: Append to pkgs + - ansible_os_family == 'Darwin' ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + zfs.deps + zfs.pkgs }}" + pkg_cask: "{{ pkg_cask + ['openzfs'] }}" -- name: Append to caskpkgs - when: - - ansible_os_family == 'Darwin' - ansible.builtin.set_fact: - pkg_cask: "{{ pkg_cask + ['openzfs'] }}" + - name: Set zfs_configured + ansible.builtin.set_fact: + zfs_configured: true diff --git a/tasks/pkgs/zig.yml b/tasks/pkgs/zig.yml index 4804ef5..b266d43 100644 --- a/tasks/pkgs/zig.yml +++ b/tasks/pkgs/zig.yml @@ -1,5 +1,17 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_archive: "{{ pkg_archive + ['zig'] }}" +- name: Add zig + when: + - zig_configured is undefined + block: + - name: Load zig config + ansible.builtin.include_tasks: + file: config/zig.yml + + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_archive: "{{ pkg_archive + ['zig'] }}" + + - name: Set zig_configured + ansible.builtin.set_fact: + zig_configured: true diff --git a/tasks/pkgs/zls.yml b/tasks/pkgs/zls.yml index e259621..e858155 100644 --- a/tasks/pkgs/zls.yml +++ b/tasks/pkgs/zls.yml @@ -1,8 +1,20 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - notify: - - Depend zig - changed_when: true - ansible.builtin.set_fact: - pkg_archive: "{{ pkg_archive + ['zls'] }}" +- name: Add zls + when: + - zls_configured is undefined + block: + - name: Load zls config + ansible.builtin.include_tasks: + file: config/zls.yml + + - name: Append to pkgs + notify: + - Depend zig + changed_when: true + ansible.builtin.set_fact: + pkg_archive: "{{ pkg_archive + ['zls'] }}" + + - name: Set zls_configured + ansible.builtin.set_fact: + zls_configured: true diff --git a/tasks/pkgs/zoxide.yml b/tasks/pkgs/zoxide.yml index abfa6fc..258538e 100644 --- a/tasks/pkgs/zoxide.yml +++ b/tasks/pkgs/zoxide.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['zoxide'] }}" +- name: Add zoxide + when: + - zoxide_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['zoxide'] }}" + + - name: Set zoxide_configured + ansible.builtin.set_fact: + zoxide_configured: true diff --git a/tasks/pkgs/zsh.yml b/tasks/pkgs/zsh.yml index ca93dcd..97ef15c 100644 --- a/tasks/pkgs/zsh.yml +++ b/tasks/pkgs/zsh.yml @@ -1,5 +1,13 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs - ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ['zsh'] }}" +- name: Add zsh + when: + - zsh_configured is undefined + block: + - name: Append to pkgs + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ['zsh'] }}" + + - name: Set zsh_configured + ansible.builtin.set_fact: + zsh_configured: true diff --git a/tasks/repos/hashicorp.yml b/tasks/repos/hashicorp.yml index 9962b96..13ecd46 100644 --- a/tasks/repos/hashicorp.yml +++ b/tasks/repos/hashicorp.yml @@ -1,49 +1,57 @@ # vim: set filetype=yaml.ansible : --- -- name: Load hashicorp repo config - ansible.builtin.include_tasks: - file: config/hashicorp.yml - -- name: RedHat repository +- name: Add hashicorp when: - - ansible_os_family == 'RedHat' + - hashicorp_configured is undefined block: - - name: Enable hashicorp repo - become: true - ansible.builtin.get_url: - url: "{{ hashicorp.repo }}" - dest: /etc/yum.repos.d/hashicorp.repo - mode: '0644' + - name: Load hashicorp repo config + ansible.builtin.include_tasks: + file: config/hashicorp.yml -- name: Debian based repository - when: - - ansible_os_family == 'Debian' - block: - - name: Get hashicorp archive gpg key - ansible.builtin.get_url: - dest: "{{ d_tempdir.path }}/hashicorp_gpg" - url: https://apt.releases.hashicorp.com/gpg - mode: '0644' + - name: RedHat repository + when: + - ansible_os_family == 'RedHat' + block: + - name: Enable hashicorp repo + become: true + ansible.builtin.get_url: + url: "{{ hashicorp.repo }}" + dest: /etc/yum.repos.d/hashicorp.repo + mode: '0644' - - name: Install hashicorp archive gpg key - become: true - ansible.builtin.command: - creates: /usr/share/keyrings/hashicorp-archive-keyring.gpg - cmd: - - gpg - - --dearmor - - -o - - /usr/share/keyrings/hashicorp-archive-keyring.gpg - - "{{ d_tempdir.path }}/hashicorp_gpg" + - name: Debian based repository + when: + - ansible_os_family == 'Debian' + block: + - name: Get hashicorp archive gpg key + ansible.builtin.get_url: + dest: "{{ d_tempdir.path }}/hashicorp_gpg" + url: https://apt.releases.hashicorp.com/gpg + mode: '0644' - - name: Enable hasicorp repo for debian - ansible.builtin.apt_repository: - repo: "{{ pkgconfig.hashicorp.Linux.Debian.repo }}" - state: present - update_cache: false + - name: Install hashicorp archive gpg key + become: true + ansible.builtin.command: + creates: /usr/share/keyrings/hashicorp-archive-keyring.gpg + cmd: + - gpg + - --dearmor + - -o + - /usr/share/keyrings/hashicorp-archive-keyring.gpg + - "{{ d_tempdir.path }}/hashicorp_gpg" -- name: MacOS specific configuration - when: - - ansible_distribution == 'MacOSX' - ansible.builtin.set_fact: - brewtap: "{{ brewtap + ['hashicorp/tap'] }}" + - name: Enable hasicorp repo for debian + ansible.builtin.apt_repository: + repo: "{{ pkgconfig.hashicorp.Linux.Debian.repo }}" + state: present + update_cache: false + + - name: MacOS specific configuration + when: + - ansible_distribution == 'MacOSX' + ansible.builtin.set_fact: + brewtap: "{{ brewtap + ['hashicorp/tap'] }}" + + - name: Set hashicorp_configured + ansible.builtin.set_fact: + hashicorp_configured: true diff --git a/tasks/repos/terra.yml b/tasks/repos/terra.yml index cc36c3e..a5feb1f 100644 --- a/tasks/repos/terra.yml +++ b/tasks/repos/terra.yml @@ -1,25 +1,33 @@ # vim: set filetype=yaml.ansible : --- -- name: Enable terra repo for fedora +- name: Add terra when: - - ansible_distribution == 'Fedora' + - terra_configured is undefined block: - - name: Enable terra repo for fedora >=41 - become: true - when: ansible_distribution_major_version|int >= 41 - ansible.builtin.command: - creates: /etc/yum.repos.d/terra.repo - cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig.terrarepo.repo }}" + - name: Enable terra repo for fedora + when: + - ansible_distribution == 'Fedora' + block: + - name: Enable terra repo for fedora >=41 + become: true + when: ansible_distribution_major_version|int >= 41 + ansible.builtin.command: + creates: /etc/yum.repos.d/terra.repo + cmd: "dnf config-manager addrepo --from-repofile={{ pkgconfig.terrarepo.repo }}" - - name: Enable terra repo for fedora < 41 - become: true - when: ansible_distribution_major_version|int < 41 - ansible.builtin.command: - creates: /etc/yum.repos.d/terra.repo - cmd: "dnf config-manager --add-repo {{ pkgconfig.terrarepo.repo }}" + - name: Enable terra repo for fedora < 41 + become: true + when: ansible_distribution_major_version|int < 41 + ansible.builtin.command: + creates: /etc/yum.repos.d/terra.repo + cmd: "dnf config-manager --add-repo {{ pkgconfig.terrarepo.repo }}" - - name: Install terra release package - become: true - ansible.builtin.dnf: - name: terra-release - state: present + - name: Install terra release package + become: true + ansible.builtin.dnf: + name: terra-release + state: present + + - name: Set terra_configured + ansible.builtin.set_fact: + terra_configured: true diff --git a/tasks/src/hyprland_protocols.yml b/tasks/src/hyprland_protocols.yml index 6f5a84b..291d23e 100644 --- a/tasks/src/hyprland_protocols.yml +++ b/tasks/src/hyprland_protocols.yml @@ -1,3 +1,5 @@ +# vim: set filetype=yaml.ansible : +--- - name: Remove existing install when: - hyprland_protocols.clean @@ -33,7 +35,7 @@ argv: - meson - setup - - --prefix={{ hyrpland.prefix }} + - --prefix={{ hyprland.prefix }} - build - name: Install hyprland-protocols