From aff4fddfb4fd5510fa8a5a2165525d7f4714d7b2 Mon Sep 17 00:00:00 2001 From: Matthew Stobbs Date: Sun, 9 Mar 2025 21:48:11 -0600 Subject: [PATCH] fix broken packages - standardize naming of each pkg append - move _configured vars to end of block --- tasks/pkgs/air.yml | 2 +- tasks/pkgs/alacritty.yml | 4 ++-- tasks/pkgs/ansible-lint.yml | 2 +- tasks/pkgs/ansible.yml | 2 +- tasks/pkgs/ansible_ls.yml | 2 +- tasks/pkgs/aquamarine.yml | 12 ++++++------ tasks/pkgs/bashls.yml | 2 +- tasks/pkgs/bat.yml | 2 +- tasks/pkgs/bitwarden.yml | 6 +++--- tasks/pkgs/blender.yml | 4 ++-- tasks/pkgs/broot.yml | 4 ++-- tasks/pkgs/btop.yml | 2 +- tasks/pkgs/buf.yml | 2 +- tasks/pkgs/bufls.yml | 2 +- tasks/pkgs/carapace.yml | 2 +- tasks/pkgs/cheat.yml | 2 +- tasks/pkgs/checkmake.yml | 2 +- tasks/pkgs/choose.yml | 4 ++-- tasks/pkgs/cmake.yml | 2 +- tasks/pkgs/cmakelang.yml | 2 +- tasks/pkgs/commitlint-cli.yml | 2 +- tasks/pkgs/commitlint-config-conventional.yml | 2 +- tasks/pkgs/consul.yml | 4 ++-- tasks/pkgs/cssls.yml | 2 +- tasks/pkgs/curlie.yml | 2 +- tasks/pkgs/dbeaver.yml | 4 ++-- tasks/pkgs/direnv.yml | 2 +- tasks/pkgs/dockerls.yml | 2 +- tasks/pkgs/dotenv-linter.yml | 2 +- tasks/pkgs/duf.yml | 2 +- tasks/pkgs/dust.yml | 4 ++-- tasks/pkgs/editorconfig.yml | 2 +- tasks/pkgs/eslint.yml | 2 +- tasks/pkgs/eza.yml | 2 +- tasks/pkgs/fd.yml | 2 +- tasks/pkgs/firefox.yml | 4 ++-- tasks/pkgs/flatpak.yml | 2 +- tasks/pkgs/fzf.yml | 2 +- tasks/pkgs/ghostty.yml | 17 ++++++++++------- tasks/pkgs/git.yml | 10 +++++----- tasks/pkgs/glow.yml | 2 +- tasks/pkgs/go.yml | 4 ++-- tasks/pkgs/godot.yml | 4 ++-- tasks/pkgs/gopls.yml | 2 +- tasks/pkgs/gping.yml | 4 ++-- tasks/pkgs/heroic.yml | 4 ++-- tasks/pkgs/htmlls.yml | 2 +- tasks/pkgs/htmx-lsp.yml | 2 +- tasks/pkgs/httpie.yml | 4 ++-- tasks/pkgs/hugo.yml | 2 +- tasks/pkgs/hyperfine.yml | 2 +- tasks/pkgs/hyprcursor.yml | 15 ++++++++------- tasks/pkgs/hyprgraphics.yml | 15 ++++++++------- tasks/pkgs/hyprland.yml | 17 +++++++++-------- tasks/pkgs/hyprland_protocols.yml | 15 ++++++++------- tasks/pkgs/hyprlang.yml | 17 +++++++++-------- tasks/pkgs/hyprpolkitagent.yml | 15 ++++++++------- tasks/pkgs/hyprutils.yml | 15 ++++++++------- tasks/pkgs/hyprwayland_scanner.yml | 17 ++++++++--------- tasks/pkgs/intelephense.yml | 2 +- tasks/pkgs/jinja-lsp.yml | 2 +- tasks/pkgs/jq.yml | 2 +- tasks/pkgs/jsonls.yml | 2 +- tasks/pkgs/kitty.yml | 2 +- tasks/pkgs/lazygit.yml | 4 ++-- tasks/pkgs/libreoffice.yml | 6 +++--- tasks/pkgs/luals.yml | 4 ++-- tasks/pkgs/markdownlint-cli.yml | 2 +- tasks/pkgs/mcfly.yml | 4 ++-- tasks/pkgs/minio_client.yml | 2 +- tasks/pkgs/neovide.yml | 2 +- tasks/pkgs/neovim.yml | 8 +++++++- tasks/pkgs/nerdfonts.yml | 4 ++-- tasks/pkgs/nextcloud.yml | 6 +++--- tasks/pkgs/nginxls.yml | 2 +- tasks/pkgs/nodejs.yml | 2 +- tasks/pkgs/nomad.yml | 4 ++-- tasks/pkgs/packer.yml | 4 ++-- tasks/pkgs/pandoc.yml | 2 +- tasks/pkgs/pgadmin.yml | 4 ++-- tasks/pkgs/pipx.yml | 2 +- tasks/pkgs/podman.yml | 2 +- tasks/pkgs/pulumi.yml | 8 ++++---- tasks/pkgs/pyright.yml | 2 +- tasks/pkgs/python3.yml | 2 +- tasks/pkgs/quobix-vacuum.yml | 2 +- tasks/pkgs/revive.yml | 2 +- tasks/pkgs/ripgrep.yml | 2 +- tasks/pkgs/rust.yml | 2 +- tasks/pkgs/sd.yml | 4 ++-- tasks/pkgs/sdbus_cpp_2.yml | 7 ++++--- tasks/pkgs/sqlfluff.yml | 2 +- tasks/pkgs/sqlls.yml | 2 +- tasks/pkgs/starship.yml | 2 +- tasks/pkgs/stow.yml | 2 +- tasks/pkgs/tailscale.yml | 16 ++++++++-------- tasks/pkgs/tailwindcss-languageserver.yml | 2 +- tasks/pkgs/templ.yml | 2 +- tasks/pkgs/terraform.yml | 6 +++--- tasks/pkgs/terraformls.yml | 6 +++--- tasks/pkgs/thunderbird.yml | 4 ++-- tasks/pkgs/tidy.yml | 2 +- tasks/pkgs/tldr.yml | 4 ++-- tasks/pkgs/tmux.yml | 2 +- tasks/pkgs/uwsm.yml | 13 ++++++++----- tasks/pkgs/vault.yml | 6 +++--- tasks/pkgs/xdg_desktop_portal_hyprland.yml | 16 ++++++++++------ tasks/pkgs/xh.yml | 4 ++-- tasks/pkgs/yamlls.yml | 2 +- tasks/pkgs/zfs.yml | 4 ++-- tasks/pkgs/zig.yml | 2 +- tasks/pkgs/zls.yml | 2 +- tasks/pkgs/zoxide.yml | 2 +- tasks/pkgs/zsh.yml | 2 +- 114 files changed, 262 insertions(+), 239 deletions(-) diff --git a/tasks/pkgs/air.yml b/tasks/pkgs/air.yml index 8692efe..ab33c1e 100644 --- a/tasks/pkgs/air.yml +++ b/tasks/pkgs/air.yml @@ -4,7 +4,7 @@ when: - air_configured is undefined block: - - name: Add to pkg_go + - name: Append air to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/alacritty.yml b/tasks/pkgs/alacritty.yml index 6d6a75d..2f799a2 100644 --- a/tasks/pkgs/alacritty.yml +++ b/tasks/pkgs/alacritty.yml @@ -12,7 +12,7 @@ when: - ansible_system == 'Linux' block: - - name: Append to pkgs + - name: Append alacritty to pkg_sys and pkg_cargo notify: - Depend cargo changed_when: true @@ -20,7 +20,7 @@ pkg_sys: "{{ pkg_sys + alacritty.deps }}" pkg_cargo: "{{ pkg_cargo + [alacritty] }}" - - name: Append alacritty to caskpkgs + - name: Append alacritty to pkg_cask when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/ansible-lint.yml b/tasks/pkgs/ansible-lint.yml index e15f4d6..a767723 100644 --- a/tasks/pkgs/ansible-lint.yml +++ b/tasks/pkgs/ansible-lint.yml @@ -4,7 +4,7 @@ when: - ansible_lint_configured is undefined block: - - name: Append to pkgs + - name: Append ansible-lint to sys_pkg ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['ansible-lint'] }}" diff --git a/tasks/pkgs/ansible.yml b/tasks/pkgs/ansible.yml index 06f153b..2c408af 100644 --- a/tasks/pkgs/ansible.yml +++ b/tasks/pkgs/ansible.yml @@ -1,5 +1,5 @@ # vim: set filetype=yaml.ansible : --- -- name: Append to pkgs +- name: Append ansible to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['ansible'] }}" diff --git a/tasks/pkgs/ansible_ls.yml b/tasks/pkgs/ansible_ls.yml index 7f6ca2d..2d63dd0 100644 --- a/tasks/pkgs/ansible_ls.yml +++ b/tasks/pkgs/ansible_ls.yml @@ -4,7 +4,7 @@ when: - ansible_ls_configured is undefined block: - - name: Add to pkg_npm + - name: Append ansible-language-server to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/aquamarine.yml b/tasks/pkgs/aquamarine.yml index ef249c9..9f3ccb7 100644 --- a/tasks/pkgs/aquamarine.yml +++ b/tasks/pkgs/aquamarine.yml @@ -4,17 +4,13 @@ when: - aquamarine_configured is undefined block: - - name: Set aquamarine_configured - ansible.builtin.set_fact: - aquamarine_configured: true - - name: Load aquamarine config when: - aquamarine is undefined ansible.builtin.include_tasks: file: config/aquamarine.yml - - name: Ensure pkg_deps are added + - name: Append aquamarine pkg_deps loop: "{{ aquamarine.pkg_deps }}" loop_control: loop_var: aquamarine_pkg_dep @@ -23,7 +19,11 @@ ansible.builtin.include_tasks: file: "pkgs/{{ aquamarine_pkg_dep }}.yml" - - name: Append to pkg_sys + - name: Append aquamarine to pkg_sys and pkg_src 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 d9f7278..ab47fb0 100644 --- a/tasks/pkgs/bashls.yml +++ b/tasks/pkgs/bashls.yml @@ -4,7 +4,7 @@ when: - bashls_configured is undefined block: - - name: Add to pkg_npm + - name: Append bash-language-server to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/bat.yml b/tasks/pkgs/bat.yml index cb44abb..42aaad1 100644 --- a/tasks/pkgs/bat.yml +++ b/tasks/pkgs/bat.yml @@ -4,7 +4,7 @@ when: - bat_configured is undefined block: - - name: Append to pkg_sys + - name: Append bat to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['bat'] }}" diff --git a/tasks/pkgs/bitwarden.yml b/tasks/pkgs/bitwarden.yml index 24449cd..d96a69b 100644 --- a/tasks/pkgs/bitwarden.yml +++ b/tasks/pkgs/bitwarden.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/bitwarden.yml - - name: Append to pkg_flatpak + - name: Append bitwarden to pkg_flatpak when: - bitwarden.method == 'flatpak' notify: @@ -17,13 +17,13 @@ ansible.builtin.set_fact: pkg_flatpak: "{{ pkg_flatpak + [bitwarden.pkg] }}" - - name: Append to pkg_appimage + - name: Append bitwarden to pkg_appimage when: - bitwarden.method == 'appimage' ansible.builtin.set_fact: pkg_appimage: "{{ pkg_appimage + [bitwarden.pkg] }}" - - name: Append to pkg_cask + - name: Append bitwarden to pkg_cask when: - bitwarden.method == 'brew' ansible.builtin.set_fact: diff --git a/tasks/pkgs/blender.yml b/tasks/pkgs/blender.yml index 8b889a3..58b76d9 100644 --- a/tasks/pkgs/blender.yml +++ b/tasks/pkgs/blender.yml @@ -4,13 +4,13 @@ when: - blender_configured is undefined block: - - name: Append to pkg_sys + - name: Append blender to pkg_sys when: - ansible_system == 'Linux' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['blender'] }}" - - name: Append to pkg_cask + - name: Append blender to pkg_cask when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/broot.yml b/tasks/pkgs/broot.yml index 8a82811..2f85702 100644 --- a/tasks/pkgs/broot.yml +++ b/tasks/pkgs/broot.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/broot.yml - - name: Append to pkg_sys and pkg_cargo + - name: Append broot to pkg_sys and pkg_cargo when: - ansible_system == 'Linux' notify: @@ -18,7 +18,7 @@ pkg_sys: "{{ pkg_sys + broot.deps }}" pkg_cargo: "{{ pkg_cargo + [broot] }}" - - name: Append to pkg_sys + - name: Append broot to pkg_sys when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/btop.yml b/tasks/pkgs/btop.yml index 8206fc4..c867440 100644 --- a/tasks/pkgs/btop.yml +++ b/tasks/pkgs/btop.yml @@ -4,7 +4,7 @@ when: - btop_configured is undefined block: - - name: Append to pkg_ssys + - name: Append btop to pkg_ssys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['btop'] }}" diff --git a/tasks/pkgs/buf.yml b/tasks/pkgs/buf.yml index 4a955b7..b9d58a6 100644 --- a/tasks/pkgs/buf.yml +++ b/tasks/pkgs/buf.yml @@ -4,7 +4,7 @@ when: - buf_configured is undefined block: - - name: Add to pkg_go + - name: Append buf to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/bufls.yml b/tasks/pkgs/bufls.yml index e2591ca..665d6b4 100644 --- a/tasks/pkgs/bufls.yml +++ b/tasks/pkgs/bufls.yml @@ -4,7 +4,7 @@ when: - bufls_configured is undefined block: - - name: Add to pkg_go + - name: Append bufls to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/carapace.yml b/tasks/pkgs/carapace.yml index 95fcf47..3d80808 100644 --- a/tasks/pkgs/carapace.yml +++ b/tasks/pkgs/carapace.yml @@ -30,7 +30,7 @@ state: present update_cache: false - - name: Add carapace to pkg_sys + - name: Append carapace to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + carapace.pkgs }}" diff --git a/tasks/pkgs/cheat.yml b/tasks/pkgs/cheat.yml index e53c748..25ccf60 100644 --- a/tasks/pkgs/cheat.yml +++ b/tasks/pkgs/cheat.yml @@ -4,7 +4,7 @@ when: - cheat_configured is undefined block: - - name: Append to pkg_go + - name: Append cheat to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/checkmake.yml b/tasks/pkgs/checkmake.yml index baa2400..55b78e6 100644 --- a/tasks/pkgs/checkmake.yml +++ b/tasks/pkgs/checkmake.yml @@ -4,7 +4,7 @@ when: - checkmake_configured is undefined block: - - name: Add to pkg_go + - name: Add checkmake to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/choose.yml b/tasks/pkgs/choose.yml index 17cf22c..3f06dd4 100644 --- a/tasks/pkgs/choose.yml +++ b/tasks/pkgs/choose.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/choose.yml - - name: Append to cargopkgs + - name: Append choose to pkg_cargo when: - ansible_system == 'Linux' notify: @@ -17,7 +17,7 @@ ansible.builtin.set_fact: pkg_cargo: "{{ pkg_cargo + [choose] }}" - - name: Append to pkg_sys + - name: Append choose-rust to pkg_sys when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/cmake.yml b/tasks/pkgs/cmake.yml index ed82cda..78f18ad 100644 --- a/tasks/pkgs/cmake.yml +++ b/tasks/pkgs/cmake.yml @@ -4,7 +4,7 @@ when: - cmake_configured is undefined block: - - name: Append to pkgs + - name: Append cmake to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['cmake'] }}" diff --git a/tasks/pkgs/cmakelang.yml b/tasks/pkgs/cmakelang.yml index 763069c..73dce23 100644 --- a/tasks/pkgs/cmakelang.yml +++ b/tasks/pkgs/cmakelang.yml @@ -4,7 +4,7 @@ when: - cmakelang_configured is undefined block: - - name: Add to pkg_pipx + - name: Add cmakelang to pkg_pipx notify: - Depend pipx changed_when: true diff --git a/tasks/pkgs/commitlint-cli.yml b/tasks/pkgs/commitlint-cli.yml index cb07960..e16f4e7 100644 --- a/tasks/pkgs/commitlint-cli.yml +++ b/tasks/pkgs/commitlint-cli.yml @@ -4,7 +4,7 @@ when: - commitlint_cli_configured is undefined block: - - name: Add to pkg_npm + - name: Append commitlint/cli to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/commitlint-config-conventional.yml b/tasks/pkgs/commitlint-config-conventional.yml index 431f958..97b6d26 100644 --- a/tasks/pkgs/commitlint-config-conventional.yml +++ b/tasks/pkgs/commitlint-config-conventional.yml @@ -4,7 +4,7 @@ when: - comitlint_config_conventional_configured is undefined block: - - name: Add to pkg_npm + - name: Append commitlit/config-conventional to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/consul.yml b/tasks/pkgs/consul.yml index e0c4e27..3a4a2f0 100644 --- a/tasks/pkgs/consul.yml +++ b/tasks/pkgs/consul.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/consul.yml - - name: Append to pkg_sys + - name: Append consul to pkg_sys when: - ansible_system == 'Linux' notify: @@ -17,7 +17,7 @@ ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + consul.pkgs }}" - - name: Append to pkg_tap + - name: Append consul to pkg_tap when: - ansible_system == 'Darwin' notify: diff --git a/tasks/pkgs/cssls.yml b/tasks/pkgs/cssls.yml index b1b7d20..83ceeed 100644 --- a/tasks/pkgs/cssls.yml +++ b/tasks/pkgs/cssls.yml @@ -4,7 +4,7 @@ when: - cssls_configured is undefined block: - - name: Add to pkg_npm + - name: Append vscode-langservers-extracted to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/curlie.yml b/tasks/pkgs/curlie.yml index 0f444d3..6888146 100644 --- a/tasks/pkgs/curlie.yml +++ b/tasks/pkgs/curlie.yml @@ -4,7 +4,7 @@ when: - curlie_configured is undefined block: - - name: Append to pkg_go + - name: Append curlie to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/dbeaver.yml b/tasks/pkgs/dbeaver.yml index f6eb83a..f54e40c 100644 --- a/tasks/pkgs/dbeaver.yml +++ b/tasks/pkgs/dbeaver.yml @@ -4,7 +4,7 @@ when: - dbeaver_configured is undefined block: - - name: Append to pkg_flatpak + - name: Append dbeaver to pkg_flatpak when: - ansible_system == 'Linux' notify: @@ -13,7 +13,7 @@ ansible.builtin.set_fact: pkg_flatpak: "{{ pkg_flatpak + ['io.dbeaver.DBeaverCommunity'] }}" - - name: Append to pkg_cask + - name: Append dbeaver to pkg_cask when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/direnv.yml b/tasks/pkgs/direnv.yml index 16b399f..ce2725c 100644 --- a/tasks/pkgs/direnv.yml +++ b/tasks/pkgs/direnv.yml @@ -4,7 +4,7 @@ when: - direnv_configured is undefined block: - - name: Append to pkg_sys + - name: Append direnv to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['direnv'] }}" diff --git a/tasks/pkgs/dockerls.yml b/tasks/pkgs/dockerls.yml index 85eb704..17ee060 100644 --- a/tasks/pkgs/dockerls.yml +++ b/tasks/pkgs/dockerls.yml @@ -4,7 +4,7 @@ when: - dockerls_configured is undefined block: - - name: Add to pkg_npm + - name: Append dockerfile-language-server-nodejs to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/dotenv-linter.yml b/tasks/pkgs/dotenv-linter.yml index 052b57c..1c95644 100644 --- a/tasks/pkgs/dotenv-linter.yml +++ b/tasks/pkgs/dotenv-linter.yml @@ -4,7 +4,7 @@ when: - dotenv_linter_configured is undefined block: - - name: Add to pkg_cargo + - name: Append dotenv-linter to pkg_cargo notify: - Depend cargo changed_when: true diff --git a/tasks/pkgs/duf.yml b/tasks/pkgs/duf.yml index fab8818..779ca42 100644 --- a/tasks/pkgs/duf.yml +++ b/tasks/pkgs/duf.yml @@ -4,7 +4,7 @@ when: - duf_configured is undefined block: - - name: Append to pkg_go + - name: Append duf to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/dust.yml b/tasks/pkgs/dust.yml index 6bb5a48..85267ee 100644 --- a/tasks/pkgs/dust.yml +++ b/tasks/pkgs/dust.yml @@ -4,7 +4,7 @@ when: - dust_configured is undefined block: - - name: Linux specific install + - name: Append du-dust to pkg_cargo when: - ansible_system == 'Linux' notify: @@ -13,7 +13,7 @@ ansible.builtin.set_fact: pkg_cargo: "{{ pkg_cargo + ['du-dust'] }}" - - name: Append to pkg_sys + - name: Append dust to pkg_sys when: - ansible_os_family == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/editorconfig.yml b/tasks/pkgs/editorconfig.yml index 8b5be2f..80c517c 100644 --- a/tasks/pkgs/editorconfig.yml +++ b/tasks/pkgs/editorconfig.yml @@ -4,7 +4,7 @@ when: - editorconfig_configured is undefined block: - - name: Append to pkgs + - name: Append editorconfig to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['editorconfig'] }}" diff --git a/tasks/pkgs/eslint.yml b/tasks/pkgs/eslint.yml index 02ed10d..9738e81 100644 --- a/tasks/pkgs/eslint.yml +++ b/tasks/pkgs/eslint.yml @@ -4,7 +4,7 @@ when: - eslint_configured is undefined block: - - name: Add to pkg_npm + - name: Append vscode-langservers-extracted to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/eza.yml b/tasks/pkgs/eza.yml index f1c9e4a..f3f68fc 100644 --- a/tasks/pkgs/eza.yml +++ b/tasks/pkgs/eza.yml @@ -4,7 +4,7 @@ when: - eza_configured is undefined block: - - name: Add to pkg_cargo + - name: Append eza to pkg_cargo notify: - Depend cargo changed_when: true diff --git a/tasks/pkgs/fd.yml b/tasks/pkgs/fd.yml index 2e053af..204f843 100644 --- a/tasks/pkgs/fd.yml +++ b/tasks/pkgs/fd.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/fd.yml - - name: Append to pkg_sys + - name: Append fd to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + fd.pkgs }}" diff --git a/tasks/pkgs/firefox.yml b/tasks/pkgs/firefox.yml index 0b8e45e..acf0367 100644 --- a/tasks/pkgs/firefox.yml +++ b/tasks/pkgs/firefox.yml @@ -4,13 +4,13 @@ when: - firefox_configured is undefined block: - - name: Append to pkgs + - name: Append firefox to pkg_sys when: - ansible_system == 'Linux' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['firefox'] }}" - - name: Append to pkg_cask + - name: Append firefox to pkg_cask when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/flatpak.yml b/tasks/pkgs/flatpak.yml index 7be8c09..e025259 100644 --- a/tasks/pkgs/flatpak.yml +++ b/tasks/pkgs/flatpak.yml @@ -4,7 +4,7 @@ when: - flatpak_configured is undefined block: - - name: Append to pkg_sys + - name: Append flatpak to pkg_sys when: - ansible_system == 'Linux' ansible.builtin.set_fact: diff --git a/tasks/pkgs/fzf.yml b/tasks/pkgs/fzf.yml index 2116177..5d284f2 100644 --- a/tasks/pkgs/fzf.yml +++ b/tasks/pkgs/fzf.yml @@ -4,7 +4,7 @@ when: - cmake_configured is undefined block: - - name: Append to pkgs + - name: Append fzf to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['fzf'] }}" diff --git a/tasks/pkgs/ghostty.yml b/tasks/pkgs/ghostty.yml index 15fb2a2..f088039 100644 --- a/tasks/pkgs/ghostty.yml +++ b/tasks/pkgs/ghostty.yml @@ -8,31 +8,34 @@ ansible.builtin.include_tasks: file: config/ghostty.yml - - name: Source pkg installation + - name: Source ghostty pkg installation when: - ghostty.method == 'src' - ansible_distribution != 'MacOSX' block: - - name: Build ghostty from source + - name: Append ghostty build deps to pkg_sys + ansible.builtin.set_fact: + pkg_sys: "{{ pkg_sys + ghostty.deps }}" + + - name: Append ghostty to pkg_src notify: - Depend zig changed_when: true ansible.builtin.set_fact: - pkg_sys: "{{ pkg_sys + ghostty.deps }}" pkg_src: "{{ pkg_src + ['ghostty'] }}" - - name: Appimage installation + - name: Append ghostty to pkg_appimage when: - ghostty.method == 'appimage' - ansible_distribution != 'MacOSX' ansible.builtin.set_fact: - pkg_appimage: "{{ pkg_appimage + ghostty_vars.appimage }}" + pkg_appimage: "{{ pkg_appimage + ghostty }}" - name: Sys pkg installation when: - ghostty.method == 'sys' block: - - name: Append to pkgs + - name: Append ghostty to pkg_sys when: - ansible_distribution == 'Fedora' notify: @@ -41,7 +44,7 @@ ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['ghostty'] }}" - - name: Cask pkg installation + - name: Append ghostty to pkg_cask when: - ghostty.method == 'brew' ansible.builtin.set_fact: diff --git a/tasks/pkgs/git.yml b/tasks/pkgs/git.yml index 185b74f..ef4315e 100644 --- a/tasks/pkgs/git.yml +++ b/tasks/pkgs/git.yml @@ -4,14 +4,14 @@ when: - git_configured is undefined block: - - name: Set git_configured - ansible.builtin.set_fact: - git_configured: true - - name: Load git config ansible.builtin.include_tasks: file: config/git.yml - - name: Append to pkgs + - name: Append git to pkg_sys 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 2069a8e..e43223b 100644 --- a/tasks/pkgs/glow.yml +++ b/tasks/pkgs/glow.yml @@ -4,7 +4,7 @@ when: - glow_configured is undefined block: - - name: Add to pkg_go + - name: Append glow to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/go.yml b/tasks/pkgs/go.yml index 625c235..f008d82 100644 --- a/tasks/pkgs/go.yml +++ b/tasks/pkgs/go.yml @@ -8,13 +8,13 @@ ansible.builtin.include_tasks: file: config/go.yml - - name: Install from archive + - name: Append go to pkg_archive when: - go.method == 'archive' ansible.builtin.set_fact: pkg_archive: "{{ pkg_archive + ['go'] }}" - - name: Append to pkgs + - name: Append to pkg_sys - go.method != 'archive' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['go'] }}" diff --git a/tasks/pkgs/godot.yml b/tasks/pkgs/godot.yml index 006c2bd..db0c4c0 100644 --- a/tasks/pkgs/godot.yml +++ b/tasks/pkgs/godot.yml @@ -4,7 +4,7 @@ when: - godot_configured is undefined block: - - name: Append to pkg_flatpak + - name: Append godot to pkg_flatpak when: - ansible_system == 'Linux' notify: @@ -13,7 +13,7 @@ ansible.builtin.set_fact: pkg_flatpak: "{{ pkg_flatpak + ['org.godotengine.Godot'] }}" - - name: Append to pkg_cask + - name: Append godot to pkg_cask when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/gopls.yml b/tasks/pkgs/gopls.yml index dfc90b0..33f0087 100644 --- a/tasks/pkgs/gopls.yml +++ b/tasks/pkgs/gopls.yml @@ -4,7 +4,7 @@ when: - gopls_configured is undefined block: - - name: Add to pkg_go + - name: Append gopls to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/gping.yml b/tasks/pkgs/gping.yml index f31bbae..912b33d 100644 --- a/tasks/pkgs/gping.yml +++ b/tasks/pkgs/gping.yml @@ -4,13 +4,13 @@ when: - gping_configured is undefined block: - - name: Append to pkg_sys + - name: Append gping to pkg_sys when: - ansible_system == 'Darwin' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['gping'] }}" - - name: Append to pkg_cargo + - name: Append gping to pkg_cargo when: - ansible_system == 'Linux' notify: diff --git a/tasks/pkgs/heroic.yml b/tasks/pkgs/heroic.yml index f497694..05be850 100644 --- a/tasks/pkgs/heroic.yml +++ b/tasks/pkgs/heroic.yml @@ -4,7 +4,7 @@ when: - heroic_configured is undefined block: - - name: Append to pkg_flatpak + - name: Append heroic to pkg_flatpak when: - ansible_system == 'Linux' notify: @@ -13,7 +13,7 @@ ansible.builtin.set_fact: pkg_flatpak: "{{ pkg_flatpak + ['com.heroicgameslauncher.hgl'] }}" - - name: Append to pkg_cask + - name: Append heroic to pkg_cask when: - ansible_os_family == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/htmlls.yml b/tasks/pkgs/htmlls.yml index 558715a..d0bca2b 100644 --- a/tasks/pkgs/htmlls.yml +++ b/tasks/pkgs/htmlls.yml @@ -4,7 +4,7 @@ when: - htmlls_configured is undefined block: - - name: Add to pkg_npm + - name: Append vscode-langservers-extracted to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/htmx-lsp.yml b/tasks/pkgs/htmx-lsp.yml index 1ba267e..2febfa6 100644 --- a/tasks/pkgs/htmx-lsp.yml +++ b/tasks/pkgs/htmx-lsp.yml @@ -4,7 +4,7 @@ when: - htmx_lsp_configured is undefined block: - - name: Add to pkg_cargo + - name: Append htmx-lsp to pkg_cargo ansible.builtin.set_fact: pkg_cargo: "{{ pkg_cargo + ['htmx-lsp'] }}" diff --git a/tasks/pkgs/httpie.yml b/tasks/pkgs/httpie.yml index 5faa1b3..030bebd 100644 --- a/tasks/pkgs/httpie.yml +++ b/tasks/pkgs/httpie.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/httpie.yml - - name: Append to pkg_flatpak + - name: Append httpie to pkg_flatpak when: - ansible_system == 'Linux' notify: @@ -17,7 +17,7 @@ ansible.builtin.set_fact: pkg_flatpak: "{{ pkg_flatpak + [httpie.pkg] }}" - - name: Append to pkg_cask + - name: Append httpie to pkg_cask when: - ansible_os_family == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/hugo.yml b/tasks/pkgs/hugo.yml index cf7232b..9ec2e4d 100644 --- a/tasks/pkgs/hugo.yml +++ b/tasks/pkgs/hugo.yml @@ -4,7 +4,7 @@ when: - hugo_configured is undefined block: - - name: Append to pkgs + - name: Append hugo to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['hugo'] }}" diff --git a/tasks/pkgs/hyperfine.yml b/tasks/pkgs/hyperfine.yml index 10546ea..24b97f7 100644 --- a/tasks/pkgs/hyperfine.yml +++ b/tasks/pkgs/hyperfine.yml @@ -4,7 +4,7 @@ when: - hyperfine_configured is undefined block: - - name: Append to pkg_sys + - name: Append hyperfine to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['hyperfine'] }}" diff --git a/tasks/pkgs/hyprcursor.yml b/tasks/pkgs/hyprcursor.yml index a5fd7bb..0f5df92 100644 --- a/tasks/pkgs/hyprcursor.yml +++ b/tasks/pkgs/hyprcursor.yml @@ -4,17 +4,18 @@ when: - hyprcursor_configured is undefined block: - - name: Set hyprcursor_configured - ansible.builtin.set_fact: - hyprcursor_configured: true - - name: Load hyprcursor config - when: - - hyprcursor is undefined ansible.builtin.include_tasks: file: config/hyprcursor.yml - - name: Append to pkg_src + - name: Append hyprcursor build deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + hyprcursor.build_deps }}" + + - name: Append hyprcursor to pkg_src + ansible.builtin.set_fact: 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 0b21dba..2fb64cc 100644 --- a/tasks/pkgs/hyprgraphics.yml +++ b/tasks/pkgs/hyprgraphics.yml @@ -4,17 +4,18 @@ when: - hyprgraphics_configured is undefined block: - - name: Set hyprgraphics_configured - ansible.builtin.set_fact: - hyprgraphics_configured: true - - name: Load hyprgraphics config - when: - - hyprgraphics is undefined ansible.builtin.include_tasks: file: config/hyprgraphics.yml - - name: Append to pkg_src + - name: Append hyprgraphics build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + hyprgraphics.build_deps }}" + + - name: Append hyprcursor to pkg_src + ansible.builtin.set_fact: 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 99cc426..deb5ee3 100644 --- a/tasks/pkgs/hyprland.yml +++ b/tasks/pkgs/hyprland.yml @@ -4,17 +4,11 @@ when: - hyprland_configured is undefined block: - - name: Set hyprland_configured - ansible.builtin.set_fact: - hyprland_configured: true - - name: Load hyprland config - when: - - hyprland is undefined ansible.builtin.include_tasks: file: config/hyprland.yml - - name: Ensure pkg_deps are added + - name: Append hyprland pkg_deps loop: "{{ hyprland.pkg_deps }}" loop_control: loop_var: hyprland_pkg_dep @@ -23,7 +17,14 @@ ansible.builtin.include_tasks: file: "pkgs/{{ hyprland_pkg_dep }}.yml" - - name: Append to pkg_src + - name: Append hyprland build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + hyprland.build_deps }}" + + - name: Append hyprland to pkg_src + ansible.builtin.set_fact: 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 c88b009..64abdf7 100644 --- a/tasks/pkgs/hyprland_protocols.yml +++ b/tasks/pkgs/hyprland_protocols.yml @@ -4,17 +4,18 @@ when: - hyprland_protcols_configured is undefined block: - - name: Set hyprland_protcols_configured - ansible.builtin.set_fact: - hyprland_protcols_configured: true - - name: Load hyprland-protocols config - when: - - hyprland_protocols is undefined ansible.builtin.include_tasks: file: config/hyprland_protocols.yml - - name: Append to pkg lists + - name: Append hyprland-protocols build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + hyprland_protocols.build_deps }}" + + - name: Append hyprland-protocols to pkg_src + ansible.builtin.set_fact: 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 475f418..aab7609 100644 --- a/tasks/pkgs/hyprlang.yml +++ b/tasks/pkgs/hyprlang.yml @@ -4,17 +4,11 @@ when: - hyprlang_configured is undefined block: - - name: Set hyprlang_configured - ansible.builtin.set_fact: - hyprlang_configured: true - - name: Load hyprlang config - when: - - hyprlang is undefined ansible.builtin.include_tasks: file: config/hyprlang.yml - - name: Ensure pkg_deps are added + - name: Append hyprland pkg_deps loop: "{{ hyprlang.pkg_deps }}" loop_control: loop_var: hyprlang_pkg_dep @@ -23,7 +17,14 @@ ansible.builtin.include_tasks: file: "pkgs/{{ hyprlang_pkg_dep }}.yml" - - name: Append to pkg_src + - name: Append hyprlang build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + hyprlang.build_deps }}" + + - name: Append hyprlang to pkg_src + ansible.builtin.set_fact: pkg_src: "{{ pkg_src + ['hyprlang'] }}" + + - name: Set hyprlang_configured + ansible.builtin.set_fact: + hyprlang_configured: true diff --git a/tasks/pkgs/hyprpolkitagent.yml b/tasks/pkgs/hyprpolkitagent.yml index 5f56473..f450d01 100644 --- a/tasks/pkgs/hyprpolkitagent.yml +++ b/tasks/pkgs/hyprpolkitagent.yml @@ -4,17 +4,18 @@ when: - hyprpolkitagent_configured is undefined block: - - name: Set hyprpolkitagent_configured - ansible.builtin.set_fact: - hyprpolkitagent_configured: true - - name: Load hyprpolkitagent config - when: - - hyprpolkitagent is undefined ansible.builtin.include_tasks: file: config/hyprpolkitagent.yml - - name: Append to pkg_src + - name: Append hyprpolkitagent build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + hyprpolkitagent.build_deps }}" + + - name: Append hyprpolkitagent to pkg_src + ansible.builtin.set_fact: pkg_src: "{{ pkg_src + ['hyprpolkitagent'] }}" + + - name: Set hyprpolkitagent_configured + ansible.builtin.set_fact: + hyprpolkitagent_configured: true diff --git a/tasks/pkgs/hyprutils.yml b/tasks/pkgs/hyprutils.yml index 3b57c65..aaa4e0f 100644 --- a/tasks/pkgs/hyprutils.yml +++ b/tasks/pkgs/hyprutils.yml @@ -4,17 +4,18 @@ when: - hyprutils_configured is undefined block: - - name: Set hyprutils_configured - ansible.builtin.set_fact: - hyprutils_configured: true - - name: Load hyprutils config - when: - - hyprutils is undefined ansible.builtin.include_tasks: file: config/hyprutils.yml - - name: Append to pkg_src + - name: Append hyprutils build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + hyprutils.build_deps }}" + + - name: Append hyprutils to pkg_src + ansible.builtin.set_fact: 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 933cf67..8479601 100644 --- a/tasks/pkgs/hyprwayland_scanner.yml +++ b/tasks/pkgs/hyprwayland_scanner.yml @@ -4,19 +4,18 @@ when: - hyprwayland_scanner_configured is undefined block: - - name: Set hyprwayland_scanner_configured - ansible.builtin.set_fact: - hyprwayland_scanner_configured: true - - 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' + - name: Append hyprwayland-scanner build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + hyprwayland_scanner.build_deps }}" + + - name: Append hyprwayland-scanner to pkg_src + ansible.builtin.set_fact: 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 9b9c138..bc9b67d 100644 --- a/tasks/pkgs/intelephense.yml +++ b/tasks/pkgs/intelephense.yml @@ -4,7 +4,7 @@ when: - intelephense_configured is undefined block: - - name: Add to pkg_npm + - name: Append intelephense to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/jinja-lsp.yml b/tasks/pkgs/jinja-lsp.yml index 6cbec04..39401de 100644 --- a/tasks/pkgs/jinja-lsp.yml +++ b/tasks/pkgs/jinja-lsp.yml @@ -4,7 +4,7 @@ when: - jinja_lsp_configured is undefined block: - - name: Add to pkg_cargo + - name: Append jinja-lsp to pkg_cargo notify: - Depend cargo changed_when: true diff --git a/tasks/pkgs/jq.yml b/tasks/pkgs/jq.yml index da6a9b0..bed9630 100644 --- a/tasks/pkgs/jq.yml +++ b/tasks/pkgs/jq.yml @@ -4,7 +4,7 @@ when: - jq_configured is undefined block: - - name: Append to pkgs + - name: Append jq to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['jq'] }}" diff --git a/tasks/pkgs/jsonls.yml b/tasks/pkgs/jsonls.yml index d5bc337..5cdc522 100644 --- a/tasks/pkgs/jsonls.yml +++ b/tasks/pkgs/jsonls.yml @@ -4,7 +4,7 @@ when: - jsonls_configured is undefined block: - - name: Add to pkg_npm + - name: Append vscode-langservers-extracted to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/kitty.yml b/tasks/pkgs/kitty.yml index 2423f56..14969b0 100644 --- a/tasks/pkgs/kitty.yml +++ b/tasks/pkgs/kitty.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/kitty.yml - - name: Add to pkg_sys + - name: Append kitty to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + kitty.pkgs }}" diff --git a/tasks/pkgs/lazygit.yml b/tasks/pkgs/lazygit.yml index 0e08e0a..eba6244 100644 --- a/tasks/pkgs/lazygit.yml +++ b/tasks/pkgs/lazygit.yml @@ -1,10 +1,10 @@ -# vim: set filetype=yaml.ansible : +# vim: set filetype=yaml : --- - name: Add lazygit when: - lazygit_configured is undefined block: - - name: Add to pkg_go + - name: Append lazygit to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/libreoffice.yml b/tasks/pkgs/libreoffice.yml index 33beefe..63af39b 100644 --- a/tasks/pkgs/libreoffice.yml +++ b/tasks/pkgs/libreoffice.yml @@ -8,19 +8,19 @@ ansible.builtin.include_tasks: file: config/libreoffice.yml - - name: Append to pkg_flatpak + - name: Append libreoffice to pkg_flatpak when: - libreoffice.method == 'flatpak' ansible.builtin.set_fact: pkg_flatpak: "{{ pkg_flatpak + [libreoffice.flatpak] }}" - - name: Append to pkg_sys + - name: Append libreoffice to pkg_sys when: - libreoffice.method == 'sys' ansible.builtin.set_fact: sys_pkg: "{{ sys_pkg + libreoffice.pkgs }}" - - name: Append to caskpkgs + - name: Append libreoffice to caskpkgs when: - libreoffice.method == 'cask' ansible.builtin.set_fact: diff --git a/tasks/pkgs/luals.yml b/tasks/pkgs/luals.yml index 2829b06..68af51d 100644 --- a/tasks/pkgs/luals.yml +++ b/tasks/pkgs/luals.yml @@ -8,13 +8,13 @@ ansible.builtin.include_tasks: file: config/luals.yml - - name: Append to pkgs + - name: Append luals to pkg_archive when: - ansible_system == 'Linux' ansible.builtin.set_fact: pkg_archive: "{{ pkg_archive + ['luals'] }}" - - name: Append to pkg_sys + - name: Append lua-language-server to pkg_sys when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/markdownlint-cli.yml b/tasks/pkgs/markdownlint-cli.yml index 6eeda64..0d3f66c 100644 --- a/tasks/pkgs/markdownlint-cli.yml +++ b/tasks/pkgs/markdownlint-cli.yml @@ -4,7 +4,7 @@ when: - markdownlint_cli_configured is undefined block: - - name: Add to pkg_npm + - name: Append markdownlint-cli to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/mcfly.yml b/tasks/pkgs/mcfly.yml index b78bc86..9e19498 100644 --- a/tasks/pkgs/mcfly.yml +++ b/tasks/pkgs/mcfly.yml @@ -4,13 +4,13 @@ when: - mcfly_configured is undefined block: - - name: Append to pkg_sys + - name: Append mcfly to pkg_sys when: - ansible_os_family == 'Darwin' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['mcfly'] }}" - - name: Add to pkg_cargo + - name: Append mcfly to pkg_cargo when: - ansible_system == 'Linux' ansible.builtin.set_fact: diff --git a/tasks/pkgs/minio_client.yml b/tasks/pkgs/minio_client.yml index dd66ddf..5b00120 100644 --- a/tasks/pkgs/minio_client.yml +++ b/tasks/pkgs/minio_client.yml @@ -1,3 +1,3 @@ -- name: Append minio client to pkgs +- name: Append mc to pkg_go ansible.builtin.set_fact: pkg_go: "{{ pkg_go + ['github.com/minio/mc@latest'] }}" diff --git a/tasks/pkgs/neovide.yml b/tasks/pkgs/neovide.yml index e732e1f..91ee73b 100644 --- a/tasks/pkgs/neovide.yml +++ b/tasks/pkgs/neovide.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/neovide.yml - - name: Append to pkgs + - name: Append neovide to pkg_sys and pkg_cargo when: - ansible_system == 'Linux' notify: diff --git a/tasks/pkgs/neovim.yml b/tasks/pkgs/neovim.yml index f313dd7..3e32089 100644 --- a/tasks/pkgs/neovim.yml +++ b/tasks/pkgs/neovim.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/neovim.yml - - name: Append to appimages + - name: Append neovim to pkg_appimage when: - neovim.method == 'appimage' ansible.builtin.set_fact: @@ -20,6 +20,12 @@ ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['neovim'] }}" + - name: Append neovim to pkg_src + when: + - neovim.method == 'src' + ansible.builtin.set_fact: + pkg_src: "{{ pkg_src + ['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 c37b448..060bbbb 100644 --- a/tasks/pkgs/nerdfonts.yml +++ b/tasks/pkgs/nerdfonts.yml @@ -8,13 +8,13 @@ ansible.builtin.include_tasks: file: config/nerdfonts.yml - - name: Append to srcpkgs + - name: Append nerdfonts to pkg_archive when: - ansible_system == 'Linux' ansible.builtin.set_fact: pkg_archive: "{{ pkg_archive + ['nerdfonts'] }}" - - name: Append to caskpkgs + - name: Append nerdfonts to pkg_cask when: - ansible_system == 'Darwin' loop: "{{ nerdfonts.fonts }}" diff --git a/tasks/pkgs/nextcloud.yml b/tasks/pkgs/nextcloud.yml index 779ab30..50a6c98 100644 --- a/tasks/pkgs/nextcloud.yml +++ b/tasks/pkgs/nextcloud.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/nextcloud.yml - - name: Append to pkg_Flatpak + - name: Append nextcloud-client to pkg_Flatpak when: - ansible_system == 'Linux' - nextcloud.method == 'flatpak' @@ -18,14 +18,14 @@ ansible.builtin.set_fact: pkg_flatpak: "{{ pkg_flatpak + [nextcloud] }}" - - name: Append to pkg_sys + - name: Append nextcloud-client to pkg_sys when: - ansible_system == 'Linux' - nextcloud.method == 'sys' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['nextcloud'] }}" - - name: Append to pkg_cask + - name: Append nextcloud-client to pkg_cask when: - ansible_os_family == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/nginxls.yml b/tasks/pkgs/nginxls.yml index 5c769da..b5bc2a1 100644 --- a/tasks/pkgs/nginxls.yml +++ b/tasks/pkgs/nginxls.yml @@ -4,7 +4,7 @@ when: - nginxls_configured is undefined block: - - name: Add to pkg_pipx + - name: Append nginx-language-server to pkg_pipx notify: - Depend node changed_when: true diff --git a/tasks/pkgs/nodejs.yml b/tasks/pkgs/nodejs.yml index 2ce10d5..84aff7e 100644 --- a/tasks/pkgs/nodejs.yml +++ b/tasks/pkgs/nodejs.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/nodejs.yml - - name: Append to pkgs + - name: Append nodejs to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + nodejs.pkgs }}" diff --git a/tasks/pkgs/nomad.yml b/tasks/pkgs/nomad.yml index e1ba75f..ee12721 100644 --- a/tasks/pkgs/nomad.yml +++ b/tasks/pkgs/nomad.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/nomad.yml - - name: Append to pkg_tap + - name: Append nomad to pkg_tap when: - ansible_distribution == 'MacOSX' notify: @@ -17,7 +17,7 @@ ansible.builtin.set_fact: pkg_tap: "{{ pkg_tap + nomad.pkgs }}" - - name: Append to pkg_sys + - name: Append nomad to pkg_sys when: - ansible_system == 'Linux' notify: diff --git a/tasks/pkgs/packer.yml b/tasks/pkgs/packer.yml index fe474dc..4e0bdcc 100644 --- a/tasks/pkgs/packer.yml +++ b/tasks/pkgs/packer.yml @@ -8,13 +8,13 @@ ansible.builtin.include_tasks: file: config/packer.yml - - name: Append to pkg_tap + - name: Append packer to pkg_tap when: - ansible_system == 'Darwin' ansible.builtin.set_fact: pkg_tap: "{{ pkg_tap + packer.pkgs }}" - - name: Append to pkg_sys + - name: Append packer to pkg_sys when: - ansible_system == 'Linux' notify: diff --git a/tasks/pkgs/pandoc.yml b/tasks/pkgs/pandoc.yml index c5c947b..c997547 100644 --- a/tasks/pkgs/pandoc.yml +++ b/tasks/pkgs/pandoc.yml @@ -4,7 +4,7 @@ when: - pandoc_configured is undefined block: - - name: Append to pkgs + - name: Append pandoc to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['pandoc'] }}" diff --git a/tasks/pkgs/pgadmin.yml b/tasks/pkgs/pgadmin.yml index 786c911..7d520c0 100644 --- a/tasks/pkgs/pgadmin.yml +++ b/tasks/pkgs/pgadmin.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/pgadmin.yml - - name: Append to pkg_flatpak + - name: Append pgadmin to pkg_flatpak when: - pgadmin.method == 'flatpak' notify: @@ -17,7 +17,7 @@ ansible.builtin.set_fact: pkg_flatpak: "{{ pkg_flatpak + [pgadmin.flatpak] }}" - - name: Append to pkg_cask + - name: Append pgadmin to pkg_cask when: - pgadmin.method == 'cask' ansible.builtin.set_fact: diff --git a/tasks/pkgs/pipx.yml b/tasks/pkgs/pipx.yml index 34f70d5..b6f9342 100644 --- a/tasks/pkgs/pipx.yml +++ b/tasks/pkgs/pipx.yml @@ -4,7 +4,7 @@ when: - pipx_configured is undefined block: - - name: Append to pkgs + - name: Append pipx to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['pipx'] }}" diff --git a/tasks/pkgs/podman.yml b/tasks/pkgs/podman.yml index 5700a44..1f7ce9a 100644 --- a/tasks/pkgs/podman.yml +++ b/tasks/pkgs/podman.yml @@ -4,7 +4,7 @@ when: - podman_configured is undefined block: - - name: Append to pkg_sys + - name: Append podman to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['podman'] }}" diff --git a/tasks/pkgs/pulumi.yml b/tasks/pkgs/pulumi.yml index 0b9150a..575eceb 100644 --- a/tasks/pkgs/pulumi.yml +++ b/tasks/pkgs/pulumi.yml @@ -4,10 +4,6 @@ when: - pulumi_configured is undefined block: - - name: Set pulumi_configured - ansible.builtin.set_fact: - pulumi_configured: true - - name: Load pulumi config ansible.builtin.include_tasks: file: config/pulumi.yml @@ -23,3 +19,7 @@ - ansible_system == 'Darwin' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['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 f8f699f..3b5e56c 100644 --- a/tasks/pkgs/pyright.yml +++ b/tasks/pkgs/pyright.yml @@ -4,7 +4,7 @@ when: - pyright_configured is undefined block: - - name: Add to pkg_pipx + - name: Append pyright to pkg_pipx notify: - Depend pipx changed_when: true diff --git a/tasks/pkgs/python3.yml b/tasks/pkgs/python3.yml index 1464dc5..1408e6b 100644 --- a/tasks/pkgs/python3.yml +++ b/tasks/pkgs/python3.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/python3.yml - - name: Append to pkgs + - name: Append python3 to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + python3.pkgs }}" diff --git a/tasks/pkgs/quobix-vacuum.yml b/tasks/pkgs/quobix-vacuum.yml index 6c5c8cf..e323b00 100644 --- a/tasks/pkgs/quobix-vacuum.yml +++ b/tasks/pkgs/quobix-vacuum.yml @@ -4,7 +4,7 @@ when: - quobix_vacuum_configured is undefined block: - - name: Add to pkg_npm + - name: Append quobix/vacuum to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/revive.yml b/tasks/pkgs/revive.yml index bb3a58a..b09ed67 100644 --- a/tasks/pkgs/revive.yml +++ b/tasks/pkgs/revive.yml @@ -4,7 +4,7 @@ when: - revive_configured is undefined block: - - name: Add to pkg_go + - name: Append revive to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/ripgrep.yml b/tasks/pkgs/ripgrep.yml index 3871920..22b7c98 100644 --- a/tasks/pkgs/ripgrep.yml +++ b/tasks/pkgs/ripgrep.yml @@ -4,7 +4,7 @@ when: - ripgrep_configured is undefined block: - - name: Append to pkg_sys + - name: Append ripgrep to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['ripgrep'] }}" diff --git a/tasks/pkgs/rust.yml b/tasks/pkgs/rust.yml index 472a1e3..14a237f 100644 --- a/tasks/pkgs/rust.yml +++ b/tasks/pkgs/rust.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/rust.yml - - name: Append to pkgs + - name: Append rust to pkgs ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + rust.pkgs }}" diff --git a/tasks/pkgs/sd.yml b/tasks/pkgs/sd.yml index 89114ae..4cee505 100644 --- a/tasks/pkgs/sd.yml +++ b/tasks/pkgs/sd.yml @@ -4,13 +4,13 @@ when: - sd_configured is undefined block: - - name: Append to pkg_sys + - name: Append sd to pkg_sys when: - ansible_system == 'Darwin' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['sd'] }}" - - name: Add to pkg_cargo + - name: Append sd to pkg_cargo when: - ansible_system == 'Linux' notify: diff --git a/tasks/pkgs/sdbus_cpp_2.yml b/tasks/pkgs/sdbus_cpp_2.yml index 8911ffa..de3ebd1 100644 --- a/tasks/pkgs/sdbus_cpp_2.yml +++ b/tasks/pkgs/sdbus_cpp_2.yml @@ -5,14 +5,15 @@ - 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 + - name: Append sdbus-cpp-2 build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + sdbus_cpp_2.build_deps }}" + + - name: Append sdbus-cpp-2 to pkg_src + ansible.builtin.set_fact: pkg_src: "{{ pkg_src + ['sdbus_cpp_2'] }}" - name: Set sdbus_cpp_2_configured diff --git a/tasks/pkgs/sqlfluff.yml b/tasks/pkgs/sqlfluff.yml index 9864809..0b7ee9a 100644 --- a/tasks/pkgs/sqlfluff.yml +++ b/tasks/pkgs/sqlfluff.yml @@ -4,7 +4,7 @@ when: - sqlfluff_configured is undefined block: - - name: Add to pkg_pipx + - name: Append sqlfluff to pkg_pipx notify: - Depend pipx changed_when: true diff --git a/tasks/pkgs/sqlls.yml b/tasks/pkgs/sqlls.yml index 42cb8b9..6c81c75 100644 --- a/tasks/pkgs/sqlls.yml +++ b/tasks/pkgs/sqlls.yml @@ -4,7 +4,7 @@ when: - sqlls_configured is undefined block: - - name: Add to pkg_npm + - name: Append sql-language-server to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/starship.yml b/tasks/pkgs/starship.yml index 5c4f364..0e79948 100644 --- a/tasks/pkgs/starship.yml +++ b/tasks/pkgs/starship.yml @@ -4,7 +4,7 @@ when: - starship_configured is undefined block: - - name: Add to pkg_cargo + - name: Append starship to pkg_cargo notify: - Depend cargo changed_when: true diff --git a/tasks/pkgs/stow.yml b/tasks/pkgs/stow.yml index 7f68c5e..505ee97 100644 --- a/tasks/pkgs/stow.yml +++ b/tasks/pkgs/stow.yml @@ -4,7 +4,7 @@ when: - stow_configured is undefined block: - - name: Append to pkg_sys + - name: Append stow to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['stow'] }}" diff --git a/tasks/pkgs/tailscale.yml b/tasks/pkgs/tailscale.yml index 6413946..15b0966 100644 --- a/tasks/pkgs/tailscale.yml +++ b/tasks/pkgs/tailscale.yml @@ -8,15 +8,15 @@ ansible.builtin.include_tasks: file: config/tailscale.yml - - name: Enable for linux + - name: Append tailscale for linux when: - ansible_system == 'Linux' block: - - name: Enable for RedHat distros + - name: Append tailscale for RedHat distros when: - ansible_os_family == 'RedHat' block: - - name: Fedora >=41 + - name: Add tailscale repo for 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" @@ -25,7 +25,7 @@ - ansible_distribution == 'Fedora' - ansible_distribution_major_version|int >= 41 - - name: Fedora <41 + - name: Add tailscale repo for Fedora <41 ansible.builtin.command: creates: /etc/yum.repos.d/tailscale.repo cmd: "dnf config-manager --add-repo {{ tailscale.url_base }}/fedora/tailscale.repo" @@ -34,7 +34,7 @@ - ansible_distribution == 'Fedora' - ansible_distribution_major_version|int < 41 - - name: Rhel based distros + - name: Add tailscale for 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" @@ -42,7 +42,7 @@ when: - ansible_distribution != 'Fedora' - - name: Enable for Debian distros + - name: Append tailscale for Debian distros when: - ansible_os_family == 'Debian' block: @@ -62,11 +62,11 @@ dest: /etc/apt/sources.list.d/tailscale.list mode: '0644' - - name: Append to pkg_sys + - name: Append tailscale to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['tailscale'] }}" - - name: Append to pkg_cask + - name: Append tailscale to pkg_cask when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/tailwindcss-languageserver.yml b/tasks/pkgs/tailwindcss-languageserver.yml index 166dd56..454fb9b 100644 --- a/tasks/pkgs/tailwindcss-languageserver.yml +++ b/tasks/pkgs/tailwindcss-languageserver.yml @@ -4,7 +4,7 @@ when: - tailwindcss_languageserver_configured is undefined block: - - name: Add to pkg_npm + - name: Add tailwindcss/language-server to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/templ.yml b/tasks/pkgs/templ.yml index 52ab59d..257619c 100644 --- a/tasks/pkgs/templ.yml +++ b/tasks/pkgs/templ.yml @@ -4,7 +4,7 @@ when: - templ_configured is undefined block: - - name: Add to pkg_go + - name: Append templ to pkg_go notify: - Depend go changed_when: true diff --git a/tasks/pkgs/terraform.yml b/tasks/pkgs/terraform.yml index f39867c..b31aebf 100644 --- a/tasks/pkgs/terraform.yml +++ b/tasks/pkgs/terraform.yml @@ -8,9 +8,9 @@ ansible.builtin.include_tasks: file: config/terraform.yml - - name: Append to pkgs + - name: Append terraform block: - - name: MacOSX specific + - name: Append terraform to pkg_tap when: - ansible_distribution == 'MacOSX' notify: @@ -19,7 +19,7 @@ ansible.builtin.set_fact: pkg_tap: "{{ pkg_tap + terraform.pkgs }}" - - name: Linux specific + - name: Append terraform to pkg_sys when: - ansible_system == 'Linux' notify: diff --git a/tasks/pkgs/terraformls.yml b/tasks/pkgs/terraformls.yml index a499bdc..7073ed8 100644 --- a/tasks/pkgs/terraformls.yml +++ b/tasks/pkgs/terraformls.yml @@ -8,9 +8,9 @@ ansible.builtin.include_tasks: file: config/terraformls.yml - - name: Append to pkgs + - name: Append terraformls block: - - name: MacOS specific + - name: Append terraformls to pkg_tap when: - ansible_system == 'Darwin' notify: @@ -19,7 +19,7 @@ ansible.builtin.set_fact: pkg_tap: "{{ pkg_tap + terraformls.pkgs }}" - - name: Linux specific + - name: Append terraformls to pkg_sys when: - ansible_system == 'Linux' notify: diff --git a/tasks/pkgs/thunderbird.yml b/tasks/pkgs/thunderbird.yml index 2b40b5b..f9ca44e 100644 --- a/tasks/pkgs/thunderbird.yml +++ b/tasks/pkgs/thunderbird.yml @@ -4,13 +4,13 @@ when: - thunderbird_configured is undefined block: - - name: Append to pkg_sys + - name: Append thunderbird to pkg_sys when: - ansible_system == 'Linux' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['thunderbird'] }}" - - name: Append to pkg_cask + - name: Append thunderbird to pkg_cask when: - ansible_system == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/tidy.yml b/tasks/pkgs/tidy.yml index d588d3a..05608ff 100644 --- a/tasks/pkgs/tidy.yml +++ b/tasks/pkgs/tidy.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/tidy.yml - - name: Append to pkg_sys + - name: Append tidy to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + tidy.pkgs }}" diff --git a/tasks/pkgs/tldr.yml b/tasks/pkgs/tldr.yml index 4d62996..0dfe494 100644 --- a/tasks/pkgs/tldr.yml +++ b/tasks/pkgs/tldr.yml @@ -4,13 +4,13 @@ when: - tldr_configured is undefined block: - - name: Append to pkg_sys + - name: Append tldr to pkg_sys when: - ansible_os_family == 'Darwin' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['tlrc'] }}" - - name: Add to pkg_cargo + - name: Append tldr to pkg_cargo when: - ansible_system == 'Linux' ansible.builtin.set_fact: diff --git a/tasks/pkgs/tmux.yml b/tasks/pkgs/tmux.yml index 8ab27d9..5a44f56 100644 --- a/tasks/pkgs/tmux.yml +++ b/tasks/pkgs/tmux.yml @@ -4,7 +4,7 @@ when: - tmux_configured is undefined block: - - name: Append to pkgs + - name: Append tmux to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['tmux'] }}" diff --git a/tasks/pkgs/uwsm.yml b/tasks/pkgs/uwsm.yml index 6fbe56d..b669fa0 100644 --- a/tasks/pkgs/uwsm.yml +++ b/tasks/pkgs/uwsm.yml @@ -4,17 +4,20 @@ when: - uwsm_configured is undefined block: - - name: Set uwsm_configured - ansible.builtin.set_fact: - uwsm_configured: true - - name: Load uwsm config when: - uwsm is undefined ansible.builtin.include_tasks: file: config/uwsm.yml - - name: Append to pkg_src + - name: Append uwsm build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + uwsm.build_deps + uswm.deps }}" + + - name: Append uwsm to pkg_src + ansible.builtin.set_fact: 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 6267d15..c560a95 100644 --- a/tasks/pkgs/vault.yml +++ b/tasks/pkgs/vault.yml @@ -8,9 +8,9 @@ ansible.builtin.include_tasks: file: config/vault.yml - - name: Append to pkgs + - name: Append vault block: - - name: MacOS specific + - name: Append vault to pkg_tap when: - ansible_system == 'Darwin' notify: @@ -19,7 +19,7 @@ ansible.builtin.set_fact: pkg_tap: "{{ pkg_tap + vault.pkgs }}" - - name: Linux specific + - name: Append vault to pkg_sys when: - ansible_system == 'Linux' notify: diff --git a/tasks/pkgs/xdg_desktop_portal_hyprland.yml b/tasks/pkgs/xdg_desktop_portal_hyprland.yml index dac180a..eb9ccb9 100644 --- a/tasks/pkgs/xdg_desktop_portal_hyprland.yml +++ b/tasks/pkgs/xdg_desktop_portal_hyprland.yml @@ -4,17 +4,13 @@ when: - xdg_desktop_portal_hyprland_configured is undefined block: - - name: Set xdg_desktop_portal_hyprland_configured - ansible.builtin.set_fact: - xdg_desktop_portal_hyprland_configured: true - - 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: Ensure pkg_deps are added + - name: Ensure xdg-desktop-portal-hyprland pkg_deps are added loop: "{{ xdg_desktop_portal_hyprland.pkg_deps }}" loop_control: loop_var: xdg_pkg_dep @@ -23,7 +19,15 @@ ansible.builtin.include_tasks: file: "pkgs/{{ xdg_pkg_dep }}.yml" - - name: Append to pkg_src + - name: Append xdg-desktop-portal-hyprland build_deps to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + xdg_desktop_portal_hyprland.build_deps }}" + + - name: Append xdg-desktop-portal-hyprland to pkg_src + ansible.builtin.set_fact: 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 045c7f3..e886831 100644 --- a/tasks/pkgs/xh.yml +++ b/tasks/pkgs/xh.yml @@ -8,13 +8,13 @@ ansible.builtin.include_tasks: file: config/xh.yml - - name: Append to pkg_sys + - name: Append xh to pkg_sys when: - ansible_os_family == 'Darwin' ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['xh'] }}" - - name: Add to cargopkgs + - name: Add xh to cargopkgs when: - ansible_system == 'Linux' ansible.builtin.set_fact: diff --git a/tasks/pkgs/yamlls.yml b/tasks/pkgs/yamlls.yml index 1cf54cf..b4ad7c4 100644 --- a/tasks/pkgs/yamlls.yml +++ b/tasks/pkgs/yamlls.yml @@ -4,7 +4,7 @@ when: - yamlls_configured is undefined block: - - name: Add to pkg_npm + - name: Append yaml-language-server to pkg_npm notify: - Depend node changed_when: true diff --git a/tasks/pkgs/zfs.yml b/tasks/pkgs/zfs.yml index fcbc3b8..0edc787 100644 --- a/tasks/pkgs/zfs.yml +++ b/tasks/pkgs/zfs.yml @@ -55,11 +55,11 @@ Pin: release n={{ zfs.release }}-backports Pin-Priority: 990 - - name: Append to pkgs + - name: Append zfs to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + zfs.deps + zfs.pkgs }}" - - name: Append to caskpkgs + - name: Append openzfs to pkg_cask when: - ansible_os_family == 'Darwin' ansible.builtin.set_fact: diff --git a/tasks/pkgs/zig.yml b/tasks/pkgs/zig.yml index b266d43..569f854 100644 --- a/tasks/pkgs/zig.yml +++ b/tasks/pkgs/zig.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/zig.yml - - name: Append to pkgs + - name: Append zig to pkg_archive ansible.builtin.set_fact: pkg_archive: "{{ pkg_archive + ['zig'] }}" diff --git a/tasks/pkgs/zls.yml b/tasks/pkgs/zls.yml index e858155..acc5d2d 100644 --- a/tasks/pkgs/zls.yml +++ b/tasks/pkgs/zls.yml @@ -8,7 +8,7 @@ ansible.builtin.include_tasks: file: config/zls.yml - - name: Append to pkgs + - name: Append zls to pkg_archive notify: - Depend zig changed_when: true diff --git a/tasks/pkgs/zoxide.yml b/tasks/pkgs/zoxide.yml index 258538e..bab8bb4 100644 --- a/tasks/pkgs/zoxide.yml +++ b/tasks/pkgs/zoxide.yml @@ -4,7 +4,7 @@ when: - zoxide_configured is undefined block: - - name: Append to pkgs + - name: Append zoxide to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['zoxide'] }}" diff --git a/tasks/pkgs/zsh.yml b/tasks/pkgs/zsh.yml index 97ef15c..8636dc1 100644 --- a/tasks/pkgs/zsh.yml +++ b/tasks/pkgs/zsh.yml @@ -4,7 +4,7 @@ when: - zsh_configured is undefined block: - - name: Append to pkgs + - name: Append zsh to pkg_sys ansible.builtin.set_fact: pkg_sys: "{{ pkg_sys + ['zsh'] }}"