From 8b743f3b9e18fcfd52b5baab79cd03460fbf35c9 Mon Sep 17 00:00:00 2001 From: Jacob Babor Date: Tue, 21 Jan 2025 01:24:07 -0600 Subject: [PATCH] Carve out a place for ostree packages on immutable distros --- roles/common/tasks/packages.yml | 1 - roles/desktop/defaults/main.yml | 8 ++++++++ roles/desktop/tasks/packages.yml | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/roles/common/tasks/packages.yml b/roles/common/tasks/packages.yml index 062e941..62d20c3 100644 --- a/roles/common/tasks/packages.yml +++ b/roles/common/tasks/packages.yml @@ -45,7 +45,6 @@ community.general.rpm_ostree_pkg: name: - htop - - ibm-plex-fonts-all - ncdu - vim when: ansible_os_family == "RedHat" and ansible_pkg_mgr == "atomic_container" diff --git a/roles/desktop/defaults/main.yml b/roles/desktop/defaults/main.yml index f5d7c4e..96f37c8 100644 --- a/roles/desktop/defaults/main.yml +++ b/roles/desktop/defaults/main.yml @@ -148,6 +148,14 @@ desktop_apt_packages_remove_extra: [] desktop_apt_debs: [] desktop_apt_debs_extra: [] +desktop_dnf_packages: + - foot + - htop + - ibm-plex-fonts-all + - ncdu + - vim +desktop_dnf_packages_extra: [] + desktop_flatpak_remotes: - name: flathub url: "https://dl.flathub.org/repo/flathub.flatpakrepo" diff --git a/roles/desktop/tasks/packages.yml b/roles/desktop/tasks/packages.yml index 9b81db4..183d006 100644 --- a/roles/desktop/tasks/packages.yml +++ b/roles/desktop/tasks/packages.yml @@ -27,6 +27,9 @@ ansible.builtin.apt: deb="{{ item }}" loop: "{{ desktop_apt_debs + desktop_apt_debs_extra }}" when: ansible_pkg_mgr == "apt" +- name: configure packages for ostree + community.general.rpm_ostree_pkg: name="{{ desktop_dnf_packages + desktop_dnf_packages_extra }}" + when: ansible_os_family == "RedHat" and ansible_pkg_mgr == "atomic_container" - name: configure pip3 packages ansible.builtin.pip: executable=/usr/bin/pip3 state=latest name="{{ desktop_pip3_packages + desktop_pip3_packages_extra }}" when: ansible_pkg_mgr == "apt"