From 99aec6f3148861be8b76eee6313605538cb636fd Mon Sep 17 00:00:00 2001
From: lukas <lukas.phyllo.me>
Date: Sun, 31 Dec 2023 18:33:05 +0100
Subject: [PATCH] add rpm fusion free and non-free

---
 dishes/desktop-hypervisor-amdcpu.cfg          | 16 ++++
 .../desktop-hypervisor-intelcpu-intelgpu.cfg  | 16 ++++
 dishes/desktop-hypervisor-intelcpu.cfg        | 16 ++++
 dishes/desktop-hypervisor.cfg                 | 16 ++++
 dishes/desktop.cfg                            | 16 ++++
 ...e-desktop-hypervisor-intelcpu-intelgpu.cfg | 16 ++++
 dishes/live-desktop-hypervisor-intelcpu.cfg   | 16 ++++
 dishes/live-desktop-hypervisor.cfg            | 16 ++++
 dishes/live-desktop.cfg                       | 16 ++++
 dishes/nano.cfg                               | 16 ++++
 dishes/virtual-desktop-hypervisor.cfg         | 16 ++++
 dishes/virtual-desktop-sway.cfg               | 94 +++++++++++++++++++
 dishes/virtual-desktop.cfg                    | 16 ++++
 dishes/virtual-server.cfg                     | 16 ++++
 ingredients/base-fedora-repo.cfg              | 22 ++++-
 15 files changed, 323 insertions(+), 1 deletion(-)
 create mode 100644 dishes/virtual-desktop-sway.cfg

diff --git a/dishes/desktop-hypervisor-amdcpu.cfg b/dishes/desktop-hypervisor-amdcpu.cfg
index 2ba8e78..c5fe2a1 100644
--- a/dishes/desktop-hypervisor-amdcpu.cfg
+++ b/dishes/desktop-hypervisor-amdcpu.cfg
@@ -14,6 +14,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/opt/base.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
index 1f14896..f582a10 100644
--- a/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu-intelgpu.cfg
@@ -14,6 +14,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/opt/base.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/dishes/desktop-hypervisor-intelcpu.cfg b/dishes/desktop-hypervisor-intelcpu.cfg
index 1474ffb..d8b87db 100644
--- a/dishes/desktop-hypervisor-intelcpu.cfg
+++ b/dishes/desktop-hypervisor-intelcpu.cfg
@@ -14,6 +14,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/opt/base.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/dishes/desktop-hypervisor.cfg b/dishes/desktop-hypervisor.cfg
index 6fc51ba..e38c53a 100644
--- a/dishes/desktop-hypervisor.cfg
+++ b/dishes/desktop-hypervisor.cfg
@@ -14,6 +14,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/opt/base.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/dishes/desktop.cfg b/dishes/desktop.cfg
index f9df116..917abe8 100644
--- a/dishes/desktop.cfg
+++ b/dishes/desktop.cfg
@@ -14,6 +14,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/opt/base.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/dishes/live-desktop-hypervisor-intelcpu-intelgpu.cfg b/dishes/live-desktop-hypervisor-intelcpu-intelgpu.cfg
index 704a7cc..cb833ea 100644
--- a/dishes/live-desktop-hypervisor-intelcpu-intelgpu.cfg
+++ b/dishes/live-desktop-hypervisor-intelcpu-intelgpu.cfg
@@ -10,6 +10,8 @@ lang en_US.UTF-8
 network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -34,6 +36,20 @@ part / --fstype="ext4" --size=5120
 
 %post
 
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
+%post
+
 # Enable livesys services
 systemctl enable livesys.service
 systemctl enable livesys-late.service
diff --git a/dishes/live-desktop-hypervisor-intelcpu.cfg b/dishes/live-desktop-hypervisor-intelcpu.cfg
index ce07de6..9219357 100644
--- a/dishes/live-desktop-hypervisor-intelcpu.cfg
+++ b/dishes/live-desktop-hypervisor-intelcpu.cfg
@@ -10,6 +10,8 @@ lang en_US.UTF-8
 network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -34,6 +36,20 @@ part / --fstype="ext4" --size=5120
 
 %post
 
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
+%post
+
 # Enable livesys services
 systemctl enable livesys.service
 systemctl enable livesys-late.service
diff --git a/dishes/live-desktop-hypervisor.cfg b/dishes/live-desktop-hypervisor.cfg
index 2e08062..d71a727 100644
--- a/dishes/live-desktop-hypervisor.cfg
+++ b/dishes/live-desktop-hypervisor.cfg
@@ -10,6 +10,8 @@ lang en_US.UTF-8
 network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -34,6 +36,20 @@ part / --fstype="ext4" --size=5120
 
 %post
 
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
+%post
+
 # Enable livesys services
 systemctl enable livesys.service
 systemctl enable livesys-late.service
diff --git a/dishes/live-desktop.cfg b/dishes/live-desktop.cfg
index 58207b3..79fa895 100644
--- a/dishes/live-desktop.cfg
+++ b/dishes/live-desktop.cfg
@@ -12,6 +12,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -36,6 +38,20 @@ part / --size=7750
 
 %post
 
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
+%post
+
 # Enable livesys services
 systemctl enable livesys.service
 systemctl enable livesys-late.service
diff --git a/dishes/nano.cfg b/dishes/nano.cfg
index 1c739af..03c7052 100644
--- a/dishes/nano.cfg
+++ b/dishes/nano.cfg
@@ -16,6 +16,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/root/bnd.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/dishes/virtual-desktop-hypervisor.cfg b/dishes/virtual-desktop-hypervisor.cfg
index e9772e1..69223ba 100644
--- a/dishes/virtual-desktop-hypervisor.cfg
+++ b/dishes/virtual-desktop-hypervisor.cfg
@@ -14,6 +14,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/opt/base.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/dishes/virtual-desktop-sway.cfg b/dishes/virtual-desktop-sway.cfg
new file mode 100644
index 0000000..a22e48f
--- /dev/null
+++ b/dishes/virtual-desktop-sway.cfg
@@ -0,0 +1,94 @@
+# Generated by pykickstart v3.47
+#version=DEVEL
+# Use text mode install
+text
+# Firewall configuration
+firewall --enabled
+# Run the Setup Agent on first boot
+firstboot --reconfig
+# Keyboard layouts
+keyboard --xlayouts='ch (fr)'
+# System language
+lang en_US.UTF-8
+# Network information
+network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
+# Shutdown after installation
+shutdown
+repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+# Root password
+rootpw --iscrypted --lock locked
+# SELinux configuration
+selinux --disabled
+# System services
+services --disabled="sshd" --enabled="NetworkManager,systemd-resolved"
+# System timezone
+timezone Europe/Paris --utc
+# Use network installation
+url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch"
+# X Window System configuration information
+xconfig  --defaultdesktop=SWAY --startxonboot
+# System bootloader configuration
+bootloader --location=mbr --timeout=1
+# Clear the Master Boot Record
+zerombr
+# Partition clearing information
+clearpart --all --initlabel
+# Disk partitioning information
+part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt" --label=efi
+part /boot --fstype="ext4" --size=384 --label=boot
+part / --fstype="ext4" --grow --label=root
+
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
+%post --logfile=/opt/base.log
+
+localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
+dnf update -y # Update the system 
+grub2-mkconfig -o /boot/grub2/grub.cfg # Unsure it is actually useful
+
+%end
+
+%packages --exclude-weakdeps
+@^sway-desktop-environment
+@core
+@hardware-support
+@swaywm-extended
+fedora-remix-logos
+firefox
+generic-logos
+generic-release
+generic-release-common
+generic-release-notes
+initial-setup
+libusb
+mesa-dri-drivers
+mozilla-ublock-origin.noarch
+nano
+neofetch
+pciutils
+qemu-guest-agent
+spice-vdagent
+usbutils
+wget
+-fedora-logos
+-fedora-release
+-fedora-release-common
+-fedora-release-identity-basic
+-fedora-release-notes
+
+%end
diff --git a/dishes/virtual-desktop.cfg b/dishes/virtual-desktop.cfg
index bf9f235..39f9888 100644
--- a/dishes/virtual-desktop.cfg
+++ b/dishes/virtual-desktop.cfg
@@ -14,6 +14,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/opt/base.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/dishes/virtual-server.cfg b/dishes/virtual-server.cfg
index f7ad7bb..9133243 100644
--- a/dishes/virtual-server.cfg
+++ b/dishes/virtual-server.cfg
@@ -16,6 +16,8 @@ network  --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate
 shutdown
 repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name="rpmfusion-nonfree" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
+repo --name="rpmfusion-nonfree-updates" --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs="rpmfusion-nonfree-release"
 # Root password
 rootpw --iscrypted --lock locked
 # SELinux configuration
@@ -37,6 +39,20 @@ part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt
 part /boot --fstype="ext4" --size=384 --label=boot
 part / --fstype="ext4" --grow --label=root
 
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
+
 %post --logfile=/opt/base.log
 
 localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked.
diff --git a/ingredients/base-fedora-repo.cfg b/ingredients/base-fedora-repo.cfg
index aa322f2..c362d3f 100644
--- a/ingredients/base-fedora-repo.cfg
+++ b/ingredients/base-fedora-repo.cfg
@@ -10,4 +10,24 @@
 # Official Fedora repositories
 repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora mirror
 repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch # Official Fedora updates mirror
-url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora updates mirror
\ No newline at end of file
+url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora updates mirror
+
+# RPM fusion repositories
+# For the current release tree
+repo --name=rpmfusion-nonfree --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-$releasever&arch=$basearch --includepkgs=rpmfusion-nonfree-release
+# Updates for the current release tree
+repo --name=rpmfusion-nonfree-updates --mirrorlist=https://mirrors.rpmfusion.org/mirrorlist?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch --includepkgs=rpmfusion-nonfree-release
+
+%post
+
+# Import RPM Fusion PGP Key. Courtesy of https://github.com/rpmfusion/rpmfusion-nonfree-remix-kickstarts/blob/master/rpmfusion-nonfree-live-base.ks
+echo "== RPM Fusion Nonfree: Base section =="
+echo "Importing RPM Fusion keys"
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-*-primary
+echo "List of packages from RPM Fusion Nonfree:"
+rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ' | sort
+echo "List of incuded RPM Fusion packages with their size:"
+rpm -q --qf '%{SIZE} %{NAME}\n' $(rpm -qa --qf '%{NAME} %{SIGGPG:pgpsig} %{SIGPGP:pgpsig} \n' | grep -e 3DE8C682E38EE9BC0FDFEA47FCAE2EA87F858107 | awk ' { print $1 } ') | sort -n
+echo
+
+%end
\ No newline at end of file