diff --git a/config/common-packages.yml b/config/common-packages.yml index f7861cd..247e1b7 100644 --- a/config/common-packages.yml +++ b/config/common-packages.yml @@ -2,6 +2,7 @@ type: rpm-ostree repos: - https://copr.fedorainfracloud.org/coprs/qoijjj/hardened_malloc/repo/fedora-39/qoijjj-hardened_malloc-fedora-39.repo - https://copr.fedorainfracloud.org/coprs/qoijjj/vscodium/repo/fedora-39/qoijjj-codium-fedora-39.repo + - https://copr.fedorainfracloud.org/coprs/secureblue/bubblewrap-suid/repo/fedora-39/secureblue-bubblewrap-suid-fedora-39.repo install: - python3-pip # GNOME's GTK4 theme, Libadwaita. Already included in Silverblue, but not @@ -21,13 +22,14 @@ install: - chkrootkit - koji - codium + - bubblewrap-suid remove: - firefox - firefox-langpacks - virtualbox-guest-additions - openssh-server - + - bubblewrap diff --git a/config/kinoite-packages.yml b/config/kinoite-packages.yml index 39bb201..3d6b5ec 100644 --- a/config/kinoite-packages.yml +++ b/config/kinoite-packages.yml @@ -10,11 +10,6 @@ remove: - kf5-akonadi-server - kf5-akonadi-server-mysql - kwalletmanager5 - - flatpak - - flatpak-libs - - flatpak-selinux - - flatpak-kcm - - flatpak-session-helper - fedora-flathub-remote - toolbox - kde-print-manager @@ -27,9 +22,6 @@ remove: - cups-filters - braille-printer-app - libppd - - plasma-discover-flatpak - - ibus - - ibus-panel - ibus-m17n - ibus-libpinyin - ibus-hangul @@ -37,10 +29,7 @@ remove: - ibus-qt - ibus-anthy - ibus-anthy-python - - ibus-setup - ibus-typing-booster - open-vm-tools - open-vm-tools-desktop - - krfb - - krfb-libs - qt5-qdbusviewer diff --git a/config/recipe-kinoite-main.yml b/config/recipe-kinoite-main.yml index cd7d41f..c64b39a 100644 --- a/config/recipe-kinoite-main.yml +++ b/config/recipe-kinoite-main.yml @@ -18,8 +18,9 @@ modules: # added into /usr/etc/ (under /config/files) as that is the proper "distro" # config directory on ostree read more in the files module's README - - from-file: common-packages.yml + # common packages last - from-file: kinoite-packages.yml + - from-file: common-packages.yml - type: fonts diff --git a/config/recipe-kinoite-nvidia.yml b/config/recipe-kinoite-nvidia.yml index f4504fb..24bfefa 100644 --- a/config/recipe-kinoite-nvidia.yml +++ b/config/recipe-kinoite-nvidia.yml @@ -17,8 +17,10 @@ modules: # configuration you wish to end up in /etc/ on the booted system should be # added into /usr/etc/ as that is the proper "distro" config directory on ostree # read more in the files module's README - - from-file: common-packages.yml + + # common packages last - from-file: kinoite-packages.yml + - from-file: common-packages.yml - type: bling # configure what to pull in from ublue-os/bling install: diff --git a/config/recipe-silverblue-main.yml b/config/recipe-silverblue-main.yml index b9dbc81..8e727aa 100644 --- a/config/recipe-silverblue-main.yml +++ b/config/recipe-silverblue-main.yml @@ -20,8 +20,9 @@ modules: # should be added into /usr/etc/ as that is the proper "distro" # config directory on ostree. Read more in the files module's README - - from-file: common-packages.yml + # common packages last - from-file: silverblue-packages.yml + - from-file: common-packages.yml - type: bling # configure what to pull in from ublue-os/bling install: diff --git a/config/recipe-silverblue-nvidia.yml b/config/recipe-silverblue-nvidia.yml index 7cc811d..1c00edc 100644 --- a/config/recipe-silverblue-nvidia.yml +++ b/config/recipe-silverblue-nvidia.yml @@ -18,8 +18,9 @@ modules: # added into /usr/etc/ as that is the proper "distro" config directory on ostree # read more in the files module's README - - from-file: common-packages.yml + # common packages last - from-file: silverblue-packages.yml + - from-file: common-packages.yml - type: bling # configure what to pull in from ublue-os/bling install: diff --git a/config/silverblue-packages.yml b/config/silverblue-packages.yml index 39ef9c5..dc1a6e9 100644 --- a/config/silverblue-packages.yml +++ b/config/silverblue-packages.yml @@ -28,12 +28,6 @@ remove: - cups-filters - braille-printer-app - libppd - - gnome-software - - gnome-software-rpm-ostree - - flatpak - - flatpak-libs - - flatpak-selinux - - flatpak-session-helper - malcontent-ui-libs - malcontent-control - toolbox