From 0f91b1e4c4d5053c72cae2b92497ddae19a9b141 Mon Sep 17 00:00:00 2001 From: Peter Jung Date: Sun, 7 Jul 2024 00:26:55 +0200 Subject: [PATCH] Cleanup, remove unused profiles and rename kde to desktop (#25) * Cleanup, remove unused profiles and rename kde to desktop The Gnome, Wayfire and Openbox DE's are not used anymore on our ISO, so lets clean it up. Also, lets change away from "kde" Edition to "Desktop" Edition to make it more clear to users. Signed-off-by: Peter Jung * Packages: Move to correct naming Signed-off-by: Peter Jung --------- Signed-off-by: Peter Jung --- archiso/packages_deckify.x86_64 | 248 -------------- ...ges_kde.x86_64 => packages_desktop.x86_64} | 0 archiso/packages_gnome.x86_64 | 273 ---------------- archiso/packages_openbox.x86_64 | 264 --------------- archiso/packages_wayfire.x86_64 | 265 --------------- archiso/packages_xfce.x86_64 | 304 ------------------ buildiso.sh | 2 +- util-iso.sh | 52 +-- 8 files changed, 5 insertions(+), 1403 deletions(-) delete mode 100644 archiso/packages_deckify.x86_64 rename archiso/{packages_kde.x86_64 => packages_desktop.x86_64} (100%) delete mode 100644 archiso/packages_gnome.x86_64 delete mode 100644 archiso/packages_openbox.x86_64 delete mode 100644 archiso/packages_wayfire.x86_64 delete mode 100644 archiso/packages_xfce.x86_64 diff --git a/archiso/packages_deckify.x86_64 b/archiso/packages_deckify.x86_64 deleted file mode 100644 index 2180d51..0000000 --- a/archiso/packages_deckify.x86_64 +++ /dev/null @@ -1,248 +0,0 @@ -alacritty -alsa-utils -amd-ucode -arch-install-scripts -archlinux-keyring -avahi -b43-fwcutter -base -bash-completion -bcachefs-tools -bind -breeze-gtk -brltty -broadcom-wl-dkms -btrfs-progs -cachy-browser -cachyos-calamares-deckify -cachyos-cli-installer-new -cachyos-fish-config -cachyos-hello -cachyos-hooks -cachyos-kde-settings -cachyos-kernel-manager -cachyos-keyring -cachyos-mirrorlist -cachyos-nord-gtk-theme-git -cachyos-nord-kde-theme-git -cachyos-packageinstaller -cachyos-rate-mirrors -cachyos-settings -cachyos-themes-sddm -cachyos-v3-mirrorlist -cachyos-v4-mirrorlist -cachyos-zsh-config -cantarell-fonts -capitaine-cursors -char-white -chwd -ckbcomp -clonezilla -cloud-init -cronie -cryptsetup -darkhttpd -ddrescue -dhclient -dhcpcd -dialog -diffutils -dmidecode -dmraid -dnsmasq -dolphin -dosfstools -e2fsprogs -edk2-shell -efibootmgr -ethtool -exfatprogs -f2fs-tools -fastfetch-git -fatresize -ffmpegthumbnailer -file-roller -fmt -fsarchiver -galculator -git -gnu-netcat -gpart -gpm -gptfdisk -grsync -grub -grub-hook -haveged -hdparm -hwinfo -hyperv -imwheel -inetutils -intel-ucode -intltool -inxi -iptables-nft -irssi -iw -iwd -jfsutils -kde-gtk-config -kinit -kio -kitty-terminfo -konsole -kpmcore -kscreen -ldns -less -lftp -libfido2 -libplasma -libusb-compat -libwnck3 -libxinerama -lightly-git -linux-atm -linux-cachyos -linux-cachyos-headers -linux-cachyos-nvidia -linux-cachyos-zfs -linux-firmware -linux-firmware-marvell -lsb-release -lsscsi -lvm2 -lynx -man-db -man-pages -mc -mdadm -memtest86+ -memtest86+-efi -mesa -micro -mkinitcpio -mkinitcpio-archiso -mkinitcpio-nfs-utils -mlocate -mobile-broadband-provider-info -modemmanager -mtools -nano -nano-syntax-highlighting -nbd -ndisc6 -net-tools -networkmanager -nfs-utils -nilfs-utils -nmap -noto-fonts -noto-fonts-cjk -nss-mdns -ntfs-3g -ntp -nvidia-utils -nvme-cli -octopi -openconnect -opendesktop-fonts -open-iscsi -openssh -open-vm-tools -openvpn -os-prober -partclone -parted -partimage -partitionmanager -paru -pcsclite -pipewire -pipewire-alsa -pipewire-jack -pipewire-pulse -plasma-desktop -plasma-integration -plasma-nm -plasma-pa -plasma-workspace -polkit -polkit-kde-agent -poppler-glib -power-profiles-daemon -ppp -pptpclient -profile-sync-daemon -pv -python -python-defusedxml -qemu-guest-agent -realtime-privileges -refind -reflector -reiserfsprogs -rp-pppoe -rsync -rtkit -rxvt-unicode-terminfo -screen -sddm -sddm-kcm -sdparm -sg3_utils -smartmontools -smbclient -snapper -sof-firmware -solid -spice-vdagent -squashfs-tools -steamdeck-firmware -sudo -syslinux -systemd-resolvconf -tcpdump -terminus-font -testdisk -tpm2-tss -traceroute -ttf-bitstream-vera -ttf-dejavu -ttf-liberation -ttf-opensans -udftools -usb_modeswitch -usbmuxd -usbutils -vim -virtualbox-guest-utils -vpnc -wget -wireless-regdb -wireless_tools -wireplumber -wpa_supplicant -wvdial -xdg-user-dirs-gtk -xdg-utils -xed -xf86-input-elographics -xf86-input-evdev -xf86-input-libinput -xf86-input-synaptics -xf86-input-vmmouse -xf86-input-void -xf86-video-fbdev -xf86-video-qxl -xf86-video-vmware -xfsprogs -xl2tpd -xorg-apps -xorg-server -xorg-xinit -xorg-xkill -xorg-xrdb -yad -zfs-utils diff --git a/archiso/packages_kde.x86_64 b/archiso/packages_desktop.x86_64 similarity index 100% rename from archiso/packages_kde.x86_64 rename to archiso/packages_desktop.x86_64 diff --git a/archiso/packages_gnome.x86_64 b/archiso/packages_gnome.x86_64 deleted file mode 100644 index ccac74e..0000000 --- a/archiso/packages_gnome.x86_64 +++ /dev/null @@ -1,273 +0,0 @@ -accountsservice -alacritty -alsa-firmware -alsa-plugins -alsa-utils -amd-ucode -arch-install-scripts -archlinux-keyring -b43-fwcutter -base -base-devel -bash-completion -bcachefs-tools -bind -bind-tools -bluez -bluez-utils -boost-libs -brltty -broadcom-wl-dkms -btrfs-progs -cachy-browser -cachyos-calamares-grub -cachyos-cli-installer-new -cachyos-fish-config -cachyos-gnome-settings -cachyos-hello -cachyos-hooks -cachyos-kernel-manager -cachyos-keyring -cachyos-mirrorlist -cachyos-packageinstaller -cachyos-rate-mirrors -cachyos-settings -cachyos-v3-mirrorlist -cachyos-v4-mirrorlist -cachyos-zsh-config -cantarell-fonts -capitaine-cursors -chwd -ckbcomp -clonezilla -cloud-init -cryptsetup -darkhttpd -ddrescue -device-mapper -dex -dhclient -dhcpcd -dialog -diffutils -dmidecode -dmraid -dnsmasq -dosfstools -downgrade -doxygen -e2fsprogs -edk2-shell -efibootmgr -efitools -espeakup -ethtool -exfatprogs -f2fs-tools -fakeroot -fastfetch-git -fatresize -ffmpegthumbnailer -file-roller -fsarchiver -galculator -gdm -git -glances -gnome-autoar -gnome-bluetooth-3.0 -gnome-calculator -gnome-color-manager -gnome-control-center -gnome-desktop -gnome-desktop-4 -gnome-desktop-common -gnome-disk-utility -gnome-firmware -gnome-keyring -gnome-online-accounts -gnome-screenshot -gnome-session -gnome-settings-daemon -gnome-shell -gnome-system-monitor -gnome-themes-extra -gnome-tweaks -gnu-netcat -gpart -gparted -gpm -gptfdisk -grsync -grub -grub-hook -gst-libav -gst-plugin-pipewire -gst-plugins-bad -gst-plugins-ugly -haveged -hdparm -hwdetect -hwinfo -hyperv -imwheel -inetutils -intel-ucode -intltool -inxi -iptables-nft -irssi -iw -iwd -jfsutils -kitty-terminfo -kpmcore -kvantum -ldns -less -lftp -libfido2 -libusb-compat -libwnck3 -libxinerama -linux-atm -linux-cachyos -linux-cachyos-headers -linux-cachyos-nvidia -linux-cachyos-zfs -linux-firmware -linux-firmware-marvell -lsb-release -lsscsi -lvm2 -lynx -man-db -man-pages -mc -mdadm -memtest86+ -memtest86+-efi -mesa -mkinitcpio -mkinitcpio-archiso -mkinitcpio-nfs-utils -mlocate -mobile-broadband-provider-info -modemmanager -mtools -nano -nano-syntax-highlighting -nautilus -nbd -ndisc6 -netctl -net-tools -networkmanager -nfs-utils -nilfs-utils -nmap -noto-fonts -noto-fonts-cjk -nss-mdns -ntfs-3g -ntp -nvidia-utils -nvme-cli -octopi -openconnect -opendesktop-fonts -open-iscsi -openssh -open-vm-tools -openvpn -os-prober -parole -partclone -parted -partimage -paru -pcsclite -pipewire -pipewire-alsa -pipewire-jack -pipewire-pulse -polkit-qt5 -poppler-glib -power-profiles-daemon -ppp -pptpclient -profile-sync-daemon -pv -python -python-defusedxml -qemu-guest-agent -qt5ct -qt5-xmlpatterns -realtime-privileges -refind -reflector -reiserfsprogs -rp-pppoe -rsync -rtkit -rxvt-unicode-terminfo -screen -sdparm -sg3_utils -smartmontools -snapper -sof-firmware -solid5 -spice-vdagent -squashfs-tools -sudo -syslinux -systemd-resolvconf -tcpdump -terminus-font -testdisk -tpm2-tss -ttf-bitstream-vera -ttf-dejavu -ttf-liberation -ttf-opensans -udftools -usb_modeswitch -usbmuxd -usbutils -vim -virtualbox-guest-utils -vpnc -wayland -wayland-protocols -wget -whois -wireless-regdb -wireless_tools -wireplumber -wpa_supplicant -wvdial -xdg-desktop-portal-gnome -xdg-user-dirs-gtk -xdg-utils -xed -xf86-input-elographics -xf86-input-evdev -xf86-input-libinput -xf86-input-synaptics -xf86-input-vmmouse -xf86-input-void -xf86-video-fbdev -xf86-video-qxl -xf86-video-vmware -xfsprogs -xl2tpd -xorg-apps -xorg-server -xorg-xinit -xorg-xinput -xorg-xkill -xorg-xrandr -xorg-xrdb -yad -zfs-utils diff --git a/archiso/packages_openbox.x86_64 b/archiso/packages_openbox.x86_64 deleted file mode 100644 index 310d66e..0000000 --- a/archiso/packages_openbox.x86_64 +++ /dev/null @@ -1,264 +0,0 @@ -accountsservice -adobe-source-han-sans-cn-fonts -adobe-source-han-sans-jp-fonts -adobe-source-han-sans-kr-fonts -adwaita-icon-theme -alacritty -alsa-firmware -alsa-plugins -alsa-utils -amd-ucode -arch-install-scripts -archlinux-keyring -b43-fwcutter -base -base-devel -bash-completion -bind -bind-tools -bluez -bluez-utils -boost-libs -brltty -broadcom-wl-dkms -btrfs-progs -cachy-browser -cachyos-calamares -cachyos-cli-installer-new -cachyos-hello -cachyos-hooks -cachyos-kernel-manager -cachyos-keyring -cachyos-mirrorlist -cachyos-nord-gtk-theme-git -cachyos-openbox-settings -cachyos-packageinstaller -cachyos-rate-mirrors -cachyos-settings -cachyos-v3-mirrorlist -cantarell-fonts -capitaine-cursors -char-white -ckbcomp -clonezilla -cloud-init -cryptsetup -darkhttpd -ddrescue -device-mapper -dex -dhclient -dhcpcd -dialog -diffutils -dmidecode -dmraid -dnsmasq -dosfstools -downgrade -doxygen -e2fsprogs -edk2-shell -efibootmgr -efitools -espeakup -ethtool -exfatprogs -f2fs-tools -fakeroot -fatresize -ffmpegthumbnailer -file-roller -fmt -fsarchiver -galculator -git -glances -gnome-themes-extra -gnu-netcat -gpart -gparted -gpm -gptfdisk -grsync -grub -gst-libav -gst-plugin-pipewire -gst-plugins-bad -gst-plugins-ugly -gtk-engine-murrine -gtk3 -hdparm -hwdetect -hwinfo -hyperv -inetutils -intel-ucode -inxi -iptables-nft -irssi -iw -jfsutils -kitty-terminfo -kvantum-qt5 -less -lftp -libfido2 -libusb-compat -libwnck3 -libxinerama -lightdm -lightdm-gtk-greeter -lightdm-webkit2-greeter -linux-atm -linux-cachyos -linux-cachyos-headers -linux-cachyos-nvidia -linux-cachyos-zfs -linux-firmware -linux-firmware-marvell -livecd-sounds -lsscsi -lvm2 -lynx -make -man-db -man-pages -mc -mdadm -meld -memtest86+ -mesa -mesa-utils -chwd -mkinitcpio -mkinitcpio-archiso -mkinitcpio-nfs-utils -mlocate -modemmanager -mtools -nano -nano-syntax-highlighting -nbd -ndisc6 -net-tools -netctl -network-manager-applet -networkmanager -networkmanager-openvpn -networkmanager-qt -networkmanager-vpnc -nfs-utils -nilfs-utils -nmap -noto-fonts -nss-mdns -ntfs-3g -ntp -nvidia-utils -nvme-cli -octopi -open-iscsi -open-vm-tools -openconnect -opendesktop-fonts -openssh -openvpn -os-prober -parole -partclone -parted -partimage -paru -pavucontrol -pcsclite -perl -pipewire -pipewire-alsa -pipewire-jack -pipewire-pulse -pipewire-v4l2 -pipewire-zeroconf -polkit-qt5 -power-profiles-daemon -ppp -pptpclient -profile-sync-daemon -pv -python -python-defusedxml -qemu-guest-agent -qt5-xmlpatterns -qt5ct -realtime-privileges -refind -reflector -reflector-simple -reiserfsprogs -ristretto -rp-pppoe -rsync -rtkit -rxvt-unicode-terminfo -screen -sdparm -sg3_utils -smartmontools -snapper -sof-firmware -solid -spice-vdagent -squashfs-tools -sudo -sysfsutils -syslinux -systemd-resolvconf -tcpdump -terminus-font -testdisk -tldr -tmux -tpm2-tss -ttf-bitstream-vera -ttf-dejavu -ttf-liberation -ttf-opensans -udftools -usb_modeswitch -usbmuxd -usbutils -vim -virtualbox-guest-utils-nox -vpnc -wayland -wayland-protocols -wget -whois -wireguard-tools -wireless-regdb -wireless_tools -wpa_supplicant -wvdial -xdg-user-dirs-gtk -xdg-utils -xed -xf86-input-libinput -xf86-input-vmmouse -xf86-video-amdgpu -xf86-video-ati -xf86-video-intel -xf86-video-vesa -xf86-video-vmware -xfsprogs -xl2tpd -xorg-apps -xorg-server -xorg-xdpyinfo -xorg-xinit -xorg-xinput -xorg-xkill -xorg-xrandr -xorg-xrdb -yad -zfs-utils -zsh diff --git a/archiso/packages_wayfire.x86_64 b/archiso/packages_wayfire.x86_64 deleted file mode 100644 index 265ffd8..0000000 --- a/archiso/packages_wayfire.x86_64 +++ /dev/null @@ -1,265 +0,0 @@ -accountsservice -adobe-source-han-sans-cn-fonts -adobe-source-han-sans-jp-fonts -adobe-source-han-sans-kr-fonts -adwaita-icon-theme -alacritty -alsa-firmware -alsa-plugins -alsa-utils -amd-ucode -arch-install-scripts -archlinux-keyring -b43-fwcutter -base -base-devel -bash-completion -bind -bind-tools -bluez -bluez-utils -boost-libs -brltty -broadcom-wl-dkms -btrfs-progs -cachy-browser -cachyos-calamares -cachyos-cli-installer-new -cachyos-hello -cachyos-hooks -cachyos-kernel-manager -cachyos-keyring -cachyos-mirrorlist -cachyos-nord-gtk-theme-git -cachyos-packageinstaller -cachyos-rate-mirrors -cachyos-settings -cachyos-v3-mirrorlist -cachyos-wayfire-settings -cantarell-fonts -capitaine-cursors -char-white -ckbcomp -clonezilla -cloud-init -cryptsetup -darkhttpd -ddrescue -device-mapper -dex -dhclient -dhcpcd -dialog -diffutils -dmidecode -dmraid -dnsmasq -dosfstools -downgrade -doxygen -e2fsprogs -edk2-shell -efibootmgr -efitools -espeakup -ethtool -exfatprogs -f2fs-tools -fakeroot -fatresize -ffmpegthumbnailer -file-roller -fmt -fsarchiver -galculator -git -glances -gnome-themes-extra -gnu-netcat -gpart -gparted -gpm -gptfdisk -grsync -grub -gst-libav -gst-plugin-pipewire -gst-plugins-bad -gst-plugins-ugly -gtk-engine-murrine -gtk3 -hdparm -hwdetect -hwinfo -hyperv -inetutils -intel-ucode -inxi -iptables-nft -ipw2100-fw -ipw2200-fw -irssi -iw -jfsutils -kitty-terminfo -kvantum-qt5 -less -lftp -libfido2 -libusb-compat -libwnck3 -libxinerama -lightdm -linux-atm -linux-cachyos -linux-cachyos-headers -linux-cachyos-nvidia -linux-cachyos-zfs -linux-firmware -linux-firmware-marvell -livecd-sounds -lsscsi -lvm2 -lynx -make -man-db -man-pages -mc -mdadm -meld -memtest86+ -mesa -mesa-utils -chwd -mkinitcpio -mkinitcpio-archiso -mkinitcpio-nfs-utils -mlocate -modemmanager -mtools -nano -nano-syntax-highlighting -nbd -ndisc6 -net-tools -netctl -network-manager-applet -networkmanager -networkmanager-openvpn -networkmanager-qt -networkmanager-vpnc -nfs-utils -nilfs-utils -nmap -noto-fonts -nss-mdns -ntfs-3g -ntp -nvidia-utils -nvme-cli -octopi -open-iscsi -open-vm-tools -openconnect -opendesktop-fonts -openssh -openvpn -os-prober -parole -partclone -parted -partimage -paru -pavucontrol -pcsclite -perl -pipewire -pipewire-alsa -pipewire-jack -pipewire-pulse -pipewire-v4l2 -pipewire-zeroconf -polkit-qt5 -power-profiles-daemon -ppp -pptpclient -profile-sync-daemon -pv -python -python-defusedxml -qemu-guest-agent -qt5-xmlpatterns -qt5ct -realtime-privileges -refind -reflector -reflector-simple -reiserfsprogs -ristretto -rp-pppoe -rsync -rtkit -rxvt-unicode-terminfo -screen -sdparm -sg3_utils -smartmontools -snapper -sof-firmware -solid -spice-vdagent -squashfs-tools -sudo -sysfsutils -syslinux -systemd-resolvconf -tcpdump -terminus-font -testdisk -tldr -tmux -tpm2-tss -ttf-bitstream-vera -ttf-dejavu -ttf-liberation -ttf-opensans -udftools -usb_modeswitch -usbmuxd -usbutils -vim -virtualbox-guest-utils-nox -vpnc -wayland -wayland-protocols -wget -whois -wireguard-tools -wireless-regdb -wireless_tools -wireplumber -wpa_supplicant -wvdial -xdg-user-dirs-gtk -xdg-utils -xed -xf86-input-libinput -xf86-input-vmmouse -xf86-video-amdgpu -xf86-video-ati -xf86-video-intel -xf86-video-vesa -xf86-video-vmware -xfsprogs -xl2tpd -xorg-apps -xorg-server -xorg-xdpyinfo -xorg-xinit -xorg-xinput -xorg-xkill -xorg-xrandr -xorg-xrdb -yad -zfs-utils -zsh diff --git a/archiso/packages_xfce.x86_64 b/archiso/packages_xfce.x86_64 deleted file mode 100644 index f08325d..0000000 --- a/archiso/packages_xfce.x86_64 +++ /dev/null @@ -1,304 +0,0 @@ -accountsservice -adobe-source-han-sans-cn-fonts -adobe-source-han-sans-jp-fonts -adobe-source-han-sans-kr-fonts -adwaita-icon-theme -alacritty -alsa-firmware -alsa-plugins -alsa-utils -amd-ucode -arch-install-scripts -archlinux-keyring -b43-fwcutter -base -base-devel -bash-completion -bcachefs-tools -bind -bind-tools -bluez -bluez-utils -boost-libs -brltty -broadcom-wl-dkms -btrfs-progs -cachy-browser -cachyos-calamares-next-grub -cachyos-cli-installer-new -cachyos-fish-config -cachyos-hello -cachyos-hooks -cachyos-kernel-manager -cachyos-keyring -cachyos-mirrorlist -cachyos-nord-gtk-theme-git -cachyos-packageinstaller -cachyos-rate-mirrors -cachyos-settings -cachyos-v3-mirrorlist -cachyos-v4-mirrorlist -cachyos-xfce-settings -cachyos-zsh-config -cantarell-fonts -capitaine-cursors -char-white -chwd -ckbcomp -clonezilla -cloud-init -cryptsetup -darkhttpd -ddrescue -device-mapper -dex -dhclient -dhcpcd -dialog -diffutils -dmidecode -dmraid -dnsmasq -dosfstools -downgrade -doxygen -e2fsprogs -edk2-shell -efibootmgr -efitools -espeakup -ethtool -exfatprogs -f2fs-tools -fakeroot -fatresize -ffmpegthumbnailer -file-roller -fmt -fsarchiver -galculator -git -glances -gnome-themes-extra -gnu-netcat -gpart -gparted -gpm -gptfdisk -grsync -grub -gst-libav -gst-plugin-pipewire -gst-plugins-bad -gst-plugins-ugly -gtk3 -gtk-engine-murrine -hdparm -hwdetect -hwinfo -hyperv -inetutils -intel-ucode -inxi -iptables-nft -irssi -iw -jfsutils -kitty-terminfo -kvantum -ldns -less -lftp -libfido2 -libusb-compat -libwnck3 -libxinerama -lightdm -lightdm-gtk-greeter -lightdm-webkit2-greeter -linux-atm -linux-cachyos -linux-cachyos-headers -linux-cachyos-nvidia -linux-cachyos-zfs -linux-firmware -linux-firmware-marvell -livecd-sounds -lsscsi -lvm2 -lynx -make -man-db -man-pages -mc -mdadm -meld -memtest86+ -mesa -mesa-utils -mkinitcpio -mkinitcpio-archiso -mkinitcpio-nfs-utils -mlocate -modemmanager -mtools -nano -nano-syntax-highlighting -nbd -ndisc6 -netctl -net-tools -networkmanager -network-manager-applet -networkmanager-openvpn -networkmanager-qt5 -networkmanager-vpnc -nfs-utils -nilfs-utils -nmap -noto-fonts -nss-mdns -ntfs-3g -ntp -nvidia-utils -nvme-cli -octopi -openconnect -opendesktop-fonts -open-iscsi -openssh -open-vm-tools -openvpn -os-prober -parole -partclone -parted -partimage -paru -pavucontrol -pcsclite -perl -pipewire -pipewire-alsa -pipewire-jack -pipewire-pulse -pipewire-v4l2 -pipewire-zeroconf -polkit-qt5 -power-profiles-daemon -ppp -pptpclient -profile-sync-daemon -pv -python -python-defusedxml -qemu-guest-agent -qt5ct -qt5-xmlpatterns -realtime-privileges -refind -reflector -reflector-simple -reiserfsprogs -ristretto -rp-pppoe -rsync -rtkit -rxvt-unicode-terminfo -screen -sdparm -sg3_utils -smartmontools -snapper -sof-firmware -solid5 -spice-vdagent -squashfs-tools -sudo -sysfsutils -syslinux -systemd-resolvconf -tcpdump -terminus-font -testdisk -tldr -tmux -tpm2-tss -ttf-bitstream-vera -ttf-dejavu -ttf-liberation -ttf-opensans -udftools -usb_modeswitch -usbmuxd -usbutils -vim -virtualbox-guest-utils-nox -vpnc -wayland -wayland-protocols -wget -whois -wireguard-tools -wireless-regdb -wireless_tools -wpa_supplicant -wvdial -xdg-user-dirs-gtk -xdg-utils -xed -xf86-input-libinput -xf86-input-vmmouse -xf86-video-amdgpu -xf86-video-ati -xf86-video-intel -xf86-video-vesa -xf86-video-vmware -xfce4-appfinder -xfce4-battery-plugin -xfce4-clipman-plugin -xfce4-cpufreq-plugin -xfce4-cpugraph-plugin -xfce4-datetime-plugin -xfce4-dict -xfce4-diskperf-plugin -xfce4-eyes-plugin -xfce4-fsguard-plugin -xfce4-genmon-plugin -xfce4-mailwatch-plugin -xfce4-mount-plugin -xfce4-mpc-plugin -xfce4-netload-plugin -xfce4-notes-plugin -xfce4-notifyd -xfce4-panel -xfce4-power-manager -xfce4-pulseaudio-plugin -xfce4-screensaver -xfce4-screenshooter -xfce4-sensors-plugin -xfce4-session -xfce4-settings -xfce4-smartbookmark-plugin -xfce4-systemload-plugin -xfce4-taskmanager -xfce4-terminal -xfce4-time-out-plugin -xfce4-timer-plugin -xfce4-verve-plugin -xfce4-wavelan-plugin -xfce4-weather-plugin -xfce4-whiskermenu-plugin -xfce4-xkb-plugin -xfsprogs -xl2tpd -xorg-apps -xorg-server -xorg-xdpyinfo -xorg-xinit -xorg-xinput -xorg-xkill -xorg-xrandr -xorg-xrdb -yad -zfs-utils diff --git a/buildiso.sh b/buildiso.sh index a8467a9..d7ca43d 100755 --- a/buildiso.sh +++ b/buildiso.sh @@ -17,7 +17,7 @@ import ${src_dir}/util.sh work_dir="${src_dir}/build" outFolder="${src_dir}/out" -build_list_iso="kde" +build_list_iso="desktop" clean_first=true verbose=false diff --git a/util-iso.sh b/util-iso.sh index 949aed9..7f0ff1c 100755 --- a/util-iso.sh +++ b/util-iso.sh @@ -55,29 +55,6 @@ trap_exit() { kill "-$sig" "$$" } -generate_gdm_config() { - mkdir -p ${src_dir}/archiso/airootfs/etc/gdm - cat << 'EOF' > ${src_dir}/archiso/airootfs/etc/gdm/custom.conf -# GDM configuration storage - -[daemon] -AutomaticLoginEnable=True -# Uncomment the line below to force the login screen to use Xorg -WaylandEnable=false -DefaultSession=gnome-xorg.desktop - -[security] - -[xdmcp] - -[chooser] - -[debug] -# Uncomment the line below to turn on debugging -#Enable=true -EOF -} - generate_motd() { cat << 'EOF' > ${src_dir}/archiso/airootfs/etc/motd This ISO is based on ArchLinux ISO modified to provide Installation Environment for CachyOS. @@ -94,7 +71,7 @@ https://github.com/calamares/calamares Live environment will start now and let you install CachyOS to disk. -Getting help at the forum: https://forum.cachyos.org +Getting help at the forum: https://discuss.cachyos.org Welcome to your CachyOS! @@ -116,14 +93,9 @@ change_grub_version() { generate_environment() { local _profile="$1" - if [ "$_profile" == "kde" ]; then + if [ "$_profile" == "desktop" ]; then cat << 'EOF' > ${src_dir}/archiso/airootfs/etc/environment ZPOOL_VDEV_NAME_PATH=1 -EOF - else - cat << 'EOF' > ${src_dir}/archiso/airootfs/etc/environment -QT_QPA_PLATFORMTHEME=qt5ct -ZPOOL_VDEV_NAME_PATH=1 EOF fi } @@ -141,25 +113,9 @@ prepare_profile(){ generate_motd rm -f ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service - if [ "$profile" == "kde" ]; then - cp ${src_dir}/archiso/packages_kde.x86_64 ${src_dir}/archiso/packages.x86_64 + if [ "$profile" == "desktop" ]; then + cp ${src_dir}/archiso/packages_desktop.x86_64 ${src_dir}/archiso/packages.x86_64 ln -sf /usr/lib/systemd/system/sddm.service ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service - elif [ "$profile" == "gnome" ]; then - rm -f ${src_dir}/archiso/airootfs/etc/motd - rm -rf ${src_dir}/archiso/airootfs/etc/gdm - generate_gdm_config - cp ${src_dir}/archiso/packages_gnome.x86_64 ${src_dir}/archiso/packages.x86_64 - ln -sf /usr/lib/systemd/system/gdm.service ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service - elif [ "$profile" == "xfce" ]; then - cp ${src_dir}/archiso/packages_xfce.x86_64 ${src_dir}/archiso/packages.x86_64 - ln -sf /usr/lib/systemd/system/lightdm.service ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service - elif [ "$profile" == "openbox" ]; then - rm -f ${src_dir}/archiso/airootfs/etc/skel/.Xresources - cp ${src_dir}/archiso/packages_openbox.x86_64 ${src_dir}/archiso/packages.x86_64 - ln -sf /usr/lib/systemd/system/lightdm.service ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service - elif [ "$profile" == "wayfire" ]; then - cp ${src_dir}/archiso/packages_wayfire.x86_64 ${src_dir}/archiso/packages.x86_64 - #ln -sf /usr/lib/systemd/system/lightdm.service ${src_dir}/archiso/airootfs/etc/systemd/system/display-manager.service else die "Unknown profile: [%s]" "${profile}" fi