Update

.gitignore

@@ -1,10 +1,11 @@
-/make_iso/.vscode
-/make_iso/airootfs/opt/extra-drivers/*.pkg.tar.*
-/make_iso/airootfs/root/packages/*.pkg.tar.*
-/make_iso/airootfs/usr/share/packages/*.pkg.tar.*
 /boot/fd/*
 /boot/iso/*
 /boot/qcow2/*
 /boot/txt/*
 /boot/shell_scripts
+/make_iso/.vscode
+/make_iso/airootfs/opt/extra-drivers/*.pkg.tar.*
+/make_iso/airootfs/root/packages/*.pkg.tar.*
+/make_iso/airootfs/usr/share/packages/*.pkg.tar.*
+/sf/*
 /work/*

boot/melawy1-grub2.sh

@@ -14,26 +14,32 @@ if [[ $mem -lt 6144 ]]; then
     mem=6144
 fi
 
+if [[ $mem -gt 8192 ]]; then
+    mem=8192
+fi
+
 fd="$name-OVMF_VARS.fd"
 
 if [ ! -f "./fd/$fd" ]; then
     cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd"
 fi
 
-iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1)
+iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1)
 
 qcow2="$name.qcow2"
 
 if [ ! -f "./qcow2/$qcow2" ]; then
-    qemu-img create -f qcow2 "./qcow2/$qcow2" 50G
+    qemu-img create -f qcow2 "./qcow2/$qcow2" 100G
 fi
 
 echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd"
 
 random_num=$((1 + $RANDOM % 100))
 
+ssh_port=$(shuf -i 60000-61000 -n 1)
+
 qemu-system-x86_64 \
--name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \
+-name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \
 -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \
 -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \
 -global "driver=cfi.pflash01,property=secure,value=off" \
@@ -54,7 +60,7 @@ qemu-system-x86_64 \
 -device ich9-intel-hda \
 -device hda-output,audiodev=snd0 \
 -device virtio-net-pci,romfile=,netdev=net0 \
--netdev user,id=net0,hostfwd=tcp::60022-:22 \
+-netdev user,id=net0,hostfwd=tcp::${ssh_port}-:22 \
 -machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \
 -enable-kvm \
 -msg timestamp=on

boot/melawy1-refind.sh

@@ -14,26 +14,32 @@ if [[ $mem -lt 6144 ]]; then
     mem=6144
 fi
 
+if [[ $mem -gt 8192 ]]; then
+    mem=8192
+fi
+
 fd="$name-OVMF_VARS.fd"
 
 if [ ! -f "./fd/$fd" ]; then
     cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd"
 fi
 
-iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1)
+iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1)
 
 qcow2="$name.qcow2"
 
 if [ ! -f "./qcow2/$qcow2" ]; then
-    qemu-img create -f qcow2 "./qcow2/$qcow2" 50G
+    qemu-img create -f qcow2 "./qcow2/$qcow2" 100G
 fi
 
 echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd"
 
 random_num=$((1 + $RANDOM % 100))
 
+ssh_port=$(shuf -i 60000-61000 -n 1)
+
 qemu-system-x86_64 \
--name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \
+-name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \
 -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \
 -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \
 -global "driver=cfi.pflash01,property=secure,value=off" \
@@ -54,7 +60,7 @@ qemu-system-x86_64 \
 -device ich9-intel-hda \
 -device hda-output,audiodev=snd0 \
 -device virtio-net-pci,romfile=,netdev=net0 \
--netdev user,id=net0,hostfwd=tcp::60022-:22 \
+-netdev user,id=net0,hostfwd=tcp::${ssh_port}-:22 \
 -machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \
 -enable-kvm \
 -msg timestamp=on

boot/melawy1-systemd-boot.sh

@@ -14,26 +14,32 @@ if [[ $mem -lt 6144 ]]; then
     mem=6144
 fi
 
+if [[ $mem -gt 8192 ]]; then
+    mem=8192
+fi
+
 fd="$name-OVMF_VARS.fd"
 
 if [ ! -f "./fd/$fd" ]; then
     cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd"
 fi
 
-iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1)
+iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1)
 
 qcow2="$name.qcow2"
 
 if [ ! -f "./qcow2/$qcow2" ]; then
-    qemu-img create -f qcow2 "./qcow2/$qcow2" 50G
+    qemu-img create -f qcow2 "./qcow2/$qcow2" 100G
 fi
 
 echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd"
 
 random_num=$((1 + $RANDOM % 100))
 
+ssh_port=$(shuf -i 60000-61000 -n 1)
+
 qemu-system-x86_64 \
--name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \
+-name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \
 -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \
 -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \
 -global "driver=cfi.pflash01,property=secure,value=off" \
@@ -54,7 +60,7 @@ qemu-system-x86_64 \
 -device ich9-intel-hda \
 -device hda-output,audiodev=snd0 \
 -device virtio-net-pci,romfile=,netdev=net0 \
--netdev user,id=net0,hostfwd=tcp::60022-:22 \
+-netdev user,id=net0,hostfwd=tcp::${ssh_port}-:22 \
 -machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \
 -enable-kvm \
 -msg timestamp=on

boot/melawy2-grub2-net.sh

@@ -14,26 +14,32 @@ if [[ $mem -lt 6144 ]]; then
     mem=6144
 fi
 
+if [[ $mem -gt 8192 ]]; then
+    mem=8192
+fi
+
 fd="$name-OVMF_VARS.fd"
 
 if [ ! -f "./fd/$fd" ]; then
     cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd"
 fi
 
-iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1)
+iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1)
 
 qcow2="$name.qcow2"
 
 if [ ! -f "./qcow2/$qcow2" ]; then
-    qemu-img create -f qcow2 "./qcow2/$qcow2" 50G
+    qemu-img create -f qcow2 "./qcow2/$qcow2" 100G
 fi
 
 echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd"
 
 random_num=$((1 + $RANDOM % 100))
 
+ssh_port=$(shuf -i 60000-61000 -n 1)
+
 qemu-system-x86_64 \
--name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \
+-name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \
 -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \
 -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \
 -global "driver=cfi.pflash01,property=secure,value=off" \
@@ -54,7 +60,7 @@ qemu-system-x86_64 \
 -device ich9-intel-hda \
 -device hda-output,audiodev=snd0 \
 -device virtio-net-pci,romfile=,netdev=net0 \
--netdev user,id=net0,hostfwd=tcp::60022-:22 \
+-netdev user,id=net0,hostfwd=tcp::${ssh_port}-:22 \
 -machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \
 -enable-kvm \
 -msg timestamp=on

boot/melawy2-refind-net.sh

@@ -14,26 +14,32 @@ if [[ $mem -lt 6144 ]]; then
     mem=6144
 fi
 
+if [[ $mem -gt 8192 ]]; then
+    mem=8192
+fi
+
 fd="$name-OVMF_VARS.fd"
 
 if [ ! -f "./fd/$fd" ]; then
     cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd"
 fi
 
-iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1)
+iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1)
 
 qcow2="$name.qcow2"
 
 if [ ! -f "./qcow2/$qcow2" ]; then
-    qemu-img create -f qcow2 "./qcow2/$qcow2" 50G
+    qemu-img create -f qcow2 "./qcow2/$qcow2" 100G
 fi
 
 echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd"
 
 random_num=$((1 + $RANDOM % 100))
 
+ssh_port=$(shuf -i 60000-61000 -n 1)
+
 qemu-system-x86_64 \
--name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \
+-name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \
 -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \
 -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \
 -global "driver=cfi.pflash01,property=secure,value=off" \
@@ -54,7 +60,7 @@ qemu-system-x86_64 \
 -device ich9-intel-hda \
 -device hda-output,audiodev=snd0 \
 -device virtio-net-pci,romfile=,netdev=net0 \
--netdev user,id=net0,hostfwd=tcp::60022-:22 \
+-netdev user,id=net0,hostfwd=tcp::${ssh_port}-:22 \
 -machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \
 -enable-kvm \
 -msg timestamp=on

boot/melawy2-systemd-boot-net.sh

@@ -14,26 +14,32 @@ if [[ $mem -lt 6144 ]]; then
     mem=6144
 fi
 
+if [[ $mem -gt 8192 ]]; then
+    mem=8192
+fi
+
 fd="$name-OVMF_VARS.fd"
 
 if [ ! -f "./fd/$fd" ]; then
     cp -av -- '/usr/share/edk2-ovmf/x64/OVMF_VARS.fd' "./fd/$fd"
 fi
 
-iso=$(find ./iso -name "*.iso" | grep -i "melawy" | tail -n 1)
+iso=$(find ../sf -name "*.iso" | grep -i "melawy" | tail -n 1)
 
 qcow2="$name.qcow2"
 
 if [ ! -f "./qcow2/$qcow2" ]; then
-    qemu-img create -f qcow2 "./qcow2/$qcow2" 50G
+    qemu-img create -f qcow2 "./qcow2/$qcow2" 100G
 fi
 
 echo "CPU: $virt_cpu; MEM: $mem; ISO: $iso; DISK: $qcow2; NVRAM: $fd"
 
 random_num=$((1 + $RANDOM % 100))
 
+ssh_port=$(shuf -i 60000-61000 -n 1)
+
 qemu-system-x86_64 \
--name MelawyLinux_$random_num,process=archiso_$random_num,guest=MelawyLinux_$random_num,debug-threads=on \
+-name MelawyLinux_${random_num}_ssh_port_${ssh_port},process=MelawyLinux_${random_num}_ssh_port_${ssh_port},guest=MelawyLinux_${random_num}_ssh_port_${ssh_port},debug-threads=on \
 -drive "if=pflash,format=raw,unit=0,file=/usr/share/edk2-ovmf/x64/OVMF_CODE.fd,read-only=on" \
 -drive "if=pflash,format=raw,unit=1,file=./fd/$fd" \
 -global "driver=cfi.pflash01,property=secure,value=off" \
@@ -54,7 +60,7 @@ qemu-system-x86_64 \
 -device ich9-intel-hda \
 -device hda-output,audiodev=snd0 \
 -device virtio-net-pci,romfile=,netdev=net0 \
--netdev user,id=net0,hostfwd=tcp::60022-:22 \
+-netdev user,id=net0,hostfwd=tcp::${ssh_port}-:22 \
 -machine type=pc-q35-8.1,smm=on,accel=kvm,usb=on,vmport=off,dump-guest-core=off,hpet=off,acpi=on,pcspk-audiodev=snd0 \
 -enable-kvm \
 -msg timestamp=on

make_iso/01_rank_mirrorlist.sh

@@ -2,7 +2,7 @@
 
 sudo sed -i -e "s/#Server/Server/g" /etc/pacman.d/mirrorlist.pacnew
 sudo cp /etc/pacman.d/mirrorlist.pacnew /etc/pacman.d/mirrorlist
-sudo reflector --save /etc/pacman.d/mirrorlist -c "CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH, " --protocol https,http,rsync --latest 50 --fastest 50 --sort rate
+sudo reflector --save /etc/pacman.d/mirrorlist -c "CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH, " --protocol https --latest 50 --fastest 50 --sort rate
 
 cp -vf "/etc/pacman.d/mirrorlist" "./airootfs/etc/pacman.d/"
 

make_iso/02_prepare.sh

@@ -6,6 +6,8 @@ sudo pacman -Sy
 
 sudo pacman -Sw --config pacman_sys.conf --noconfirm --cachedir "./airootfs/opt/extra-drivers" r8168
 
+sudo mv -vf "./airootfs/opt/extra-drivers/linux"* "./airootfs/usr/share/packages/"
+
 packs=(
   dracut
   grub-dracut
@@ -36,6 +38,8 @@ done
 sudo paccache -rvk 1 --cachedir "./airootfs/opt/extra-drivers"
 sudo paccache -rvk 1 --cachedir "./airootfs/usr/share/packages"
 
+# sudo rm "./airootfs/opt/extra-drivers/linux"*
+
 notify-send -a "$(basename $(pwd)): Prepare" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
 echo "Ready"

make_iso/04_make.sh

@@ -1,23 +1,24 @@
 #!/bin/bash
 
-sudo ./mkarchiso_last_my -v "."
-
 date_tag=$(date +%Y.%m.%d)
 iso_name="Melawy-linux-${date_tag}-x86_64.iso"
 
-cp          "../work/iso/arch/pkglist.x86_64.txt"                                "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt"
+mkdir -p ../sf/${date_tag}
+sudo ./mkarchiso_last_my -v "."
 
-echo "Sign ../boot/txt/${iso_name}.sig ../boot/iso/${iso_name}"
+cp -vf      "../work/iso/arch/pkglist.x86_64.txt"                                "../sf/${date_tag}/Melawy-linux-${date_tag}-pkglist.txt"
-gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}"
+
+echo "Sign ../sf/${date_tag}/${iso_name}.sig ../sf/${date_tag}/${iso_name}"
+gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../sf/${date_tag}/${iso_name}.sig" "../sf/${date_tag}/${iso_name}"
 
 
-cd "../boot/iso/"
+cd "../sf/${date_tag}"
 
 echo "sha1sum ${iso_name}"
-sha1sum     "${iso_name}"                                                      > "../../boot/txt/${iso_name}.sha1"
+sha1sum     "${iso_name}"                                                      > "${iso_name}.sha1"
 
 echo "sha256sum ${iso_name}"
-sha256sum   "${iso_name}"                                                      > "../../boot/txt/${iso_name}.sha256"
+sha256sum   "${iso_name}"                                                      > "${iso_name}.sha256"
 
 notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 

make_iso/05_sign.sh

@@ -1,24 +1,25 @@
 #!/bin/bash
 
-
-
 date_tag=$(date +%Y.%m.%d)
 iso_name="Melawy-linux-${date_tag}-x86_64.iso"
 
-cp          "../work/iso/arch/pkglist.x86_64.txt"                                "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt"
-
-echo "Sign ../boot/txt/${iso_name}.sig ../boot/iso/${iso_name}"
-gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}"
 
 
-cd "../boot/iso/"
+
+cp -vf      "../work/iso/arch/pkglist.x86_64.txt"                                "../sf/${date_tag}/Melawy-linux-${date_tag}-pkglist.txt"
+
+echo "Sign ../sf/${date_tag}/${iso_name}.sig ../sf/${date_tag}/${iso_name}"
+gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../sf/${date_tag}/${iso_name}.sig" "../sf/${date_tag}/${iso_name}"
+
+
+cd "../sf/${date_tag}"
 
 echo "sha1sum ${iso_name}"
-sha1sum     "${iso_name}"                                                      > "../../boot/txt/${iso_name}.sha1"
+sha1sum     "${iso_name}"                                                      > "${iso_name}.sha1"
 
 echo "sha256sum ${iso_name}"
-sha256sum   "${iso_name}"                                                      > "../../boot/txt/${iso_name}.sha256"
+sha256sum   "${iso_name}"                                                      > "${iso_name}.sha256"
 
-notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
+notify-send -a "$(basename $(pwd)): Sign" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
 echo "Ready"

make_iso/06_chown.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-sudo chown -R 1000:1000 ../boot
+sudo chown -R 1000:1000 ../sf
 
 echo "Ready"

make_iso/README.md

@@ -0,0 +1,2 @@
+# archiso-config
+shell, config and profile files for making LiveDVD

make_iso/airootfs/etc/dracut.conf.d/plymouth.conf

@@ -0,0 +1 @@
+install_items+=" /usr/lib/plymouth/label.so /usr/lib/plymouth/text.so /etc/fonts/fonts.conf /usr/share/fonts/noto/NotoSansMono-Black.ttf /usr/share/fonts/noto/NotoSansMono-Bold.ttf /usr/share/fonts/noto/NotoSansMono-Light.ttf /usr/share/fonts/noto/NotoSansMono-Medium.ttf /usr/share/fonts/noto/NotoSansMono-Regular.ttf /usr/share/fonts/noto/NotoSansMono-Thin.ttf /usr/share/fonts/noto/NotoSans-BlackItalic.ttf /usr/share/fonts/noto/NotoSans-Black.ttf /usr/share/fonts/noto/NotoSans-BoldItalic.ttf /usr/share/fonts/noto/NotoSans-Bold.ttf /usr/share/fonts/noto/NotoSans-Italic.ttf /usr/share/fonts/noto/NotoSans-LightItalic.ttf /usr/share/fonts/noto/NotoSans-Light.ttf /usr/share/fonts/noto/NotoSans-MediumItalic.ttf /usr/share/fonts/noto/NotoSans-Medium.ttf /usr/share/fonts/noto/NotoSans-Regular.ttf /usr/share/fonts/noto/NotoSans-ThinItalic.ttf /usr/share/fonts/noto/NotoSans-Thin.ttf "

make_iso/airootfs/etc/dracut.conf.d/resume-from-hibernate.conf

@@ -0,0 +1 @@
+add_dracutmodules+=" resume "

make_iso/airootfs/etc/pacman.d/mirrorlist

@@ -2,59 +2,59 @@
 ################# Arch Linux mirrorlist generated by Reflector #################
 ################################################################################
 
-# With:       reflector --save /etc/pacman.d/mirrorlist -c 'CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH, ' --protocol https,http,rsync --latest 50 --fastest 50 --sort rate
+# With:       reflector --save /etc/pacman.d/mirrorlist -c 'CA,FI,FR,DE,IS,IE,IT,JP,KZ,LV,LU,NZ,NO,PL,PT,RU,SG,ES,SE,CH,TW,TH, ' --protocol https --latest 50 --fastest 50 --sort rate
-# When:       2023-11-04 21:36:16 UTC
+# When:       2023-11-20 14:33:34 UTC
 # From:       https://archlinux.org/mirrors/status/json/
-# Retrieved:  2023-11-04 21:34:31 UTC
+# Retrieved:  2023-11-20 14:33:34 UTC
-# Last Check: 2023-11-04 21:17:09 UTC
+# Last Check: 2023-11-20 14:25:53 UTC
 
-Server = http://arch.mirror.far.fi/$repo/os/$arch
+Server = https://mirror.surf/archlinux/$repo/os/$arch
-Server = https://mirror.yal.sl-chat.ru/archlinux/$repo/os/$arch
+Server = https://arch.midov.pl/arch/$repo/os/$arch
+Server = https://mirror.juniorjpdj.pl/archlinux/$repo/os/$arch
+Server = https://mirror.wuki.li/archlinux/$repo/os/$arch
+Server = https://arch.yhtez.xyz/$repo/os/$arch
 Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch
-Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch
-Server = https://mirror.hel.sl-chat.ru/archlinux/$repo/os/$arch
 Server = https://mirror.sunred.org/archlinux/$repo/os/$arch
-Server = https://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch
+Server = https://mirror.osbeck.com/archlinux/$repo/os/$arch
 Server = https://pkg.adfinis.com/archlinux/$repo/os/$arch
-Server = http://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch
+Server = https://mirror.yal.sl-chat.ru/archlinux/$repo/os/$arch
-Server = http://pkg.adfinis.com/archlinux/$repo/os/$arch
+Server = https://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch
-Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch
+Server = https://mirror.nw-sys.ru/archlinux/$repo/os/$arch
+Server = https://mirror.pseudoform.org/$repo/os/$arch
 Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch
-Server = https://mirrors.janbruckner.de/archlinux/$repo/os/$arch
+Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch
-Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch
+Server = https://archlinux.homeinfo.de/$repo/os/$arch
+Server = https://mirror.iusearchbtw.nl/$repo/os/$arch
+Server = https://arch.mirror.zachlge.org/$repo/os/$arch
+Server = https://mirror.archlinux.no/$repo/os/$arch
+Server = https://mirror.thekinrar.fr/archlinux/$repo/os/$arch
+Server = https://mirror.hel.sl-chat.ru/archlinux/$repo/os/$arch
+Server = https://mirrors.celianvdb.fr/archlinux/$repo/os/$arch
+Server = https://pkg.fef.moe/archlinux/$repo/os/$arch
 Server = https://mirror.theo546.fr/archlinux/$repo/os/$arch
-Server = http://mirror.sunred.org/archlinux/$repo/os/$arch
-Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
-Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
 Server = https://mirror.srv.fail/archlinux/$repo/os/$arch
-Server = https://de.arch.mirror.kescher.at/$repo/os/$arch
+Server = https://ftp.acc.umu.se/mirror/archlinux/$repo/os/$arch
-Server = http://mirrors.janbruckner.de/archlinux/$repo/os/$arch
-Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = http://mirror.theo546.fr/archlinux/$repo/os/$arch
-Server = http://arch.phinau.de/$repo/os/$arch
-Server = https://archlinux.thaller.ws/$repo/os/$arch
-Server = http://archlinux.mailtunnel.eu/$repo/os/$arch
-Server = https://arch.phinau.de/$repo/os/$arch
-Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch
-Server = http://mirror.moson.org/arch/$repo/os/$arch
-Server = https://mirror.moson.org/arch/$repo/os/$arch
-Server = rsync://mirror.yal.sl-chat.ru/archlinux/$repo/os/$arch
-Server = http://archlinux.thaller.ws/$repo/os/$arch
 Server = https://nox.panibrez.com/archlinux/$repo/os/$arch
-Server = rsync://mirror.hel.sl-chat.ru/archlinux/$repo/os/$arch
+Server = https://ftp.ludd.ltu.se/mirrors/archlinux/$repo/os/$arch
-Server = rsync://de.arch.mirror.kescher.at/mirror/arch/$repo/os/$arch
+Server = https://mirrors.n-ix.net/archlinux/$repo/os/$arch
-Server = http://arch.sakamoto.pl/$repo/os/$arch
+Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = https://arch.sakamoto.pl/$repo/os/$arch
+Server = https://archlinux.thaller.ws/$repo/os/$arch
-Server = rsync://mirrors.janbruckner.de/archlinux/$repo/os/$arch
+Server = https://arch.phinau.de/$repo/os/$arch
-Server = rsync://rsync.cyberbits.eu/archlinux/$repo/os/$arch
+Server = https://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch
-Server = rsync://mirror.ubrco.de/archlinux/$repo/os/$arch
+Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
-Server = rsync://sync.mirror.sunred.org/archlinux/$repo/os/$arch
+Server = https://arch.jensgutermuth.de/$repo/os/$arch
-Server = rsync://rsync.myrveln.se/pub/linux/archlinux/$repo/os/$arch
+Server = https://dist-mirror.fem.tu-ilmenau.de/archlinux/$repo/os/$arch
-Server = rsync://archlinux.thaller.ws/archlinux/$repo/os/$arch
+Server = https://mirror.quantum5.ca/archlinux/$repo/os/$arch
-Server = rsync://archlinux.mailtunnel.eu/archlinux/$repo/os/$arch
+Server = https://theswissbay.ch/archlinux/$repo/os/$arch
-Server = rsync://mirror.f4st.host/archlinux/$repo/os/$arch
-Server = rsync://mirror.moson.org/arch/$repo/os/$arch
-Server = rsync://rsync.eloteam.tk/archlinux/$repo/os/$arch
 Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
-Server = rsync://mirror.kumi.systems/archlinux/$repo/os/$arch
+Server = https://mirror.selfnet.de/archlinux/$repo/os/$arch
-Server = rsync://arch.mirror.far.fi/archlinux/$repo/os/$arch
+Server = https://ftp.fau.de/archlinux/$repo/os/$arch
+Server = https://ftp.psnc.pl/linux/archlinux/$repo/os/$arch
+Server = https://arch.sakamoto.pl/$repo/os/$arch
+Server = https://mirror.cyberbits.asia/archlinux/$repo/os/$arch
+Server = https://mirror.jingk.ai/archlinux/$repo/os/$arch
+Server = https://mirror.fsmg.org.nz/archlinux/$repo/os/$arch
+Server = https://repo.jing.rocks/archlinux/$repo/os/$arch
+Server = https://mirror.2degrees.nz/archlinux/$repo/os/$arch
+Server = https://mirror.moson.org/arch/$repo/os/$arch
+Server = https://archmirror.it/repos/$repo/os/$arch

make_iso/airootfs/usr/local/bin/copy-refind-theme_v1

@@ -31,6 +31,7 @@ __find_esp__() {
   readonly ESP
 }
 
+
 __has_esp__() {
   __find_esp__
 
@@ -40,6 +41,8 @@ __has_esp__() {
 
 
 THEME_NAME="melawy-nier-a2"
+install_dir="/usr/share/refind/themes"
+
 
 echo "Searching rEFInd installation in EFI partition..."
 if ! __has_esp__; then
@@ -47,6 +50,7 @@ if ! __has_esp__; then
   exit 1
 fi
 
+
 REFIND_DIR=$(find "$ESP" -type d -iname refind)
 if ! [[ -d "${REFIND_DIR}" ]]; then
   echo "rEFInd not installed in $ESP" >&2
@@ -54,9 +58,58 @@ if ! [[ -d "${REFIND_DIR}" ]]; then
 fi
 echo "Found rEFInd in ${REFIND_DIR}"
 
+
+EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot)
+if ! [[ -d "${EFI_BOOT_DIR}" ]]; then
+  EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot)
+  if ! [[ -d "${EFI_BOOT_DIR}" ]]; then
+    EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT)
+    if ! [[ -d "${EFI_BOOT_DIR}" ]]; then
+      mkdir -p "$(dirname ${REFIND_DIR})/boot"
+      EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot"
+    fi
+  fi
+fi
+
+
 echo "Installing themes in ${REFIND_DIR}"
 
-cp -vrf "/usr/share/refind/themes" "${REFIND_DIR}/"
+mkdir -p "${REFIND_DIR}/themes"
+mkdir -p "${EFI_BOOT_DIR}/themes"
+
+cp -vrf "$install_dir/." "${REFIND_DIR}/themes/."
+cp -vrf "$install_dir/." "${EFI_BOOT_DIR}/themes/."
+
+if [ -f "${REFIND_DIR}/refind_x64.efi" ]; then
+  # # Remove all from "${EFI_BOOT_DIR}" except "themes"
+  # f_list=$(ls -1 "${EFI_BOOT_DIR}" | grep -v "themes")
+  #
+  # for i in ${f_list[@]}
+  # do
+  #   rm -vr "${EFI_BOOT_DIR}/${i}"
+  # done
+  #
+  # unset f_list
+  #
+  # # Copy all from "${REFIND_DIR}" to "${EFI_BOOT_DIR}" except "themes"
+  # f_list=$(ls -1 "${REFIND_DIR}" | grep -v "themes")
+  #
+  # for i in ${f_list[@]}
+  # do
+  #   if [ -f ${REFIND_DIR}/${i} ]; then
+  #     cp -vf "${REFIND_DIR}/${i}" "${EFI_BOOT_DIR}/${i}"
+  #   fi
+  #
+  #   if [ -d ${REFIND_DIR}/${i} ]; then
+  #     cp -vrf "${REFIND_DIR}/${i}" "${EFI_BOOT_DIR}/${i}"
+  #   fi
+  # done
+  #
+  # unset f_list
+
+  cp -vf "${REFIND_DIR}/refind_x64.efi" "${EFI_BOOT_DIR}/bootx64.efi"
+fi
+
 
 REFIND_CONF_PATH="${REFIND_DIR}/refind.conf"
 
@@ -77,4 +130,4 @@ else
   fi
 fi
 
-echo "calamares yes" > /etc/refind-menu-generator/install_refind_theme.status
+cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf"

make_iso/airootfs/usr/local/bin/copy-refind-theme_v2

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+exit 0
+
 if [ -d '/boot/EFI/refind/' ] && [ -d /usr/share/refind/themes ]; then
   cp -vrf /usr/share/refind/themes /boot/EFI/refind/
 fi

make_iso/cleanup.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+mv .git/config config
+
+rm -rf .git
+
+git init -b main
+
+mv config .git/config
+
+git add --all .
+
+git commit -m "cleanup"
+
+git push origin main --force
+
+echo "################################################################"
+echo "###################    cleanup  Done      ######################"
+echo "################################################################"

make_iso/generate_packages.x86_64_from_netinstall.py

@@ -178,7 +178,7 @@ clonezilla
 ddrescue
 gpart
 grsync
-melawy-calamares-qt5
+melawy-calamares-qt6
 melawy-skel-liveuser
 memtest86+
 mkinitcpio-archiso

make_iso/generate_packages.x86_64_from_netinstall_min.py

@@ -0,0 +1,251 @@
+#!/usr/bin/env python3
+
+import os
+import yaml
+
+
+"""
+документ = набор диктов
+
+набор диктов = текстовые элементы + список
+
+список может содержать текстовые элементы или дикт
+"""
+
+def deep_deep(group: dict, all_elements: bool = True):
+    """Рекурсивный обход структуры yaml
+
+    Args:
+        group (dict): _description_
+        all_elements (bool, optional): _description_. Defaults to True.
+
+    Returns:
+        _type_: _description_
+    """
+
+    packages = []
+    packages_x86_64_new = []
+
+    if isinstance(group, dict):
+
+        for item in group:
+
+            if all_elements:
+                pass
+
+            else:
+                if 'selected' in group:
+                    if group['selected'] == True:
+                        pass
+
+                    else:
+                        continue
+
+            if isinstance(group[item], list):
+                if 'name' in group:
+                    packages_x86_64_new.append(f"\n## {group['name']}")
+
+                if 'packages' in group:
+                    for package in sorted(group['packages']):
+                        package = package.replace("$LOCALE", LOCALE)
+                        packages.append(package)
+                        packages_x86_64_new.append(package)
+
+                for element in group[item]:
+                    if isinstance(element, dict):
+                        res = deep_deep(element, all_elements)
+                        packages += res[0]
+                        packages_x86_64_new += res[1]
+
+    return packages, packages_x86_64_new
+
+
+def deep(doc: dict, all_elements: bool = True):
+    """Функция проверки объекта что он словарь и запуск рекурсии для получения данных
+
+    Args:
+        doc (dict): _description_
+        all_elements (bool, optional): _description_. Defaults to True.
+
+    Returns:
+        _type_: _description_
+    """
+
+    packages = []
+    packages_x86_64_new = []
+
+    for group in doc:
+        if isinstance(group, dict):
+            res = deep_deep(group, all_elements)
+            packages += res[0]
+            packages_x86_64_new += res[1]
+
+    return packages, packages_x86_64_new
+
+
+def get_packages(filename):
+    """Функция для packages.x86_64
+
+    Args:
+        filename (_type_): _description_
+
+    Returns:
+        _type_: _description_
+    """
+
+    with open(filename, mode="rt") as f:
+        lines = f.readlines()
+
+        packages = []
+
+        for line in lines:
+            if line.startswith("#") or len(line) <= 1:
+                continue
+            else:
+                package = line.strip().replace("\n", "")
+                packages.append(package)
+
+        packages = set(packages)
+
+        packages = sorted(packages)
+
+        return packages
+
+
+def get_packages_v2(filename):
+    """Функция для netinstall_min.yaml
+
+    Args:
+        filename (_type_): _description_
+
+    Returns:
+        _type_: _description_
+    """
+    with open(filename, 'rt') as f:
+        doc = yaml.safe_load(f)
+
+        res = deep(doc, all_elements = False)
+        packages = res[0]
+        packages_x86_64_new = res[1]
+
+        packages = set(packages)
+
+        packages = sorted(packages)
+
+        packages_v2 = []
+        for package in packages:
+            packages_v2.append(package)
+
+        packages = packages_v2
+
+        return packages, packages_x86_64_new
+
+
+def write_new_packages_x86_64(filename, packages_x86_64_new: list):
+
+    with open(filename, mode="wt+") as f:
+
+        if isinstance(packages_x86_64_new, list):
+            packages_x86_64_new[0] = packages_x86_64_new[0].replace("\n#", "")
+            for item in packages_x86_64_new:
+                if "## ARCHISO PACKAGES" in item:
+                    item = f"\n{item}"
+                f.write(f"{item}\n")
+
+#####################################################################################
+
+LOCALE = os.environ.get('LANG')[0:2]
+filename1='packages.x86_64'
+filename2='netinstall_min.yaml'
+filename3='packages.x86_64'
+
+
+list_of_packages = get_packages(filename1)
+length_list_of_packages = len(list_of_packages)
+
+result_netinstall = get_packages_v2(filename2)
+
+list_of_packages_v2 = result_netinstall[0]
+length_list_of_packages_v2 = len(list_of_packages_v2)
+
+list_of_packages_v3 = result_netinstall[1]
+
+
+packages_extend = """
+## ARCHISO PACKAGES
+archiso
+clonezilla
+ddrescue
+gpart
+grsync
+melawy-calamares-qt6
+melawy-skel-liveuser
+memtest86+
+mkinitcpio-archiso
+mkinitcpio-nfs-utils
+os-prober
+partclone
+parted
+partimage
+rate-mirrors
+syslinux
+"""
+
+packages_extend = packages_extend.splitlines()
+
+list_of_packages_v3.extend(packages_extend)
+list_of_packages_v3_1 = []
+
+for item in list_of_packages_v3:
+    if len(item) <= 1:
+        continue
+    else:
+        list_of_packages_v3_1.append(item)
+
+list_of_packages_v3 = list_of_packages_v3_1
+
+
+write_new_packages_x86_64(filename3, list_of_packages_v3)
+
+
+set_list_of_packages_v3 = set()
+
+for item in list_of_packages_v3:
+    if item.startswith("\n#") or item.startswith("#") or len(item) <= 1:
+        continue
+    else:
+        set_list_of_packages_v3.add(item)
+
+length_list_of_packages_v3 = len(set_list_of_packages_v3)
+
+
+difference1 = sorted(list(set(list_of_packages_v2).difference(list_of_packages)))
+
+difference2 = sorted(list(set(list_of_packages).difference(list_of_packages_v2)))
+
+#####################################################################################
+
+print('-------------------------------------------')
+print("Разница в списках")
+print('-------------------------------------------')
+print(f"Количество пакетов в {filename1}: {length_list_of_packages}")
+
+print(f"Количество пакетов в {filename2}: {length_list_of_packages_v2}")
+
+print(f"Количество пакетов сгенерированных для {filename1}: {length_list_of_packages_v3}")
+
+print('-------------------------------------------')
+print(f"Пакеты, отсутствующие в {filename1}:")
+print('-------------------------------------------')
+
+for item in difference1:
+    print(item)
+
+print('-------------------------------------------')
+print(f"Пакеты, отсутствующие в {filename2}:")
+print('-------------------------------------------')
+
+for item in difference2:
+    print(item)
+
+print('-------------------------------------------')

make_iso/packages.x86_64

@@ -32,7 +32,6 @@ pacman
 pacman-contrib
 pacman-mirrorlist
 plymouth
-plymouth-kcm
 refind
 systemd-ukify
 xf86-input-elographics
@@ -42,130 +41,72 @@ xf86-input-void
 xf86-video-fbdev
 xf86-video-openchrome
 
+## Terminal-Base + Common packages
+
+## CPU specific microcode update packages
+amd-ucode
+intel-ucode
+
 ## Virtual machines
-bridge-utils
-edk2-shell
 hyperv
 libvirt
 open-vm-tools
-qemu-desktop
 qemu-guest-agent
 spice-vdagent
-virt-manager
-virt-viewer
 virtualbox-guest-utils
 xf86-input-vmmouse
 xf86-video-qxl
 xf86-video-vmware
 
-## Booting process: Refind integration
+## Filesystem
-melawy-refind-theme-fenek
+btrfs-progs
-melawy-refind-theme-lera-sugar
+dosfstools
-melawy-refind-theme-nier-a2
+e2fsprogs
+efibootmgr
+efitools
+exfatprogs
+f2fs-tools
+haveged
+jfsutils
+lvm2
+nfs-utils
+nilfs-utils
+ntfs-3g
+reiserfsprogs
+samba-support
+sbsigntools
+smartmontools
+xfsprogs
 
-## Booting process: Plymouth integration
+## BTRFS filesystem
+btrfs-assistant
+btrfs-snapshots
+timeshift
+timeshift-autosnap
 
-## Nier A2 theme
+## Hardware
-melawy-plymouth-theme-hard-install-nier-a2
+dmidecode
+dmraid
+hdparm
+hwdetect
+lsscsi
+mtools
+sg3_utils
+sof-firmware
 
-## Melawy Linux Packages
+## Power
+cpupower
+power-profiles-daemon
+upower
 
-## Plymouth
+## Terminal applications
-melawy-plymouth-theme-fenek
+bash-completion
-melawy-plymouth-theme-lera-sugar
-melawy-plymouth-theme-nier-a2
-
-## SDDM
-melawy-sddm-theme-fenek
-melawy-sddm-theme-lera-sugar
-melawy-sddm-theme-nier-a2
-
-## Cursors
-melawy-purple-dark-cursors
-melawy-purple-dark-default-cursors
-melawy-purple-light-cursors
-melawy-purple-light-default-cursors
-melawy-red-dark-cursors
-melawy-red-dark-default-cursors
-melawy-red-light-cursors
-melawy-red-light-default-cursors
-
-## Updater
-melawy-arch-linux-updater
-melawy-plasma-plasmoid-archupdate
-
-## Start menu
-melawy-plasma-plasmoid-DittoMenu
-melawy-plasma-plasmoid-Menu11
-melawy-plasma-plasmoid-OnzeMenuKDE
-
-## Desktop theme
-fluent-gtk-theme-git
-fluent-kde-theme-git
-win11-icon-theme-git
-win11-icon-theme-special-git
-win11-icon-theme-white-git
-win11os-kde-git
-win12os-kde-git
-
-## Decor
-melawy-color-scheme
-melawy-color-scheme-konsole
-melawy-icon-theme
-melawy-plasma-desktop-theme
-
-## look-and-feel
-melawy-plasma-look-and-feel-fenek
-melawy-plasma-look-and-feel-lera-sugar
-melawy-plasma-look-and-feel-nier-a2
-
-## Wallpapers
-melawy-wallpaper-fenek
-melawy-wallpaper-lera-sugar
-melawy-wallpaper-nier-a2
-
-## Desktop-Base + Common packages
-
-## X11-system
-libwnck3
-mesa
-mesa-utils
-xf86-input-libinput
-xorg-server
-xorg-xdpyinfo
-xorg-xhost
-xorg-xinit
-xorg-xinput
-xorg-xkill
-xorg-xrandr
-xorg-xrdb
-
-## GPU Intel drivers
-libva-intel-driver
-libva-utils
-
-## GPU AMD drivers
-xf86-video-amdgpu
-xf86-video-ati
-
-## GPU NVIDIA drivers - Latest (202X)
-nvidia-dkms
-nvidia-settings
-nvidia-utils
-
-## V4L2 drivers
-v4l2loopback-dkms
-
-## Recommended applications selection
 beep
-browsh
 btop
 cryptsetup
 device-mapper
-dialog
 diffutils
 duf
-elinks
 expect
 fastfetch
 find-the-command
@@ -176,6 +117,7 @@ glances
 gpm
 htop
 hwinfo
+iftop
 inetutils
 inxi
 iotop
@@ -188,17 +130,12 @@ man-db
 man-pages
 mc
 mdadm
-meld
+mlocate
-micro
 nano
 nano-syntax-highlighting
 neofetch
-neovim
-neovim-lsp_signature
-neovim-lspconfig
-neovim-nvim-treesitter
-neovim-qt
 nmap
+ntp
 openbsd-netcat
 powerline
 powerline-common
@@ -226,22 +163,14 @@ tpm2-tools
 tpm2-tss
 tree
 ttf-terminus-nerd
+unrar
+unzip
 usbutils
 vi
-w3m
 wget
 which
-xterm
 yad
 
-## Spell
-aspell
-aspell-ru
-aspell-en
-hunspell
-hunspell-ru
-hunspell-en_us
-
 ## Network
 b43-fwcutter
 bridge-utils
@@ -278,32 +207,170 @@ wireless_tools
 wpa_supplicant
 xl2tpd
 
-## Package management
+## Audio
-appimagelauncher
+alsa-firmware
-downgrade
+alsa-plugins
-flatpak
+alsa-utils
-flatpak-kcm
+pavucontrol
-libpamac
+pipewire-alsa
-libpamac-flatpak-plugin
+pipewire-jack
-libpamac-snap-plugin
+pipewire-pulse
-ocs-url
+pipewire-support
-octopi
+rtkit
-pace
+wireplumber
-pamac-cli
+
-pamac-gtk
+## X11-system
-paru
+libwnck3
-pkgfile
+mesa
-rebuild-detector
+mesa-utils
-reflector
+xf86-input-libinput
-reflector-simple
+xorg-server
-snapd
+xorg-xdpyinfo
-snapd-glib
+xorg-xhost
-yay
+xorg-xinit
+xorg-xinput
+xorg-xkill
+xorg-xrandr
+xorg-xrdb
+xsettingsd
+
+## V4L2 drivers
+v4l2loopback-dkms
+
+## Firewall
+firewalld
+python-capng
+python-pyqt5
+
+## Fonts
+adobe-source-code-pro-fonts
+adobe-source-han-sans-cn-fonts
+adobe-source-han-sans-jp-fonts
+adobe-source-han-sans-kr-fonts
+awesome-terminal-fonts
+cantarell-fonts
+freetype2
+noto-color-emoji-fontconfig
+noto-fonts
+noto-fonts-cjk
+noto-fonts-emoji
+otf-fira-mono
+otf-fira-sans
+otf-firamono-nerd
+ttf-bitstream-vera
+ttf-dejavu
+ttf-dejavu-nerd
+ttf-fira-code
+ttf-fira-sans
+ttf-firacode-nerd
+ttf-hack
+ttf-hack-nerd
+ttf-jetbrains-mono
+ttf-jetbrains-mono-nerd
+ttf-liberation
+ttf-liberation-mono-nerd
+ttf-ms-fonts
+ttf-nerd-fonts-symbols
+ttf-nerd-fonts-symbols-common
+ttf-nerd-fonts-symbols-mono
+ttf-noto-nerd
+ttf-opensans
+ttf-roboto
+ttf-roboto-mono
+ttf-roboto-mono-nerd
+ttf-sourcecodepro-nerd
+ttf-twemoji
+ttf-ubuntu-font-family
+ttf-ubuntu-mono-nerd
+ttf-ubuntu-nerd
+
+## Spell
+aspell
+aspell-ru
+aspell-en
+hunspell
+hunspell-ru
+hunspell-en_us
+
+## Melawy Linux branding
+
+## Refind
+melawy-refind-theme-fenek
+melawy-refind-theme-lera-sugar
+melawy-refind-theme-nier-a2
+
+## Plymouth
+melawy-plymouth-theme-fenek
+melawy-plymouth-theme-lera-sugar
+melawy-plymouth-theme-nier-a2
+
+## Plymouth select (1 from list)
+
+## Nier A2 theme
+melawy-plymouth-theme-hard-install-nier-a2
+melawy-refind-theme-hard-install-nier-a2
+
+## Base desktop theme
+melawy-icon-theme
+melawy-theme
+
+## Desktop theme Win11
+melawy-kde-theme-win11
+melawy-kde-theme-win12
+melawy-win11-icon-theme
+melawy-win11-icon-theme-special
+melawy-win11-icon-theme-white
+
+## Desktop theme Colloid
+colloid-cursors-git
+colloid-gtk-theme-git
+colloid-icon-theme-git
+colloid-kde-theme-git
+
+## SDDM, KDE Plasma Look-and-feel, Wallpapers
+melawy-kde-theme-fenek
+melawy-kde-theme-lera-sugar
+melawy-kde-theme-nier-a2
+
+## Cursors
+melawy-purple-dark-cursors
+melawy-purple-dark-default-cursors
+melawy-purple-light-cursors
+melawy-purple-light-default-cursors
+melawy-red-dark-cursors
+melawy-red-dark-default-cursors
+melawy-red-light-cursors
+melawy-red-light-default-cursors
+
+## Start menu
+melawy-plasma-plasmoid-DittoMenu
+melawy-plasma-plasmoid-Menu11
+melawy-plasma-plasmoid-OnzeMenuKDE
+
+## Plasmoids
+melawy-plasma-plasmoid-presentwindows
+melawy-plasma-plasmoid-win7showdesktop
+
+## Updater
+melawy-arch-linux-updater
+melawy-plasma-plasmoid-archupdate
 
 ## Desktop integration
+
+## Fix applications style
+gnome-settings-daemon
+gnome-themes-extra
+gsettings-desktop-schemas
+gsettings-qt
+gtk-engine-murrine
+kde-gtk-config
+lxappearance-gtk3
+xdg-desktop-portal
+xdg-desktop-portal-kde
+
+## KDE Plasma
 accountsservice
 ark
-bash-completion
 bluedevil
 breeze-gtk
 dolphin
@@ -312,7 +379,7 @@ drkonqi
 ffmpegthumbnailer
 ffmpegthumbs
 file-roller
-filezilla
+flatpak-kcm
 glfw-wayland
 gnome-firmware
 gnome-keyring
@@ -326,6 +393,7 @@ kcalc
 kde-gtk-config
 kdeconnect
 kdegraphics-thumbnailers
+kdenetwork-filesharing
 kdeplasma-addons
 kgamma5
 khotkeys
@@ -343,10 +411,6 @@ kwallet-pam
 kwalletmanager
 kwin-effect-rounded-corners-git
 kwin-effects-sliding-notifications
-libdvdcss
-libgsf
-libopenraw
-mlocate
 network-manager-applet
 okular
 partitionmanager
@@ -364,6 +428,7 @@ plasma-wayland-protocols
 plasma-wayland-session
 plasma-workspace
 plasma-workspace-wallpapers
+plymouth-kcm
 polkit-kde-agent
 poppler-glib
 powerdevil
@@ -378,143 +443,36 @@ xdg-desktop-portal-kde
 xdg-user-dirs
 xdg-user-dirs-gtk
 xdg-utils
-xsettingsd
 
-## Filesystem
+## Package management
-btrfs-progs
+appimagelauncher
-dosfstools
+downgrade
-e2fsprogs
+flatpak
-efibootmgr
+libpamac
-efitools
+libpamac-flatpak-plugin
-exfatprogs
+libpamac-snap-plugin
-f2fs-tools
+ocs-url
-haveged
+pace
-jfsutils
+pamac-cli
-kdenetwork-filesharing
+pamac-gtk
-lvm2
+paru
-nfs-utils
+pkgfile
-nilfs-utils
+rebuild-detector
-ntfs-3g
+reflector
-ntp
+reflector-simple
-reiserfsprogs
+snapd
-samba-support
+snapd-glib
-sbsigntools
+yay
-smartmontools
-unrar
-unzip
-xfsprogs
-xz
-
-## BTRFS filesystem
-btrfs-assistant
-btrfs-snapshots
-timeshift
-timeshift-autosnap
-
-## Fonts
-adobe-source-code-pro-fonts
-adobe-source-han-sans-cn-fonts
-adobe-source-han-sans-jp-fonts
-adobe-source-han-sans-kr-fonts
-awesome-terminal-fonts
-cantarell-fonts
-freetype2
-noto-color-emoji-fontconfig
-noto-fonts
-noto-fonts-cjk
-noto-fonts-emoji
-opendesktop-fonts
-otf-fira-mono
-otf-fira-sans
-otf-firamono-nerd
-ttf-bitstream-vera
-ttf-dejavu
-ttf-dejavu-nerd
-ttf-fira-code
-ttf-fira-sans
-ttf-firacode-nerd
-ttf-hack
-ttf-hack-nerd
-ttf-jetbrains-mono
-ttf-jetbrains-mono-nerd
-ttf-liberation
-ttf-liberation-mono-nerd
-ttf-meslo-nerd
-ttf-ms-fonts
-ttf-nerd-fonts-symbols
-ttf-nerd-fonts-symbols-common
-ttf-nerd-fonts-symbols-mono
-ttf-noto-nerd
-ttf-opensans
-ttf-roboto
-ttf-roboto-mono
-ttf-roboto-mono-nerd
-ttf-sourcecodepro-nerd
-ttf-twemoji
-ttf-ubuntu-font-family
-ttf-ubuntu-mono-nerd
-ttf-ubuntu-nerd
-
-## Audio
-alsa-firmware
-alsa-plugins
-alsa-utils
-pavucontrol
-pipewire-alsa
-pipewire-jack
-pipewire-pulse
-pipewire-support
-rtkit
-wireplumber
-
-## Hardware
-dmidecode
-dmraid
-hdparm
-hwdetect
-lsscsi
-mtools
-sg3_utils
-sof-firmware
-
-## Power
-cpupower
-power-profiles-daemon
-upower
-
-## CPU specific microcode update packages
-amd-ucode
-intel-ucode
 
 ## Browsers and language package
-brave-bin
+
+## Firefox
 firefox
 firefox-developer-edition
 firefox-developer-edition-i18n-ru
 firefox-i18n-ru
-google-chrome
 profile-sync-daemon
 
-## Desktop environment
-anydesk-bin
-avidemux-cli
-avidemux-qt
-corectrl
-discord
-gwe
-keepassxc
-kleopatra
-mailspring
-obs-studio-tytan652
-qbittorrent
-skypeforlinux-stable-bin
-telegram-desktop
-thunderbird
-yakuake
-yandex-disk
-yandex-disk-indicator
-zoom
-
 ## Office
 
 ## FreeOffice
@@ -522,13 +480,12 @@ freeoffice
 
 ## Media players
 audacious
-audacity
 elisa
 haruna
 mpv
 vlc-luajit
 
-## Picture Editors
+## Picture editors
 gimp
 gimp-help-ru
 gvfs
@@ -538,7 +495,17 @@ gvfs-mtp
 gvfs-nfs
 gvfs-smb
 inkscape
-krita
+libdvdcss
+libgsf
+libopenraw
+
+## Audio recorder
+audacity
+audio-recorder
+
+## Video editors
+avidemux-cli
+avidemux-qt
 
 ## Code IDE and programming language package
 ansible-language-server
@@ -583,10 +550,32 @@ vscode-json-languageserver
 vue-language-server
 yaml-language-server
 
-## Firewall
+## Mail applications
-firewalld
+
-python-capng
+## Mailspring
-python-pyqt5
+mailspring
+
+## Chat applications
+discord
+skypeforlinux-stable-bin
+telegram-desktop
+zoom
+
+## Passwords / keys applications
+keepassxc
+kleopatra
+
+## Desktop applications
+anydesk-bin
+corectrl
+filezilla
+gwe
+meld
+obs-studio-tytan652
+qbittorrent
+yakuake
+yandex-disk
+yandex-disk-indicator
 
 ## Bluetooth
 bluetooth-support
@@ -595,17 +584,55 @@ bluez-hid2hci
 bluez-libs
 bluez-utils
 
+## Containers
+
+## QEMU
+bridge-utils
+edk2-shell
+firewalld
+networkmanager
+qemu-desktop
+udisks2
+virt-manager
+virt-viewer
+
+## Docker
+bridge-utils
+docker
+docker-buildx
+docker-compose
+docker-machine
+docker-scan
+firewalld
+networkmanager
+udisks2
+
 ## Support
 input-devices-support
 laptop-detect
 
+## GPU drivers
+
+## Intel drivers
+libva-intel-driver
+libva-utils
+
+## AMD drivers
+xf86-video-amdgpu
+xf86-video-ati
+
+## NVIDIA drivers - Latest (202X)
+nvidia-dkms
+nvidia-settings
+nvidia-utils
+
 ## ARCHISO PACKAGES
 archiso
 clonezilla
 ddrescue
 gpart
 grsync
-melawy-calamares-qt5
+melawy-calamares-qt6
 melawy-skel-liveuser
 memtest86+
 mkinitcpio-archiso

make_iso/profiledef.sh

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2034
 
+date_tag=$(date +%Y.%m.%d)
 iso_name="Melawy-linux"
-iso_label="Melawy_Linux_$(date +%Y%m%d)"
+iso_label="Melawy_Linux_$(date +%Y.%m.%d)"
 iso_publisher="Melawy Linux <https://melawy.ru>"
 iso_application="Melawy Linux Live/Rescue CD"
 iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
@@ -10,7 +11,7 @@ install_dir="arch"
 buildmodes=('iso')
 quiet="n"
 work_dir="../work"
-out_dir="../boot/iso"
+out_dir="../sf/${date_tag}"
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
            'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"

mkdirs.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+mkdir -pv ./boot/{fd,iso,qcow2,shell_scripts,txt} 2>/dev/null
+mkdir -pv ./make_iso 2>/dev/null
+mkdir -pv ./sf 2>/dev/null
+mkdir -pv ./work 2>/dev/null
+
+echo "Ready"

pkgs_size.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# ls -lS /var/cache/pacman/pkg/ | grep -v ".sig" | awk '{print $5/1024/1024,"\t",$8}' > pkgs_size.txt
+ls -lS /var/cache/pacman/pkg/ | grep -v ".sig" | awk {'printf ("%s\t\t\t%s\n", $5/1024/1024, $9)'} > pkgs_size.txt
+# awk {'printf ("%5s\t%s\n", $5, $1)'}
+echo "Ready"

rsync_to_sf.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "Sending"
+
+rsync -avP --delete-after --progress -e "ssh" "./sf/" frs.sourceforge.net:/home/frs/project/melawy-linux/
+
+echo "Ready"

scp_to_sf.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+file_list=$(ls -1 ./sf/)
+for i in $file_list
+do
+    echo "Sending $i"
+    scp -p -r "./sf/$i" frs.sourceforge.net:/home/frs/project/melawy-linux/
+    echo "Ready $i"
+done
+
+echo "Ready"

ssh_to_sf.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ssh -t shell.sourceforge.net create
+
+echo "Ready"