From 5a87648748a44e69898b46ea2b8c9d012a9bced2 Mon Sep 17 00:00:00 2001 From: jerb Date: Fri, 23 Feb 2024 13:37:37 -0500 Subject: [PATCH] feat: replace dconf with gschema overrides --- .../01-lazuli => gschema-overrides/lazuli.gschema.override} | 0 config/module-shared-bling.yml | 3 +-- config/module-shared-gschema-overrides.yml | 3 +++ config/recipe.yml | 1 + config/recipe_nvidia.yml | 1 + config/recipe_nvidia_vrr.yml | 3 ++- config/recipe_vrr.yml | 3 ++- 7 files changed, 10 insertions(+), 4 deletions(-) rename config/{files/usr/etc/dconf/db/local.d/01-lazuli => gschema-overrides/lazuli.gschema.override} (100%) create mode 100644 config/module-shared-gschema-overrides.yml diff --git a/config/files/usr/etc/dconf/db/local.d/01-lazuli b/config/gschema-overrides/lazuli.gschema.override similarity index 100% rename from config/files/usr/etc/dconf/db/local.d/01-lazuli rename to config/gschema-overrides/lazuli.gschema.override diff --git a/config/module-shared-bling.yml b/config/module-shared-bling.yml index 8a8e697..619d1b5 100644 --- a/config/module-shared-bling.yml +++ b/config/module-shared-bling.yml @@ -1,4 +1,3 @@ type: bling install: - - ublue-update - - dconf-update-service + - ublue-update \ No newline at end of file diff --git a/config/module-shared-gschema-overrides.yml b/config/module-shared-gschema-overrides.yml new file mode 100644 index 0000000..b903004 --- /dev/null +++ b/config/module-shared-gschema-overrides.yml @@ -0,0 +1,3 @@ +type: gschema-overrides +include: + - lazuli.gschema.override diff --git a/config/recipe.yml b/config/recipe.yml index 261e901..8df5642 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -9,4 +9,5 @@ modules: - from-file: module-shared-bling.yml - from-file: module-shared-yafti.yml - from-file: module-shared-scripts.yml + - from-file: module-shared-gschema-overrides.yml - from-file: module-shared-signing.yml diff --git a/config/recipe_nvidia.yml b/config/recipe_nvidia.yml index d08a559..cb06a8a 100644 --- a/config/recipe_nvidia.yml +++ b/config/recipe_nvidia.yml @@ -9,4 +9,5 @@ modules: - from-file: module-shared-bling.yml - from-file: module-shared-yafti.yml - from-file: module-shared-scripts.yml + - from-file: module-shared-gschema-overrides.yml - from-file: module-shared-signing.yml diff --git a/config/recipe_nvidia_vrr.yml b/config/recipe_nvidia_vrr.yml index 258aedf..17b6c3d 100644 --- a/config/recipe_nvidia_vrr.yml +++ b/config/recipe_nvidia_vrr.yml @@ -9,5 +9,6 @@ modules: - from-file: module-shared-bling.yml - from-file: module-shared-yafti.yml - from-file: module-shared-scripts.yml - - from-file: module-shared-signing.yml + - from-file: module-shared-gschema-overrides.yml - from-file: module-shared-vrr.yml + - from-file: module-shared-signing.yml \ No newline at end of file diff --git a/config/recipe_vrr.yml b/config/recipe_vrr.yml index 3003c54..b9d4fec 100644 --- a/config/recipe_vrr.yml +++ b/config/recipe_vrr.yml @@ -9,5 +9,6 @@ modules: - from-file: module-shared-bling.yml - from-file: module-shared-yafti.yml - from-file: module-shared-scripts.yml - - from-file: module-shared-signing.yml + - from-file: module-shared-gschema-overrides.yml - from-file: module-shared-vrr.yml + - from-file: module-shared-signing.yml