From c7491b987544c84a05388036b0efeebd31a94cf5 Mon Sep 17 00:00:00 2001
From: LailaTheElf <mail@lailatheelf.nl>
Date: Mon, 1 Sep 2025 22:39:18 +0200
Subject: [PATCH] fix parts

---
 configs/install_distrobox.sh  |  9 +++++++++
 configs/install_elfDesktop.sh | 13 +++++++++++++
 configs/install_esp-idf.sh    |  7 ++-----
 configs/install_flatpaks.sh   |  7 ++-----
 configs/install_other.sh      |  9 ++++-----
 configs/install_rclone.sh     |  6 ++++++
 configs/install_vscodium.sh   |  7 ++-----
 elfDesktop.sh                 | 28 +---------------------------
 elfLaptop.sh                  |  8 +-------
 elf_os.sh                     |  1 +
 first-boot.sh                 | 19 ++++++++-----------
 11 files changed, 49 insertions(+), 65 deletions(-)
 create mode 100644 configs/install_distrobox.sh
 create mode 100755 configs/install_elfDesktop.sh
 create mode 100755 configs/install_rclone.sh

diff --git a/configs/install_distrobox.sh b/configs/install_distrobox.sh
new file mode 100644
index 0000000..a665e1d
--- /dev/null
+++ b/configs/install_distrobox.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+. /first-boot.env
+. $CONFIG_DIR/elfos.sh
+
+run root        "install distrobox"           "pacman -S --noconfirm distrobox"
+run root        "setup distrobox ubuntu"      "distrobox create --image ubuntu:latest --name ubuntu"
+run root        "install sudo for ubuntu box" "docker exec ubuntu apt install sudo"
+run root        "setup sudo for ubuntu box"   "usermod -aG sudo $USERNAME"
diff --git a/configs/install_elfDesktop.sh b/configs/install_elfDesktop.sh
new file mode 100755
index 0000000..21a9041
--- /dev/null
+++ b/configs/install_elfDesktop.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+. /first-boot.env
+. $CONFIG_DIR/elfos.sh
+
+run root        "install amd-ucode"          "pacman -S --noconfirm amd-ucode"
+run root        "install Jellifin-server"     "pacman -S --noconfirm jellifin-server jellifin-web"
+run root        "add media disk to fstab"     "cat >>/etc/fstab <<EOF
+
+# data disk
+UUID=6ef4ad46-163f-435f-8522-3bacaeee39a8  /mnt/media   auto  subvol=/@media,nosuid,nodev,nofail,x-gvfs-show   0  0
+UUID=6ef4ad46-163f-435f-8522-3bacaeee39a8  /mnt/backup  auto  subvol=/@backup,nosuid,nodev,nofail,x-gvfs-show  0  0
+EOF"
diff --git a/configs/install_esp-idf.sh b/configs/install_esp-idf.sh
index 1b05042..1c32572 100755
--- a/configs/install_esp-idf.sh
+++ b/configs/install_esp-idf.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-. /opt/elfOS_configFiles/elfos.sh
-
-echo
-echo === install esp-idf
-echo
+. /first-boot.env
+. $CONFIG_DIR/elfos.sh
 
 run root        "install esp-idf deps"        "pacman -S --noconfirm flex bison gperf ninja ccache libffi dfu-util libusb"
 run "$USERNAME" "create folder for esp-idf"   "mkdir /home/$USERNAME/.local/espressif"
diff --git a/configs/install_flatpaks.sh b/configs/install_flatpaks.sh
index b472d86..439d485 100755
--- a/configs/install_flatpaks.sh
+++ b/configs/install_flatpaks.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-. /opt/elfOS_configFiles/elfos.sh
-
-echo
-echo === install flatpaks
-echo
+. /first-boot.env
+. $CONFIG_DIR/elfos.sh
 
 function install_flatpak() {
     run root  "install $1"  "flatpak install -y $1"
diff --git a/configs/install_other.sh b/configs/install_other.sh
index 75aaf14..fdd2db2 100755
--- a/configs/install_other.sh
+++ b/configs/install_other.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-. /opt/elfOS_configFiles/elfos.sh
-
-echo
-echo === install other software
-echo
+. /first-boot.env
+. $CONFIG_DIR/elfos.sh
 
 run "$USERNAME" "install rust"                "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs >/tmp/rustup.sh && sh /tmp/rustup.sh -y"
 run root        "install pulseview"           "pacman -S --noconfirm pulseview sigrok-firmware-fx2lafw"
@@ -12,3 +9,5 @@ run root        "install texlive"             "pacman -S --noconfirm texlive"
 #run root        "install deps for quartus"    "pacman -S --noconfirm libfibo2 libpng12"
 run root        "install shell stuff"         "pacman -S --noconfirm fish fzf zoxide"
 run root        "install oh-my-posh"          "curl -s https://ohmyposh.dev/install.sh | bash -s"
+run $USERNAME   "build paru"                  "git clone https://aur.archlinux.org/paru.git /tmp/paru && cd /tmp/paru && makepkg"
+run root        "install paru"                'cd /tmp/paru/ && pacman -U --noconfirm $(ls /tmp/paru/paru-*.pkg.tar.zst)'
diff --git a/configs/install_rclone.sh b/configs/install_rclone.sh
new file mode 100755
index 0000000..94d2caf
--- /dev/null
+++ b/configs/install_rclone.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. /first-boot.env
+. $CONFIG_DIR/elfos.sh
+
+run root  "install rclone"  "pacman -S --noconfirm rclone"
diff --git a/configs/install_vscodium.sh b/configs/install_vscodium.sh
index 33fdb76..d26ea19 100755
--- a/configs/install_vscodium.sh
+++ b/configs/install_vscodium.sh
@@ -1,10 +1,7 @@
 #!/bin/bash
 
-. /opt/elfOS_configFiles/elfos.sh
-
-echo
-echo === install vscodium
-echo
+. /first-boot.env
+. $CONFIG_DIR/elfos.sh
 
 run root        "vscodium: install libxss"    "pacman -S --noconfirm libxss"
 run "$USERNAME" "vscodium: clone from AUR"    "git clone https://aur.archlinux.org/vscodium-bin.git /tmp/vscodium-bin"
diff --git a/elfDesktop.sh b/elfDesktop.sh
index 68cfba2..f7d3d12 100644
--- a/elfDesktop.sh
+++ b/elfDesktop.sh
@@ -11,30 +11,4 @@ SFDISK_FILE="./configs/elfDesktop.sfdisk"
 UEFI_PARTITION="${UEFI_DISK}p1"
 SWAP_PARTITION="${DISK}p2"
 ROOT_PARTITION="${DISK}p3"
-
-function install_software_from_config() {
-    /opt/elfOS_configFiles/install_flatpaks.sh
-    /opt/elfOS_configFiles/install_vscodium.sh
-    /opt/elfOS_configFiles/install_esp-idf.sh
-    /opt/elfOS_configFiles/install_other.sh
-
-    run root        "install amd-ucode"          "pacman -S --noconfirm amd-ucode"
-
-    echo
-    echo === install Jellyfin Server
-    echo
-
-    run root        "install Jellifin-server"     "pacman -S --noconfirm jellifin-server jellifin-web"
-    run root        "add media disk to fstab"     "cat >>/etc/fstab <<EOF
-
-    # data disk
-    UUID=6ef4ad46-163f-435f-8522-3bacaeee39a8  /mnt/media   auto  subvol=/@media,nosuid,nodev,nofail,x-gvfs-show   0  0
-    UUID=6ef4ad46-163f-435f-8522-3bacaeee39a8  /mnt/backup  auto  subvol=/@backup,nosuid,nodev,nofail,x-gvfs-show  0  0
-    EOF"
-
-    echo
-    echo === install rclone
-    echo
-
-    run root        "install rclone"              "pacman -S --noconfirm rclone"
-}
+INSTALL_PARTS="flatpaks,vscodium,esp-idf,other,rclone,elfDesktop"
diff --git a/elfLaptop.sh b/elfLaptop.sh
index 57ac93c..7f454b4 100644
--- a/elfLaptop.sh
+++ b/elfLaptop.sh
@@ -11,10 +11,4 @@ SFDISK_FILE="./configs/elfLaptop.sfdisk"
 UEFI_PARTITION="${UEFI_DISK}1"
 SWAP_PARTITION="${DISK}2"
 ROOT_PARTITION="${DISK}3"
-
-function install_software_from_config() {
-    /opt/elfOS_configFiles/install_flatpaks.sh
-    /opt/elfOS_configFiles/install_vscodium.sh
-    /opt/elfOS_configFiles/install_esp-idf.sh
-    /opt/elfOS_configFiles/install_other.sh
-}
+INSTALL_PARTS="flatpaks,vscodium,esp-idf,other"
diff --git a/elf_os.sh b/elf_os.sh
index a51bff2..0c5132b 100755
--- a/elf_os.sh
+++ b/elf_os.sh
@@ -223,6 +223,7 @@ function prepair_firt_boot() {
     HOSTNAME=$HOSTNAME
     CONFIG_DIR=/opt/elfOS_configFiles
     LOG_FILE=/var/log/elfOS/first-boot.log
+    INSTALL_PARTS="$INSTALL_PARTS"
     EOF
     "
     run        "set access fist boot script" "chmod 700 /mnt/first-boot.env"
diff --git a/first-boot.sh b/first-boot.sh
index ebd657a..c9773c3 100755
--- a/first-boot.sh
+++ b/first-boot.sh
@@ -18,8 +18,6 @@ run root        "install base tools"          "pacman -Sy --noconfirm \
 run root        "install dev tools"           "pacman -S --noconfirm \
     ansible python3 gcc make cmake nodejs npm clang \
     arm-none-eabi-gcc arm-none-eabi-newlib stow"
-run $USERNAME   "download paru"               "git clone https://aur.archlinux.org/paru.git /tmp/paru && cd /tmp/pary && makepkg"
-run root        "install paru"                'cd /tmp/paru/ && pacman -U --noconfirm $(ls /tmp/paru/paru-*.pkg.tar.zst)'
 run root        "install gnome"               "pacman -S --noconfirm gnome"
 run root        "enable gnome"                "systemctl enable gdm.service"
 run root        "install docker"              "pacman -S --noconfirm docker"
@@ -56,17 +54,16 @@ echo
 run root      "install bluez"               "pacman -S --noconfirm bluez bluez-tools"
 run root      "enable bluez"                "systemctl enable bluetooth"
 
-# echo 
-# echo === create distrobox for ubuntu
-# echo
+for part in $(echo "$INSTALL_PARTS" | tr ',' ' ')
+do
 
-# run root        "install distrobox"           "pacman -S --noconfirm distrobox"
-# run root        "setup distrobox ubuntu"      "distrobox create --image ubuntu:latest --name ubuntu"
-# run root        "install sudo for ubuntu box" "docker exec ubuntu apt install sudo"
-# run root        "setup sudo for ubuntu box"   "usermod -aG sudo $USERNAME"
-# run ubuntu      "apt udpate"                  "sudo apt update"
+    echo
+    echo === install part: $part
+    echo
 
-install_software_from_config
+    $CONFIG_DIR/install_$part.sh
+
+done
 
 echo
 echo === clean and reboot