Make rpm-ostree kargs and layered package overwritable

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
 

host_vars/chapek9.yml

@@ -2,4 +2,8 @@
 flatpak_flatpaks_overwrite:
   com.github.ransome1.sleek:
     state: present
-    remote: flathub
+    remote: flathub
+
+rpm_ostree_kargs_overwrite:
+  'i915.enable_psr=0':
+    state: present

host_vars/ice9.yml

@@ -0,0 +1,5 @@
+---
+flatpak_flatpaks_overwrite:
+  com.github.ransome1.sleek:
+    state: present
+    remote: flathub

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 }}"

silverblue.yml

@@ -6,4 +6,4 @@
   roles:
     - flatpak
     - rpm-ostree
-    - etc
+    - etc