diff --git a/group_vars/silverblue.yml b/group_vars/silverblue.yml index b2d459d..21a1786 100644 --- a/group_vars/silverblue.yml +++ b/group_vars/silverblue.yml @@ -94,8 +94,6 @@ rpm_ostree_base_packages: state: absent rpm_ostree_kargs: - 'i915.enable_psr=0': - state: present 'rd.luks.options=discard': state: absent diff --git a/host_vars/chapek9.yml b/host_vars/chapek9.yml index b005829..b53e541 100644 --- a/host_vars/chapek9.yml +++ b/host_vars/chapek9.yml @@ -2,4 +2,8 @@ flatpak_flatpaks_overwrite: com.github.ransome1.sleek: state: present - remote: flathub \ No newline at end of file + remote: flathub + +rpm_ostree_kargs_overwrite: + 'i915.enable_psr=0': + state: present \ No newline at end of file diff --git a/host_vars/ice9.yml b/host_vars/ice9.yml new file mode 100644 index 0000000..b005829 --- /dev/null +++ b/host_vars/ice9.yml @@ -0,0 +1,5 @@ +--- +flatpak_flatpaks_overwrite: + com.github.ransome1.sleek: + state: present + remote: flathub \ No newline at end of file diff --git a/roles/rpm-ostree/tasks/main.yml b/roles/rpm-ostree/tasks/main.yml index e0ac051..1ba3d6a 100644 --- a/roles/rpm-ostree/tasks/main.yml +++ b/roles/rpm-ostree/tasks/main.yml @@ -21,6 +21,11 @@ - item.value.state == 'present' - rpm_ostree_alter_base_packages | bool +- name: Merge kernel params and overwrites + set_fact: + rpm_ostree_kargs: '{{ rpm_ostree_kargs | combine(rpm_ostree_kargs_overwrite) }}' + when: rpm_ostree_kargs_overwrite | default() + - name: Set kernel parameters ansible.builtin.command: cmd: rpm-ostree kargs --append-if-missing="{{ item.key }}" @@ -54,6 +59,11 @@ - Enable rpm-ostree-automatic when: rpm_ostree_enable_autoupdates | bool +- name: Merge layered packages and overwrites + set_fact: + rpm_ostree_layered_packages: '{{ rpm_ostree_layered_packages | combine(rpm_ostree_layered_packages_overwrite) }}' + when: rpm_ostree_layered_packages_overwrite | default() + - name: Add/remove layered packages community.general.rpm_ostree_pkg: name: "{{ item.key }}" diff --git a/silverblue.yml b/silverblue.yml index 2da98c4..bc2e886 100644 --- a/silverblue.yml +++ b/silverblue.yml @@ -6,4 +6,4 @@ roles: - flatpak - rpm-ostree - - etc + - etc \ No newline at end of file