From 5c7358f6156ae4e23e5cadbc0e20fff06014286b Mon Sep 17 00:00:00 2001 From: Jakub Zenon Kujawa Date: Fri, 9 Feb 2024 20:58:45 +0100 Subject: [PATCH] feat: combine both `dconf-update` & `gschema.override` --- config/common_modules/gschema-overrides.yml | 3 + .../usr/etc/dconf/db/local.d/01-silverflow | 59 ------------------- .../dconf/db/local.d/locks/00-silveflow-lock | 25 ++++++++ .../zz1-silverflow.gschema.override | 56 ++++++++++++++++++ config/recipe.yml | 7 +-- 5 files changed, 87 insertions(+), 63 deletions(-) create mode 100644 config/common_modules/gschema-overrides.yml delete mode 100644 config/files/usr/etc/dconf/db/local.d/01-silverflow create mode 100644 config/files/usr/etc/dconf/db/local.d/locks/00-silveflow-lock create mode 100644 config/gschema-overrides/zz1-silverflow.gschema.override diff --git a/config/common_modules/gschema-overrides.yml b/config/common_modules/gschema-overrides.yml new file mode 100644 index 0000000..fa262e6 --- /dev/null +++ b/config/common_modules/gschema-overrides.yml @@ -0,0 +1,3 @@ +type: gschema-overrides +include: + - zz1-silverflow.gschema.override \ No newline at end of file diff --git a/config/files/usr/etc/dconf/db/local.d/01-silverflow b/config/files/usr/etc/dconf/db/local.d/01-silverflow deleted file mode 100644 index 3f23c0c..0000000 --- a/config/files/usr/etc/dconf/db/local.d/01-silverflow +++ /dev/null @@ -1,59 +0,0 @@ -[org/gnome/desktop/interface] -clock-show-seconds=true -clock-show-weekday=true -cursor-theme='Bibata-Modern-Classic' -document-font-name='Inter 11' -font-antialiasing='rgba' -icon-theme='MoreWaita' -font-name='Inter 11' -monospace-font-name='Hack Nerd Font Mono 10' -show-battery-percentage=true -text-scaling-factor=1.2 - -[org/gnome/desktop/datetime] -automatic-timezone=true - -[org/gnome/nautilus/preferences] -default-folder-viewer='icon-view' -search-filter-time-type='last_modified' -show-delete-permanently=true - -[org/gnome/desktop/peripherals/touchpad] -send-events='disabled-on-external-mouse' -tap-to-click=true - -[org/gnome/desktop/privacy] -old-files-age=uint32 30 -recent-files-max-age=-1 -remove-old-temp-files=true -remove-old-trash-files=true - -[org/gnome/mutter] -center-new-windows=true -check-alive-timeout=uint32 20000 - -[org/gtk/gtk4/settings/file-chooser] -show-hidden=true -sort-directories-first=true - -[org/gtk/settings/file-chooser] -show-hidden=true -sort-directories-first=true - -[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] -binding='t' -command='kgx' -name='Gnome Console' - -[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1] -binding='e' -command='nautilus' -name='Nautilus' - -[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2] -binding='space' -command='1password --quick-access' -name='1Password Quick Access' - -[org/gnome/settings-daemon/plugins/media-keys] -custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/'] diff --git a/config/files/usr/etc/dconf/db/local.d/locks/00-silveflow-lock b/config/files/usr/etc/dconf/db/local.d/locks/00-silveflow-lock new file mode 100644 index 0000000..0ce51b8 --- /dev/null +++ b/config/files/usr/etc/dconf/db/local.d/locks/00-silveflow-lock @@ -0,0 +1,25 @@ +# Set folders first lock +/org/gtk/gtk4/settings/file-chooser/sort-directories-first +/org/gtk/settings/file-chooser/sort-directories-first + +# Font & theme settings lock +/org/gnome/desktop/interface/clock-show-weekday +/org/gnome/desktop/interface/document-font-name +/org/gnome/desktop/interface/font-hinting +/org/gnome/desktop/interface/font-name +/org/gnome/desktop/interface/icon-theme + +# Keyboard settings lock +/org/gnome/desktop/peripherals/keyboard/delay + +# Touchpad settings lock +/org/gnome/desktop/peripherals/touchpad/tap-to-click + +# Remove old trash files setting lock +/org/gnome/desktop/privacy/remove-old-trash-files + +# Titlebar font setting lock +/org/gnome/desktop/wm/preferences/titlebar-font + +# Mutter settings lock +/org/gnome/mutter/check-alive-timeout \ No newline at end of file diff --git a/config/gschema-overrides/zz1-silverflow.gschema.override b/config/gschema-overrides/zz1-silverflow.gschema.override new file mode 100644 index 0000000..daf8c8b --- /dev/null +++ b/config/gschema-overrides/zz1-silverflow.gschema.override @@ -0,0 +1,56 @@ +#-------------- LOCKSCREEN MODIFICATIONS --------------# + +[org.gnome.desktop.peripherals.touchpad:GNOME-Greeter] +tap-to-click=true + +#-------------- DESKTOP MODIFICATIONS --------------# + +[org.gnome.desktop.interface] +clock-show-seconds=true +clock-show-weekday=true +cursor-theme='Bibata-Modern-Classic' +document-font-name='Inter 11' +font-antialiasing='rgba' +icon-theme='MoreWaita' +font-name='Inter 11' +monospace-font-name='Hack Nerd Font Mono 10' +show-battery-percentage=true +text-scaling-factor=1.2 + +[org.gnome.desktop.wm.preferences] +titlebar-font='Inter Bold 11' +titlebar-uses-system-font=false + +[org.gnome.desktop.datetime] +automatic-timezone=true + +[org.gnome.desktop.peripherals.keyboard] +delay=uint32 226 +numlock-state=true + +[org.gnome.nautilus.preferences] +default-folder-viewer='icon-view' +search-filter-time-type='last_modified' +show-delete-permanently=true + +[org.gnome.desktop.peripherals.touchpad] +send-events='disabled-on-external-mouse' +tap-to-click=true + +[org.gnome.desktop.privacy] +old-files-age=uint32 30 +recent-files-max-age=-1 +remove-old-temp-files=true +remove-old-trash-files=true + +[org.gnome.mutter] +center-new-windows=true +check-alive-timeout=uint32 20000 + +[org.gtk.gtk4.Settings.FileChooser] +show-hidden=true +sort-directories-first=true + +[org.gtk.Settings.FileChooser] +show-hidden=true +sort-directories-first=true diff --git a/config/recipe.yml b/config/recipe.yml index 687f9b3..e0622e9 100644 --- a/config/recipe.yml +++ b/config/recipe.yml @@ -6,13 +6,12 @@ image-version: 39 modules: - from-file: common_modules/files.yml - from-file: common_modules/rpm-ostree.yml - - from-file: common_modules/default-flatpaks.yml - from-file: common_modules/yafti.yml + - from-file: common_modules/default-flatpaks.yml - from-file: common_modules/fonts.yml - from-file: common_modules/bling.yml - from-file: common_modules/systemd.yml - from-file: common_modules/image-cleaner.yml - - - type: signing - + - from-file: common_modules/gschema-overrides.yml - from-file: common_modules/scripts.yml + - type: signing