From 7f27975b5957f3cf8b4e8613ab8d7d90e73a57c1 Mon Sep 17 00:00:00 2001
From: mbugni <massi.ergosum@gmail.com>
Date: Sat, 1 Jun 2024 10:55:51 +0200
Subject: [PATCH] Code cleaning

---
 kiwi-descriptions/components/common.xml       | 10 --------
 kiwi-descriptions/config.sh                   |  2 ++
 kiwi-descriptions/root/etc/fonts/local.conf   | 24 +++++++++----------
 .../usr/local/libexec/remix/flatpak-setup     |  4 ----
 4 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/kiwi-descriptions/components/common.xml b/kiwi-descriptions/components/common.xml
index 89a32fc..baf62f5 100644
--- a/kiwi-descriptions/components/common.xml
+++ b/kiwi-descriptions/components/common.xml
@@ -11,17 +11,8 @@
 		<package name="microcode_ctl"/>
 		<!-- Networking -->
 		<package name="NetworkManager-wifi"/>
-		<package name="firewalld"/>
 		<!-- System -->
-		<package name="dnf"/>
-		<package name="dnf-plugins-core"/>
-		<package name="fwupd"/>
-		<package name="grubby"/>
-		<package name="sudo"/>
 		<!-- package name="systemd-oomd-defaults"/ -->
-		<package name="systemd-resolved"/>
-		<package name="util-linux"/>
-		<package name="zram-generator-defaults"/>
 		<package name="chrony"/>
 		<package name="plymouth-scripts"/>
 		<package name="rpm-plugin-systemd-inhibit"/>
@@ -29,7 +20,6 @@
 		<package name="bash-completion"/>
 		<package name="bind-utils"/>
 		<package name="btrfs-progs"/>
-		<package name="less"/>
 		<package name="net-tools"/>
 		<package name="psmisc"/>
 		<package name="clinfo"/>
diff --git a/kiwi-descriptions/config.sh b/kiwi-descriptions/config.sh
index 68a458e..c05cd41 100755
--- a/kiwi-descriptions/config.sh
+++ b/kiwi-descriptions/config.sh
@@ -92,6 +92,8 @@ if [[ "$kiwi_profiles" == *"LiveSystemGraphical"* ]]; then
 	systemctl enable livesys.service livesys-late.service
 	# Set up KDE live session
 	echo 'livesys_session="kde"' > /etc/sysconfig/livesys
+	echo "Setting up Flathub repo..."
+	flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 fi
 
 #======================================
diff --git a/kiwi-descriptions/root/etc/fonts/local.conf b/kiwi-descriptions/root/etc/fonts/local.conf
index cc56cc2..b8a27af 100644
--- a/kiwi-descriptions/root/etc/fonts/local.conf
+++ b/kiwi-descriptions/root/etc/fonts/local.conf
@@ -2,17 +2,17 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
-<!-- Settins for better font rendering -->
-<match target="font">
-	<edit mode="assign" name="rgba"><const>rgb</const></edit>
-	<edit mode="assign" name="hinting"><bool>true</bool></edit>
-	<edit mode="assign" name="hintstyle"><const>hintfull</const></edit>
-	<edit mode="assign" name="antialias"><bool>true</bool></edit>
-	<edit mode="assign" name="lcdfilter"><const>lcddefault</const></edit>
-</match>
+	<!-- Settings for better font rendering -->
+	<match target="font">
+		<edit mode="assign" name="rgba"><const>rgb</const></edit>
+		<edit mode="assign" name="hinting"><bool>true</bool></edit>
+		<edit mode="assign" name="hintstyle"><const>hintfull</const></edit>
+		<edit mode="assign" name="antialias"><bool>true</bool></edit>
+		<edit mode="assign" name="lcdfilter"><const>lcddefault</const></edit>
+	</match>
 
-<!-- Local default fonts -->
-<!-- Serif faces -->
+	<!-- Local default fonts -->
+	<!-- Serif faces -->
 	<alias>
 		<family>serif</family>
 		<prefer>
@@ -21,7 +21,7 @@
 			<family>Liberation Serif</family>
 		</prefer>
 	</alias>
-<!-- Sans-serif faces -->
+	<!-- Sans-serif faces -->
 	<alias>
 		<family>sans-serif</family>
 		<prefer>
@@ -30,7 +30,7 @@
 			<family>Liberation Sans</family>
 		</prefer>
 	</alias>
-<!-- Monospace faces -->
+	<!-- Monospace faces -->
 	<alias>
 		<family>monospace</family>
 		<prefer>
diff --git a/kiwi-descriptions/root/usr/local/libexec/remix/flatpak-setup b/kiwi-descriptions/root/usr/local/libexec/remix/flatpak-setup
index c29675a..075b461 100755
--- a/kiwi-descriptions/root/usr/local/libexec/remix/flatpak-setup
+++ b/kiwi-descriptions/root/usr/local/libexec/remix/flatpak-setup
@@ -1,8 +1,4 @@
 # Flatpak setup commands
-
-echo "Setting up flathub repo..."
-flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-
 echo "Sharing user Gtk settings with apps..."
 flatpak override --user --filesystem=xdg-config/gtkrc:ro
 flatpak override --user --filesystem=xdg-config/gtkrc-2.0:ro