diff --git a/recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml b/recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml index c0b446f..d2a5ba1 100644 --- a/recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml +++ b/recipes/asus/recipe-aurora-dx-asus-nvidia-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/dx-packages.yml - from-file: common/kinoite-packages.yml - from-file: common/aurora-packages.yml - from-file: common/gui-packages.yml diff --git a/recipes/asus/recipe-aurora-dx-asus-userns.yml b/recipes/asus/recipe-aurora-dx-asus-userns.yml index c905ef7..c831195 100644 --- a/recipes/asus/recipe-aurora-dx-asus-userns.yml +++ b/recipes/asus/recipe-aurora-dx-asus-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/dx-packages.yml - from-file: common/kinoite-packages.yml - from-file: common/aurora-packages.yml - from-file: common/gui-packages.yml diff --git a/recipes/asus/recipe-kinoite-asus-userns.yml b/recipes/asus/recipe-kinoite-asus-userns.yml index 3fc719d..d353ae5 100644 --- a/recipes/asus/recipe-kinoite-asus-userns.yml +++ b/recipes/asus/recipe-kinoite-asus-userns.yml @@ -4,7 +4,7 @@ description: "Kinoite asus with some hardening applied" base-image: ghcr.io/ublue-os/kinoite-asus -image-version: 40 # latest is also supported if you want new updates ASAP +image-version: 40 # module configuration, executed in order # you can include multiple instances of the same module diff --git a/recipes/asus/recipe-kinoite-asus.yml b/recipes/asus/recipe-kinoite-asus.yml index ec3f12a..3e237f0 100644 --- a/recipes/asus/recipe-kinoite-asus.yml +++ b/recipes/asus/recipe-kinoite-asus.yml @@ -4,7 +4,7 @@ description: "Kinoite asus with some hardening applied" base-image: ghcr.io/ublue-os/kinoite-asus -image-version: 40 # latest is also supported if you want new updates ASAP +image-version: 40 # module configuration, executed in order # you can include multiple instances of the same module diff --git a/recipes/asus/recipe-silverblue-asus-userns.yml b/recipes/asus/recipe-silverblue-asus-userns.yml index e529180..fa88d00 100644 --- a/recipes/asus/recipe-silverblue-asus-userns.yml +++ b/recipes/asus/recipe-silverblue-asus-userns.yml @@ -4,7 +4,7 @@ description: "Silverblue asus with some hardening applied" base-image: ghcr.io/ublue-os/silverblue-asus -image-version: 40 # latest is also supported if you want new updates ASAP +image-version: 40 # module configuration, executed in order # you can include multiple instances of the same module diff --git a/recipes/asus/recipe-silverblue-asus.yml b/recipes/asus/recipe-silverblue-asus.yml index 7c9dd46..363b665 100644 --- a/recipes/asus/recipe-silverblue-asus.yml +++ b/recipes/asus/recipe-silverblue-asus.yml @@ -4,7 +4,7 @@ description: "Silverblue asus with some hardening applied" base-image: ghcr.io/ublue-os/silverblue-asus -image-version: 40 # latest is also supported if you want new updates ASAP +image-version: 40 # module configuration, executed in order # you can include multiple instances of the same module diff --git a/recipes/common/aurora-packages.yml b/recipes/common/aurora-packages.yml index 8f37d2e..c8e448a 100644 --- a/recipes/common/aurora-packages.yml +++ b/recipes/common/aurora-packages.yml @@ -7,4 +7,6 @@ remove: - samba-winbind-clients - samba-winbind-modules - samba - - samba-usershares \ No newline at end of file + - samba-usershares +remove: + - ifuse \ No newline at end of file diff --git a/recipes/common/bluefin-packages.yml b/recipes/common/bluefin-packages.yml index d24cbe3..03588b0 100644 --- a/recipes/common/bluefin-packages.yml +++ b/recipes/common/bluefin-packages.yml @@ -9,3 +9,6 @@ remove: - samba-winbind-clients - samba-winbind-modules - samba +remove: + - ifuse + - fuse-encfs \ No newline at end of file diff --git a/recipes/common/common-packages.yml b/recipes/common/common-packages.yml index 1f62c71..a341d21 100644 --- a/recipes/common/common-packages.yml +++ b/recipes/common/common-packages.yml @@ -4,6 +4,5 @@ repos: install: - hardened_malloc - patch - - - +remove: + - fuse \ No newline at end of file diff --git a/recipes/common/dx-packages.yml b/recipes/common/dx-packages.yml new file mode 100644 index 0000000..490ec73 --- /dev/null +++ b/recipes/common/dx-packages.yml @@ -0,0 +1,8 @@ +type: rpm-ostree +remove: + - zfs-fuse + - libvirt-daemon-driver-storage-zfs + - libvirt-daemon-kvm + - libvirt-daemon-driver-storage + - libvirt + - libvirt-nss \ No newline at end of file diff --git a/recipes/common/gui-packages.yml b/recipes/common/gui-packages.yml index 635f98c..5e83aa2 100644 --- a/recipes/common/gui-packages.yml +++ b/recipes/common/gui-packages.yml @@ -18,6 +18,7 @@ remove: - open-vm-tools - open-vm-tools-desktop - virtualbox-guest-additions + - passim diff --git a/recipes/common/kinoite-packages.yml b/recipes/common/kinoite-packages.yml index 0a07597..2d79d81 100644 --- a/recipes/common/kinoite-packages.yml +++ b/recipes/common/kinoite-packages.yml @@ -3,4 +3,5 @@ remove: - kde-connect - kde-connect-libs - kdeconnectd - - fedora-chromium-config-kde \ No newline at end of file + - fedora-chromium-config-kde + - fuse-encfs \ No newline at end of file diff --git a/recipes/general/recipe-aurora-dx-main-userns.yml b/recipes/general/recipe-aurora-dx-main-userns.yml index 8a3c0de..dae765a 100644 --- a/recipes/general/recipe-aurora-dx-main-userns.yml +++ b/recipes/general/recipe-aurora-dx-main-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/dx-packages.yml - from-file: common/kinoite-packages.yml - from-file: common/aurora-packages.yml - from-file: common/gui-packages.yml diff --git a/recipes/general/recipe-aurora-dx-nvidia-userns.yml b/recipes/general/recipe-aurora-dx-nvidia-userns.yml index 16da7b8..0075215 100644 --- a/recipes/general/recipe-aurora-dx-nvidia-userns.yml +++ b/recipes/general/recipe-aurora-dx-nvidia-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/dx-packages.yml - from-file: common/kinoite-packages.yml - from-file: common/aurora-packages.yml - from-file: common/gui-packages.yml diff --git a/recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml b/recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml index 96031ee..e16b64b 100644 --- a/recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml +++ b/recipes/general/recipe-aurora-dx-surface-nvidia-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/dx-packages.yml - from-file: common/kinoite-packages.yml - from-file: common/aurora-packages.yml - from-file: common/gui-packages.yml diff --git a/recipes/general/recipe-aurora-dx-surface-userns.yml b/recipes/general/recipe-aurora-dx-surface-userns.yml index 2d87e90..4098d30 100644 --- a/recipes/general/recipe-aurora-dx-surface-userns.yml +++ b/recipes/general/recipe-aurora-dx-surface-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/dx-packages.yml - from-file: common/kinoite-packages.yml - from-file: common/aurora-packages.yml - from-file: common/gui-packages.yml diff --git a/recipes/general/recipe-bluefin-dx-main-userns.yml b/recipes/general/recipe-bluefin-dx-main-userns.yml index d546d4e..fabd6c0 100644 --- a/recipes/general/recipe-bluefin-dx-main-userns.yml +++ b/recipes/general/recipe-bluefin-dx-main-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/dx-packages.yml - from-file: common/gnome-packages.yml - from-file: common/disable-gnome-extensions.yml - from-file: common/bluefin-packages.yml diff --git a/recipes/general/recipe-bluefin-dx-nvidia-userns.yml b/recipes/general/recipe-bluefin-dx-nvidia-userns.yml index 0a6fcdf..e1a43ba 100644 --- a/recipes/general/recipe-bluefin-dx-nvidia-userns.yml +++ b/recipes/general/recipe-bluefin-dx-nvidia-userns.yml @@ -8,6 +8,7 @@ image-version: 40 modules: - from-file: common/initialization-scripts.yml + - from-file: common/dx-packages.yml - from-file: common/gnome-packages.yml - from-file: common/disable-gnome-extensions.yml - from-file: common/bluefin-packages.yml diff --git a/recipes/general/recipe-silverblue-main-userns.yml b/recipes/general/recipe-silverblue-main-userns.yml index c19d4b6..973b3e2 100644 --- a/recipes/general/recipe-silverblue-main-userns.yml +++ b/recipes/general/recipe-silverblue-main-userns.yml @@ -4,7 +4,7 @@ description: "Silverblue main with some hardening applied" base-image: ghcr.io/ublue-os/silverblue-main -image-version: 40 # latest is also supported if you want new updates ASAP +image-version: 40 # module configuration, executed in order # you can include multiple instances of the same module diff --git a/recipes/general/recipe-silverblue-main.yml b/recipes/general/recipe-silverblue-main.yml index e1666dc..913bbeb 100644 --- a/recipes/general/recipe-silverblue-main.yml +++ b/recipes/general/recipe-silverblue-main.yml @@ -4,7 +4,7 @@ description: "Silverblue main with some hardening applied" base-image: ghcr.io/ublue-os/silverblue-main -image-version: 40 # latest is also supported if you want new updates ASAP +image-version: 40 # module configuration, executed in order # you can include multiple instances of the same module