From 1bbbfed381ca7dca1119ef8b754a48f3fce6101d Mon Sep 17 00:00:00 2001 From: fiftydinar <65243233+fiftydinar@users.noreply.github.com> Date: Fri, 4 Oct 2024 19:16:26 +0200 Subject: [PATCH] chore: Use gschema override instead of profile.d script for default theming settings (#56) --- .../gschema-overrides/zz1-secureblue-theming.gschema.override | 4 ++++ files/system/etc/profile.d/settheming.sh | 3 --- recipes/common-gschema-overrides.yml | 3 +++ recipes/recipe-hyprland-gdm.yml | 1 + recipes/recipe-hyprland-nvidia-gdm.yml | 1 + recipes/recipe-hyprland-nvidia.yml | 1 + recipes/recipe-hyprland.yml | 1 + recipes/recipe-river-gdm.yml | 1 + recipes/recipe-river-nvidia-gdm.yml | 1 + recipes/recipe-river-nvidia.yml | 1 + recipes/recipe-river.yml | 1 + recipes/recipe-sway-gdm.yml | 1 + recipes/recipe-sway-nvidia-gdm.yml | 1 + recipes/recipe-sway-nvidia.yml | 1 + recipes/recipe-sway.yml | 1 + recipes/recipe-wayfire-gdm.yml | 1 + recipes/recipe-wayfire-nvidia-gdm.yml | 1 + recipes/recipe-wayfire-nvidia.yml | 1 + recipes/recipe-wayfire.yml | 1 + 19 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 files/gschema-overrides/zz1-secureblue-theming.gschema.override delete mode 100755 files/system/etc/profile.d/settheming.sh create mode 100644 recipes/common-gschema-overrides.yml diff --git a/files/gschema-overrides/zz1-secureblue-theming.gschema.override b/files/gschema-overrides/zz1-secureblue-theming.gschema.override new file mode 100644 index 0000000..caa45e1 --- /dev/null +++ b/files/gschema-overrides/zz1-secureblue-theming.gschema.override @@ -0,0 +1,4 @@ +[org.gnome.desktop.interface] +gtk-theme='Adwaita-dark' +color-scheme='prefer-dark' +icon-theme='Papirus' \ No newline at end of file diff --git a/files/system/etc/profile.d/settheming.sh b/files/system/etc/profile.d/settheming.sh deleted file mode 100755 index 4c2d7ba..0000000 --- a/files/system/etc/profile.d/settheming.sh +++ /dev/null @@ -1,3 +0,0 @@ -gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita-dark' -gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' -gsettings set org.gnome.desktop.interface icon-theme 'Papirus' diff --git a/recipes/common-gschema-overrides.yml b/recipes/common-gschema-overrides.yml new file mode 100644 index 0000000..71ee22d --- /dev/null +++ b/recipes/common-gschema-overrides.yml @@ -0,0 +1,3 @@ +type: gschema-overrides +include: + - zz1-secureblue-theming.gschema.override \ No newline at end of file diff --git a/recipes/recipe-hyprland-gdm.yml b/recipes/recipe-hyprland-gdm.yml index 13d9038..9caf39e 100644 --- a/recipes/recipe-hyprland-gdm.yml +++ b/recipes/recipe-hyprland-gdm.yml @@ -12,6 +12,7 @@ modules: - from-file: hyprland-packages.yml - from-file: hyprland-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: hyprland-scripts.yml - from-file: gdm-scripts.yml diff --git a/recipes/recipe-hyprland-nvidia-gdm.yml b/recipes/recipe-hyprland-nvidia-gdm.yml index ec5548a..b653121 100644 --- a/recipes/recipe-hyprland-nvidia-gdm.yml +++ b/recipes/recipe-hyprland-nvidia-gdm.yml @@ -12,6 +12,7 @@ modules: - from-file: hyprland-packages.yml - from-file: hyprland-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: hyprland-scripts.yml - from-file: gdm-scripts.yml diff --git a/recipes/recipe-hyprland-nvidia.yml b/recipes/recipe-hyprland-nvidia.yml index 0950121..2fd804a 100644 --- a/recipes/recipe-hyprland-nvidia.yml +++ b/recipes/recipe-hyprland-nvidia.yml @@ -12,6 +12,7 @@ modules: - from-file: hyprland-packages.yml - from-file: hyprland-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: hyprland-scripts.yml - from-file: sddm-scripts.yml diff --git a/recipes/recipe-hyprland.yml b/recipes/recipe-hyprland.yml index f9ace44..bef9128 100644 --- a/recipes/recipe-hyprland.yml +++ b/recipes/recipe-hyprland.yml @@ -12,6 +12,7 @@ modules: - from-file: hyprland-packages.yml - from-file: hyprland-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: hyprland-scripts.yml - from-file: sddm-scripts.yml diff --git a/recipes/recipe-river-gdm.yml b/recipes/recipe-river-gdm.yml index d47eb5a..48643f8 100644 --- a/recipes/recipe-river-gdm.yml +++ b/recipes/recipe-river-gdm.yml @@ -12,6 +12,7 @@ modules: - from-file: river-packages.yml - from-file: river-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: river-scripts.yml - from-file: gdm-scripts.yml diff --git a/recipes/recipe-river-nvidia-gdm.yml b/recipes/recipe-river-nvidia-gdm.yml index ba26700..9bfd6e0 100644 --- a/recipes/recipe-river-nvidia-gdm.yml +++ b/recipes/recipe-river-nvidia-gdm.yml @@ -12,6 +12,7 @@ modules: - from-file: river-packages.yml - from-file: river-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: river-scripts.yml - from-file: gdm-scripts.yml diff --git a/recipes/recipe-river-nvidia.yml b/recipes/recipe-river-nvidia.yml index 53847b8..8221ea0 100644 --- a/recipes/recipe-river-nvidia.yml +++ b/recipes/recipe-river-nvidia.yml @@ -12,6 +12,7 @@ modules: - from-file: river-packages.yml - from-file: river-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: river-scripts.yml - from-file: sddm-scripts.yml diff --git a/recipes/recipe-river.yml b/recipes/recipe-river.yml index 3d617d2..dee1c7d 100644 --- a/recipes/recipe-river.yml +++ b/recipes/recipe-river.yml @@ -12,6 +12,7 @@ modules: - from-file: river-packages.yml - from-file: river-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: river-scripts.yml - from-file: sddm-scripts.yml diff --git a/recipes/recipe-sway-gdm.yml b/recipes/recipe-sway-gdm.yml index 45dcb55..ae313d3 100644 --- a/recipes/recipe-sway-gdm.yml +++ b/recipes/recipe-sway-gdm.yml @@ -12,6 +12,7 @@ modules: - from-file: common-packages.yml - from-file: common-files.yml - from-file: sway-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: gdm-scripts.yml - type: wayblue-signing diff --git a/recipes/recipe-sway-nvidia-gdm.yml b/recipes/recipe-sway-nvidia-gdm.yml index 3c49c52..8094e31 100644 --- a/recipes/recipe-sway-nvidia-gdm.yml +++ b/recipes/recipe-sway-nvidia-gdm.yml @@ -12,6 +12,7 @@ modules: - from-file: common-packages.yml - from-file: common-files.yml - from-file: sway-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: gdm-scripts.yml - type: wayblue-signing diff --git a/recipes/recipe-sway-nvidia.yml b/recipes/recipe-sway-nvidia.yml index 3c7c9ce..82b7876 100644 --- a/recipes/recipe-sway-nvidia.yml +++ b/recipes/recipe-sway-nvidia.yml @@ -11,6 +11,7 @@ modules: - from-file: common-packages.yml - from-file: common-files.yml - from-file: sway-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: sddm-scripts.yml - type: wayblue-signing diff --git a/recipes/recipe-sway.yml b/recipes/recipe-sway.yml index 217abf1..6768cb5 100644 --- a/recipes/recipe-sway.yml +++ b/recipes/recipe-sway.yml @@ -11,6 +11,7 @@ modules: - from-file: common-packages.yml - from-file: common-files.yml - from-file: sway-files.yml + - from-file: common-gschema-overrides.yml - from-file: common-scripts.yml - from-file: sddm-scripts.yml - type: wayblue-signing diff --git a/recipes/recipe-wayfire-gdm.yml b/recipes/recipe-wayfire-gdm.yml index 617b176..8eb1438 100644 --- a/recipes/recipe-wayfire-gdm.yml +++ b/recipes/recipe-wayfire-gdm.yml @@ -12,6 +12,7 @@ modules: - from-file: wayfire-packages.yml - from-file: wayfire-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: wayfire-scripts.yml - from-file: common-scripts.yml - from-file: gdm-scripts.yml diff --git a/recipes/recipe-wayfire-nvidia-gdm.yml b/recipes/recipe-wayfire-nvidia-gdm.yml index 47573af..5c2b85e 100644 --- a/recipes/recipe-wayfire-nvidia-gdm.yml +++ b/recipes/recipe-wayfire-nvidia-gdm.yml @@ -12,6 +12,7 @@ modules: - from-file: wayfire-packages.yml - from-file: wayfire-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: wayfire-scripts.yml - from-file: common-scripts.yml - from-file: gdm-scripts.yml diff --git a/recipes/recipe-wayfire-nvidia.yml b/recipes/recipe-wayfire-nvidia.yml index 483e5b1..c30c4e6 100644 --- a/recipes/recipe-wayfire-nvidia.yml +++ b/recipes/recipe-wayfire-nvidia.yml @@ -12,6 +12,7 @@ modules: - from-file: wayfire-packages.yml - from-file: wayfire-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: wayfire-scripts.yml - from-file: common-scripts.yml - from-file: sddm-scripts.yml diff --git a/recipes/recipe-wayfire.yml b/recipes/recipe-wayfire.yml index a0c93d6..fe466b2 100644 --- a/recipes/recipe-wayfire.yml +++ b/recipes/recipe-wayfire.yml @@ -12,6 +12,7 @@ modules: - from-file: wayfire-packages.yml - from-file: wayfire-files.yml - from-file: common-files.yml + - from-file: common-gschema-overrides.yml - from-file: wayfire-scripts.yml - from-file: common-scripts.yml - from-file: sddm-scripts.yml