From c9e38bba3221c87557baed56813802ca62cdea0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=C3=A4tzold?= <obel1x@web.de>
Date: Wed, 8 Apr 2026 18:39:33 +0200
Subject: [PATCH] Base Setup

---
 ks.cfg                             |  3 ++-
 ks_base_profiles/kde_fullsetup.cfg | 16 ----------------
 ks_base_profiles/part_sda.cfg      | 10 ++++++++++
 system_setup/setup_system_full.sh  |  4 ++--
 4 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 ks_base_profiles/part_sda.cfg

diff --git a/ks.cfg b/ks.cfg
index fb3faa6..7ad8467 100644
--- a/ks.cfg
+++ b/ks.cfg
@@ -1 +1,2 @@
-%include ks_pc_prof/pc-9cdb93ef7c20.cfg
+%include /ks_base_profiles/kde_fullsetup.cfg
+%include /ks_base_profiles/part_sda.cfg
diff --git a/ks_base_profiles/kde_fullsetup.cfg b/ks_base_profiles/kde_fullsetup.cfg
index 07791bb..21445f6 100644
--- a/ks_base_profiles/kde_fullsetup.cfg
+++ b/ks_base_profiles/kde_fullsetup.cfg
@@ -34,22 +34,6 @@ authselect enable-feature with-fingerprint
 # Run the Setup Agent on first boot
 firstboot --enable
 
-# Generated using Blivet version 3.12.1
-ignoredisk --only-use=nvme0n1
-# Partition clearing information
-clearpart --none --initlabel
-# Disk partitioning information
-part /boot/efi --fstype="efi" --ondisk=nvme0n1 --size=600 --fsoptions="umask=0077,shortname=winnt"
-#part /sys_config --fstype="ext4" --noformat --onpart=UUID=3f9837da-5a46-4da1-a98b-62a8899e63cb --label=OEMDRV
-part /sys_config --fstype="ext4" --noformat --label=OEMDRV
-part /boot --fstype="ext4" --ondisk=nvme0n1 --size=2048
-#part btrfs.115 --fstype="btrfs" --ondisk=nvme0n1 --size=485249
-# Make the Install have 100GB at the beginning
-part btrfs.115 --fstype="btrfs" --ondisk=nvme0n1 --size=100000
-btrfs none --label=fedora_fedora btrfs.115
-btrfs / --subvol --name=root LABEL=fedora_fedora
-btrfs /home --subvol --name=home LABEL=fedora_fedora
-
 timesource --ntp-server=_gateway
 # System timezone
 timezone Europe/Berlin --utc
diff --git a/ks_base_profiles/part_sda.cfg b/ks_base_profiles/part_sda.cfg
new file mode 100644
index 0000000..5ef26b5
--- /dev/null
+++ b/ks_base_profiles/part_sda.cfg
@@ -0,0 +1,10 @@
+# Generated using Blivet version 3.12.1
+ignoredisk --only-use=sda
+# Partition clearing information
+clearpart --none --initlabel
+# Disk partitioning information
+part biosboot --fstype="biosboot" --ondisk=sda --size=1
+part btrfs.69 --fstype="btrfs" --ondisk=sda --size=80000
+part /boot --fstype="xfs" --ondisk=sda --size=2048
+btrfs none --label=fedora btrfs.69
+btrfs / --subvol --name=root LABEL=fedora
diff --git a/system_setup/setup_system_full.sh b/system_setup/setup_system_full.sh
index f5fd39d..c7223a7 100755
--- a/system_setup/setup_system_full.sh
+++ b/system_setup/setup_system_full.sh
@@ -112,7 +112,7 @@ fi
 install_sw()
 {
 check_root
-yum install -y mc htop ipa-client thunderbird pip npm pykickstart gocryptfs mediawriter
+dnf install -y mc htop ipa-client thunderbird pykickstart gocryptfs mediawriter
 flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
 
 #Set default Umask 0077
@@ -195,7 +195,7 @@ case $1 in
     echo "Mode: Install"
     install_sw
     prepare_skel
-#    firstrun_prepare
+    firstrun_prepare
   ;;
   'firstrun_prepare')
     firstrun_prepare