diff --git a/ansible/roles/base/tasks/packages.yaml b/ansible/roles/base/tasks/packages.yaml index a068525..431b29f 100644 --- a/ansible/roles/base/tasks/packages.yaml +++ b/ansible/roles/base/tasks/packages.yaml @@ -71,12 +71,18 @@ - name: Define package list to install ansible.builtin.set_fact: package_selection: "pkgs_vm_{{ ansible_facts['virtualization_role'] }}" + dist_specific_packages: "pkgs_vm_{{ ansible_distribution | lower }}" - name: Install packages ansible.builtin.apt: name: "{{ lookup('vars', package_selection) }}" state: present +- name: Install dist_specific_packages + ansible.builtin.apt: + name: "{{ lookup('vars', dist_specific_packages) }}" + state: present + # - name: Setup flatpak # community.general.flatpak_remote: # name: flathub @@ -112,7 +118,7 @@ value: '65535' sysctl_set: true reload: true - when: "{{ namespaces.stdout | regex_search('[\\d]{1,5}') | int }} > 0" + when: namespaces.stdout is not search('[\\d]{1,5}') - name: Create podman config file ansible.builtin.file: diff --git a/ansible/roles/base/vars/packages_install.yaml b/ansible/roles/base/vars/packages_install.yaml index 3703191..e27f45a 100644 --- a/ansible/roles/base/vars/packages_install.yaml +++ b/ansible/roles/base/vars/packages_install.yaml @@ -16,6 +16,13 @@ pkgs_vm_guest: - exa - duf - tree + - pnmixer + - unattended-upgrades + +pkgs_vm_debian: + - firefox-esr +pkgs_vm_ubuntu: + - firefox pkgs_vm_host: - zsh diff --git a/ansible/roles/base/vars/packages_remove.yaml b/ansible/roles/base/vars/packages_remove.yaml index a440d59..08cb8a8 100644 --- a/ansible/roles/base/vars/packages_remove.yaml +++ b/ansible/roles/base/vars/packages_remove.yaml @@ -28,6 +28,7 @@ rmv_vm_guest: - file-roller - totem - printer-driver-* + - zutty rmv_vm_host: - byobu