diff --git a/30-build-the-iso-the-first-time.sh b/30-build-the-iso-the-first-time.sh index 6ab5157..16ab13e 100755 --- a/30-build-the-iso-the-first-time.sh +++ b/30-build-the-iso-the-first-time.sh @@ -126,7 +126,7 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/cachyos-$rename-pkglist.txt echo echo "##################################################################" diff --git a/40-build-the-iso-local-again.sh b/40-build-the-iso-local-again.sh index 6856b58..1114231 100755 --- a/40-build-the-iso-local-again.sh +++ b/40-build-the-iso-local-again.sh @@ -114,7 +114,7 @@ echo echo "Moving pkglist.x86_64.txt" echo "########################" rename=$(date +%Y-%m-%d) - cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/archlinux-$rename-pkglist.txt + cp $buildFolder/iso/arch/pkglist.x86_64.txt $outFolder/cachyos-$rename-pkglist.txt echo echo "##################################################################" diff --git a/archiso/packages.x86_64 b/archiso/packages.x86_64 index 44c6fbe..2c229a5 100644 --- a/archiso/packages.x86_64 +++ b/archiso/packages.x86_64 @@ -16,8 +16,6 @@ bash-completion bind bind-tools brltty -bluez -bluez-utils boost-libs broadcom-wl-dkms btrfs-progs @@ -56,7 +54,6 @@ dmidecode dmraid dnsmasq dolphin -dolphin-plugins dosfstools downgrade doxygen @@ -113,7 +110,6 @@ kvantum-qt5 kwin-scripts-forceblur less lftp -lib32-wayland libfido2 libusb-compat libwnck3 @@ -124,7 +120,6 @@ linux-cachyos linux-cachyos-headers linux-cachyos-zfs linux-firmware -linux-firmware-marvell livecd-sounds lsscsi lvm2 @@ -134,17 +129,14 @@ man-db man-pages mc mdadm -meld memtest86+ mesa mhwd-cachyos mhwd-nvidia-390xx -mesa-utils mkinitcpio mkinitcpio-archiso mkinitcpio-busybox mkinitcpio-nfs-utils -mkinitcpio-openswap mlocate modemmanager mtools @@ -152,15 +144,9 @@ nano nano-syntax-highlighting nbd ndisc6 -neofetch netctl net-tools -#network networkmanager -network-manager-applet -networkmanager-openvpn -networkmanager-qt -networkmanager-vpnc nfs-utils nilfs-utils nmap @@ -189,24 +175,13 @@ partimage paru pavucontrol perl -pipewire-alsa -pipewire-jack pipewire-media-session -pipewire-pulse -pipewire-v4l2 -pipewire-zeroconf -plasma-browser-integration plasma-desktop -plasma-firewall plasma-framework plasma-integration plasma-nm plasma-pa -plasma-systemmonitor plasma-thunderbolt -plasma-wayland-protocols -plasma-wayland-session -plasma-workspace polkit-qt5 poppler-glib power-profiles-daemon