From 76042a914915bb006f2d8722c509d3fc6591a956 Mon Sep 17 00:00:00 2001 From: Lenus Walker Date: Tue, 13 Aug 2024 10:49:18 -0400 Subject: [PATCH] format files and make changes to gschema overrides --- .../01-izzy-os.gschema.override} | 11 ++- files/scripts/izzy-os-changes.sh | 3 + files/system/etc/dconf/db/gdm.d/01-izzy-os | 2 - files/system/etc/dconf/profile/gdm | 3 - recipes/akmods.yml | 7 +- recipes/common-flatpaks.yml | 87 +++++++++---------- recipes/common-packages.yml | 67 +++++++------- recipes/cosmic.yml | 15 ++-- recipes/displaylink.yml | 15 ++-- recipes/extra-repos.yml | 11 ++- recipes/gschema-overrides.yml | 3 + recipes/intel.yml | 9 +- recipes/recipe.yml | 1 + recipes/remove-packages.yml | 11 ++- recipes/scripts.yml | 7 +- recipes/system76-power.yml | 27 +++--- 16 files changed, 137 insertions(+), 142 deletions(-) rename files/{system/etc/dconf/db/local.d/01-izzy-os => gschema-overrides/01-izzy-os.gschema.override} (66%) delete mode 100644 files/system/etc/dconf/db/gdm.d/01-izzy-os delete mode 100644 files/system/etc/dconf/profile/gdm create mode 100644 recipes/gschema-overrides.yml diff --git a/files/system/etc/dconf/db/local.d/01-izzy-os b/files/gschema-overrides/01-izzy-os.gschema.override similarity index 66% rename from files/system/etc/dconf/db/local.d/01-izzy-os rename to files/gschema-overrides/01-izzy-os.gschema.override index 37778eb..f05e0c8 100644 --- a/files/system/etc/dconf/db/local.d/01-izzy-os +++ b/files/gschema-overrides/01-izzy-os.gschema.override @@ -1,3 +1,9 @@ +[org.gnome.desktop.peripherals.touchpad:GNOME-Greeter] +tap-to-click=true + +[org/gnome/desktop/peripherals/touchpad] +tap-to-click=true + [org/gnome/shell] enabled-extensions = ['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock@micxgx.gmail.com'] @@ -5,7 +11,4 @@ enabled-extensions = ['appindicatorsupport@rgcjonas.gmail.com', 'dash-to-dock@mi allow-volume-above-100-percent=true [org/gnome/desktop/wm/preferences] -button-layout=":minimize,maximize,close" - -[org/gnome/desktop/peripherals/touchpad] -tap-to-click=true \ No newline at end of file +button-layout=":minimize,maximize,close" \ No newline at end of file diff --git a/files/scripts/izzy-os-changes.sh b/files/scripts/izzy-os-changes.sh index 49c8be6..3815250 100644 --- a/files/scripts/izzy-os-changes.sh +++ b/files/scripts/izzy-os-changes.sh @@ -5,6 +5,9 @@ set -ouex pipefail if [[ -f /usr/share/applications/gnome-system-monitor.desktop ]]; then sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/gnome-system-monitor.desktop fi +if [[ -f /usr/share/applications/gnome-system-monitor-kde.desktop ]]; then + sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/gnome-system-monitor-kde.desktop +fi if [[ -f /usr/share/applications/org.gnome.SystemMonitor.desktop ]]; then sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/org.gnome.SystemMonitor.desktop fi diff --git a/files/system/etc/dconf/db/gdm.d/01-izzy-os b/files/system/etc/dconf/db/gdm.d/01-izzy-os deleted file mode 100644 index d1baf16..0000000 --- a/files/system/etc/dconf/db/gdm.d/01-izzy-os +++ /dev/null @@ -1,2 +0,0 @@ -[org/gnome/desktop/peripherals/touchpad] -tap-to-click=true \ No newline at end of file diff --git a/files/system/etc/dconf/profile/gdm b/files/system/etc/dconf/profile/gdm deleted file mode 100644 index befa6ca..0000000 --- a/files/system/etc/dconf/profile/gdm +++ /dev/null @@ -1,3 +0,0 @@ -user-db:user -system-db:gdm -file-db:/usr/share/gdm/greeter-dconf-defaults \ No newline at end of file diff --git a/recipes/akmods.yml b/recipes/akmods.yml index 0c22595..3d7c184 100644 --- a/recipes/akmods.yml +++ b/recipes/akmods.yml @@ -1,4 +1,3 @@ -modules: - - type: akmods - install: - - evdi \ No newline at end of file +type: akmods + install: + - evdi \ No newline at end of file diff --git a/recipes/common-flatpaks.yml b/recipes/common-flatpaks.yml index 38debb6..6b295f1 100644 --- a/recipes/common-flatpaks.yml +++ b/recipes/common-flatpaks.yml @@ -1,50 +1,49 @@ -modules: - - type: default-flatpaks - notify: true # Send notification after install/uninstall is finished (true/false) - system: - # If no repo information is specified, Flathub will be used by default - # repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo - # repo-name: flathub - # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software - install: - # Browsers - - org.mozilla.firefox - - com.microsoft.Edge +type: default-flatpaks + notify: true # Send notification after install/uninstall is finished (true/false) + system: + # If no repo information is specified, Flathub will be used by default + # repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo + # repo-name: flathub + # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software + install: + # Browsers + - org.mozilla.firefox + - com.microsoft.Edge - # Social - - io.github.mimbrero.WhatsAppDesktop - - com.github.IsmaelMartinez.teams_for_linux - - us.zoom.Zoom + # Social + - io.github.mimbrero.WhatsAppDesktop + - com.github.IsmaelMartinez.teams_for_linux + - us.zoom.Zoom - # Media - # - org.freedesktop.Platform.ffmpeg-full - - com.spotify.Client - - com.stremio.Stremio - - sh.cider.Cider + # Media + # - org.freedesktop.Platform.ffmpeg-full + - com.spotify.Client + - com.stremio.Stremio + - sh.cider.Cider - # Utility - - org.gnome.Loupe - - com.github.tchx84.Flatseal - - com.mattjakeman.ExtensionManager - - org.localsend.localsend_app - - com.bitwarden.desktop - - com.usebottles.bottles - - io.missioncenter.MissionCenter - - org.gnome.Papers - - # Development - - com.visualstudio.code + # Utility + - org.gnome.Loupe + - com.github.tchx84.Flatseal + - com.mattjakeman.ExtensionManager + - org.localsend.localsend_app + - com.bitwarden.desktop + - com.usebottles.bottles + - io.missioncenter.MissionCenter + - org.gnome.Papers + + # Development + - com.visualstudio.code - # Needed for winapps - - com.freerdp.FreeRDP + # Needed for winapps + - com.freerdp.FreeRDP - # Gaming - - com.valvesoftware.Steam - - net.lutris.Lutris + # Gaming + - com.valvesoftware.Steam + - net.lutris.Lutris - # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch). - # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08), - # only normal flatpak applications are (like Floorp Lightning web browser in this example). - # Installing different branches of the same Flatpak is not supported. - remove: - # - org.gnome.eog \ No newline at end of file + # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch). + # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08), + # only normal flatpak applications are (like Floorp Lightning web browser in this example). + # Installing different branches of the same Flatpak is not supported. + remove: + # - org.gnome.eog \ No newline at end of file diff --git a/recipes/common-packages.yml b/recipes/common-packages.yml index 7ac6fca..df39137 100644 --- a/recipes/common-packages.yml +++ b/recipes/common-packages.yml @@ -1,39 +1,38 @@ -modules: - - type: rpm-ostree - repos: - - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo +type: rpm-ostree + repos: + - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo - install: - # Utility - - distrobox - - adw-gtk3-theme - - rsms-inter-fonts - - podman-compose - - fastfetch - - starship + install: + # Utility + - distrobox + - adw-gtk3-theme + - rsms-inter-fonts + - podman-compose + - fastfetch + - starship - # Codecs - - pipewire-codec-aptx - - libavcodec-freeworld - - openh264 - - ffmpeg - - heif-pixbuf-loader - - libheif-freeworld - - libheif-tools + # Codecs + - pipewire-codec-aptx + - libavcodec-freeworld + - openh264 + - ffmpeg + - heif-pixbuf-loader + - libheif-freeworld + - libheif-tools - # Gnome Extensions - - gnome-shell-extension-appindicator - - gnome-shell-extension-pop-shell - - gnome-shell-extension-pop-shell-shortcut-overrides - - gnome-shell-extension-dash-to-dock + # Gnome Extensions + - gnome-shell-extension-appindicator + - gnome-shell-extension-pop-shell + - gnome-shell-extension-pop-shell-shortcut-overrides + - gnome-shell-extension-dash-to-dock - # Needed for winapps - - dialog - - nmap-ncat + # Needed for winapps + - dialog + - nmap-ncat - remove: - # example: removing firefox (in favor of the flatpak) - # "firefox" is the main package, "firefox-langpacks" is a dependency - - firefox - - firefox-langpacks # also remove firefox dependency (not required for all packages, this is a special case) - - noopenh264 \ No newline at end of file + remove: + # example: removing firefox (in favor of the flatpak) + # "firefox" is the main package, "firefox-langpacks" is a dependency + - firefox + - firefox-langpacks # also remove firefox dependency (not required for all packages, this is a special case) + - noopenh264 \ No newline at end of file diff --git a/recipes/cosmic.yml b/recipes/cosmic.yml index 830e3d4..5fe2fcf 100644 --- a/recipes/cosmic.yml +++ b/recipes/cosmic.yml @@ -1,8 +1,7 @@ -modules: - - type: script - snippets: - - wget https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-$(rpm -E %fedora)/ryanabx-cosmic-epoch-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ryanabx-cosmic.repo - - - type: rpm-ostree - install: - - cosmic-desktop +type: script + snippets: + - wget https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-$(rpm -E %fedora)/ryanabx-cosmic-epoch-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ryanabx-cosmic.repo + +type: rpm-ostree + install: + - cosmic-desktop diff --git a/recipes/displaylink.yml b/recipes/displaylink.yml index b80ed4d..da1eb98 100644 --- a/recipes/displaylink.yml +++ b/recipes/displaylink.yml @@ -1,8 +1,7 @@ -modules: - - type: script - snippets: - - wget https://copr.fedorainfracloud.org/coprs/crashdummy/Displaylink/repo/fedora-$(rpm -E %fedora)/crashdummy-Displaylink-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_crashdummy-displaylink.repo - - - type: rpm-ostree - install: - - displaylink \ No newline at end of file +type: script + snippets: + - wget https://copr.fedorainfracloud.org/coprs/crashdummy/Displaylink/repo/fedora-$(rpm -E %fedora)/crashdummy-Displaylink-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_crashdummy-displaylink.repo + +type: rpm-ostree + install: + - displaylink \ No newline at end of file diff --git a/recipes/extra-repos.yml b/recipes/extra-repos.yml index 61b03a7..6d1a380 100644 --- a/recipes/extra-repos.yml +++ b/recipes/extra-repos.yml @@ -1,6 +1,5 @@ -modules: - - type: rpm-ostree - install: - # https://docs.fedoraproject.org/en-US/quick-docs/rpmfusion-setup/#_enabling_the_rpm_fusion_repositories_for_ostree_based_systems - - rpmfusion-free-release - - rpmfusion-nonfree-release \ No newline at end of file +type: rpm-ostree + install: + # https://docs.fedoraproject.org/en-US/quick-docs/rpmfusion-setup/#_enabling_the_rpm_fusion_repositories_for_ostree_based_systems + - rpmfusion-free-release + - rpmfusion-nonfree-release \ No newline at end of file diff --git a/recipes/gschema-overrides.yml b/recipes/gschema-overrides.yml new file mode 100644 index 0000000..1c44022 --- /dev/null +++ b/recipes/gschema-overrides.yml @@ -0,0 +1,3 @@ +type: gschema-overrides +include: + - 01-izzy-os.gschema.override \ No newline at end of file diff --git a/recipes/intel.yml b/recipes/intel.yml index a097016..f46ef1f 100644 --- a/recipes/intel.yml +++ b/recipes/intel.yml @@ -1,5 +1,4 @@ -modules: - - type: rpm-ostree - install: - - igt-gpu-tools - - intel-media-driver \ No newline at end of file +type: rpm-ostree + install: + - igt-gpu-tools + - intel-media-driver \ No newline at end of file diff --git a/recipes/recipe.yml b/recipes/recipe.yml index c979fb9..d675f01 100644 --- a/recipes/recipe.yml +++ b/recipes/recipe.yml @@ -27,6 +27,7 @@ modules: - from-file: common-packages.yml - from-file: common-flatpaks.yml - from-file: remove-packages.yml + - from-file: gschema-overrides.yml - from-file: scripts.yml - type: signing # this sets up the proper policy & signing files for signed images to work fully \ No newline at end of file diff --git a/recipes/remove-packages.yml b/recipes/remove-packages.yml index 6daf83f..21bd192 100644 --- a/recipes/remove-packages.yml +++ b/recipes/remove-packages.yml @@ -1,6 +1,5 @@ -modules: - - type: rpm-ostree - remove: - - gnome-extensions-app - - nvtop - - htop \ No newline at end of file +type: rpm-ostree + remove: + - gnome-extensions-app + - nvtop + - htop \ No newline at end of file diff --git a/recipes/scripts.yml b/recipes/scripts.yml index b1c8ce6..d831c41 100644 --- a/recipes/scripts.yml +++ b/recipes/scripts.yml @@ -1,4 +1,3 @@ -modules: - - type: script - scripts: - - izzy-os-changes.sh \ No newline at end of file +type: script + scripts: + - izzy-os-changes.sh \ No newline at end of file diff --git a/recipes/system76-power.yml b/recipes/system76-power.yml index fb8b2fa..bea8047 100644 --- a/recipes/system76-power.yml +++ b/recipes/system76-power.yml @@ -1,15 +1,14 @@ -modules: - - type: rpm-ostree - repos: - - https://copr.fedorainfracloud.org/coprs/szydell/system76/repo/fedora-%OS_VERSION%/szydell-system76-fedora-%OS_VERSION%.repo - install: - - system76-driver - - system76-power +type: rpm-ostree + repos: + - https://copr.fedorainfracloud.org/coprs/szydell/system76/repo/fedora-%OS_VERSION%/szydell-system76-fedora-%OS_VERSION%.repo + install: + - system76-driver + - system76-power - - type: systemd - system: - enabled: - - com.system76.PowerDaemon.service - - system76-power-wake.service - masked: - - power-profiles-daemon.service \ No newline at end of file +type: systemd + system: + enabled: + - com.system76.PowerDaemon.service + - system76-power-wake.service + masked: + - power-profiles-daemon.service \ No newline at end of file