From 80e41f30711477dfb0a3c03572b23eaa3264aa2a Mon Sep 17 00:00:00 2001 From: Sohrab Behdani Date: Thu, 23 May 2024 14:01:45 +0330 Subject: [PATCH] moved to community --- iso/airootfs/etc/mkinitcpio.conf | 67 ------------------- iso/airootfs/etc/mkinitcpio.d/linux.preset | 3 +- iso/airootfs/etc/mkinitcpio.d/parch | 14 ---- .../entries/01-archiso-x86_64-linux.conf | 2 - .../02-archiso-x86_64-speech-linux.conf | 2 - .../entries/03-archiso-x86_64-ram-linux.conf | 2 - .../04-archiso-x86_64-ram-speech-linux.conf | 2 - iso/efiboot/loader/loader.conf | 2 +- iso/grub/grub.cfg | 4 +- iso/packages.x86_64 | 28 +++++++- iso/pacman.conf | 10 +-- iso/syslinux/archiso_sys-linux.cfg | 18 ++++- 12 files changed, 50 insertions(+), 104 deletions(-) delete mode 100644 iso/airootfs/etc/mkinitcpio.conf delete mode 100644 iso/airootfs/etc/mkinitcpio.d/parch diff --git a/iso/airootfs/etc/mkinitcpio.conf b/iso/airootfs/etc/mkinitcpio.conf deleted file mode 100644 index 9bd30fa..0000000 --- a/iso/airootfs/etc/mkinitcpio.conf +++ /dev/null @@ -1,67 +0,0 @@ -# vim:set ft=sh -# MODULES -# The following modules are loaded before any boot hooks are -# run. Advanced users may wish to specify all system modules -# in this array. For instance: -# MODULES=(piix ide_disk reiserfs) -MODULES=() - -# BINARIES -# This setting includes any additional binaries a given user may -# wish into the CPIO image. This is run last, so it may be used to -# override the actual binaries included by a given hook -# BINARIES are dependency parsed, so you may safely ignore libraries -BINARIES=() - -# FILES -# This setting is similar to BINARIES above, however, files are added -# as-is and are not parsed in any way. This is useful for config files. -FILES=() - -# HOOKS -# This is the most important setting in this file. The HOOKS control the -# modules and scripts added to the image, and what happens at boot time. -# Order is important, and it is recommended that you do not change the -# order in which HOOKS are added. Run 'mkinitcpio -H ' for -# help on a given hook. -# 'base' is _required_ unless you know precisely what you are doing. -# 'udev' is _required_ in order to automatically load modules -# 'filesystems' is _required_ unless you specify your fs modules in MODULES -# Examples: -## This setup specifies all modules in the MODULES setting above. -## No raid, lvm2, or encrypted root is needed. -# HOOKS=(base) -# -## This setup will autodetect all modules for your system and should -## work as a sane default -# HOOKS=(base udev autodetect block filesystems) -# -## This setup will generate a 'full' image which supports most systems. -## No autodetection is done. -# HOOKS=(base udev block filesystems) -# -## This setup assembles a pata mdadm array with an encrypted root FS. -## Note: See 'mkinitcpio -H mdadm' for more information on raid devices. -# HOOKS=(base udev block mdadm encrypt filesystems) -# -## This setup loads an lvm2 volume group on a usb device. -# HOOKS=(base udev block lvm2 filesystems) -# -## NOTE: If you have /usr on a separate partition, you MUST include the -# usr, fsck and shutdown hooks. -HOOKS=(base udev modconf memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard) - -# COMPRESSION -# Use this to compress the initramfs image. By default, gzip compression -# is used. Use 'cat' to create an uncompressed image. -#COMPRESSION="gzip" -#COMPRESSION="bzip2" -COMPRESSION="lzma" -#COMPRESSION="xz" -#COMPRESSION="lzop" -#COMPRESSION="lz4" -#COMPRESSION="zstd" - -# COMPRESSION_OPTIONS -# Additional options for the compressor -#COMPRESSION_OPTIONS=() diff --git a/iso/airootfs/etc/mkinitcpio.d/linux.preset b/iso/airootfs/etc/mkinitcpio.d/linux.preset index 9f67184..7f51749 100644 --- a/iso/airootfs/etc/mkinitcpio.d/linux.preset +++ b/iso/airootfs/etc/mkinitcpio.d/linux.preset @@ -3,6 +3,7 @@ PRESETS=('archiso') ALL_kver='/boot/vmlinuz-linux' -ALL_config='/etc/mkinitcpio.conf' +archiso_config='/etc/mkinitcpio.conf.d/archiso.conf' archiso_image="/boot/initramfs-linux.img" + diff --git a/iso/airootfs/etc/mkinitcpio.d/parch b/iso/airootfs/etc/mkinitcpio.d/parch deleted file mode 100644 index 15878c6..0000000 --- a/iso/airootfs/etc/mkinitcpio.d/parch +++ /dev/null @@ -1,14 +0,0 @@ -# mkinitcpio preset file for the 'linux' package on archiso - -PRESETS=('default' 'fallback') - -ALL_kver='/boot/vmlinuz-linux' -ALL_config='/etc/mkinitcpio.conf' - -#default_config="/etc/mkinitcpio.conf" -default_image="/boot/initramfs-linux.img" -#default_options="" - -#fallback_config="/etc/mkinitcpio.conf" -fallback_image="/boot/initramfs-linux-fallback.img" -fallback_options="-S autodetect" diff --git a/iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index a536117..c724ea3 100644 --- a/iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install medium (x86_64, UEFI) sort-key 01 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index c5270dc..57a5424 100644 --- a/iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install medium (x86_64, UEFI) with speech sort-key 02 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on diff --git a/iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf b/iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf index 1805d1e..4008cdc 100644 --- a/iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf +++ b/iso/efiboot/loader/entries/03-archiso-x86_64-ram-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install medium (x86_64, UEFI, Copy to RAM) sort-key 03 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram diff --git a/iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf b/iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf index f29737c..deba523 100644 --- a/iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf +++ b/iso/efiboot/loader/entries/04-archiso-x86_64-ram-speech-linux.conf @@ -1,7 +1,5 @@ title Parch Linux install medium (x86_64, UEFI, Copy to RAM) with speech sort-key 04 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram accessibility=on diff --git a/iso/efiboot/loader/loader.conf b/iso/efiboot/loader/loader.conf index 982641e..2d137aa 100644 --- a/iso/efiboot/loader/loader.conf +++ b/iso/efiboot/loader/loader.conf @@ -1,3 +1,3 @@ timeout 15 default 01-archiso-x86_64-linux.conf -beep off +beep on diff --git a/iso/grub/grub.cfg b/iso/grub/grub.cfg index 2fdc1ff..8c68f7f 100644 --- a/iso/grub/grub.cfg +++ b/iso/grub/grub.cfg @@ -29,14 +29,14 @@ menuentry "Parch Linux install medium (x86_64, UEFI)" { set gfxpayload=keep search --no-floppy --set=root --label %ARCHISO_LABEL% linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } menuentry "Parch Linux install medium with speakup screen reader (x86_64, UEFI)" --hotkey=s { set gfxpayload=keep search --no-floppy --set=root --label %ARCHISO_LABEL% linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } menuentry "UEFI Shell" { diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index 25d6dc2..0cac14d 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -126,7 +126,7 @@ usb_modeswitch usbmuxd usbutils vim -virtualbox-guest-utils-nox +virtualbox-guest-utils vpnc which wireless-regdb @@ -150,6 +150,7 @@ xreader engrampa unzip unrar +p7zip xfce4-goodies nordzy-cursors nordic-bluish-accent-standard-buttons-theme @@ -159,11 +160,9 @@ xfce-parch #systemutils btop xdg-user-dirs -keepassxc networkmanager network-manager-applet pavucontrol -ttf-dejavu android-file-transfer gvfs-mtp broadcom-wl-dkms @@ -171,6 +170,9 @@ gparted parch-grub fira-code-font fira-code-mono +galculator +catfish +yt-dlp #parchlinuxstuff calamares @@ -188,8 +190,28 @@ parch-wallpapers dracula-gtk-theme bash-completion neofetch-git +fastfetch parch-welcome parch-sddm-theme parch-plymouth plymouth boost +parch-printer +system-config-printer + +#video drivers +xf86-input-elographics +#xf86-input-evdev +xf86-input-libinput +#xf86-input-vmmouse +#xf86-input-void +#xf86-video-amdgpu +#xf86-video-ati +#xf86-video-fbdev +#xf86-video-intel +#xf86-video-nouveau +#xf86-video-openchrome +#xf86-video-vesa +xf86-video-vmware +mesa + diff --git a/iso/pacman.conf b/iso/pacman.conf index 12b4c71..cecd43b 100644 --- a/iso/pacman.conf +++ b/iso/pacman.conf @@ -34,7 +34,7 @@ Architecture = auto #NoProgressBar CheckSpace #VerbosePkgLists -ParallelDownloads = 5 +#ParallelDownloads = 5 # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. @@ -69,6 +69,10 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. +[ppr] +SigLevel = Optional TrustedOnly +Server = https://raw.githubusercontent.com/parchlinux/ppr/main/x86_64/ + #[core-testing] #Include = /etc/pacman.d/mirrorlist @@ -90,10 +94,6 @@ Include = /etc/pacman.d/mirrorlist #[multilib] #Include = /etc/pacman.d/mirrorlist -[ppr] -SigLevel = Optional TrustedOnly -Server = https://raw.githubusercontent.com/parchlinux/ppr/main/x86_64/ - [pcp] SigLevel = Optional TrustedOnly Server = https://raw.githubusercontent.com/parchlinux/pcp/main/x86_64/ diff --git a/iso/syslinux/archiso_sys-linux.cfg b/iso/syslinux/archiso_sys-linux.cfg index aa63aa1..36d9981 100644 --- a/iso/syslinux/archiso_sys-linux.cfg +++ b/iso/syslinux/archiso_sys-linux.cfg @@ -5,7 +5,7 @@ It allows you to install Parch Linux or perform system maintenance. ENDTEXT MENU LABEL Parch Linux install medium (x86_64, BIOS) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% # Accessibility boot option @@ -16,7 +16,7 @@ It allows you to install Parch Linux or perform system maintenance with speech f ENDTEXT MENU LABEL Parch Linux install medium (x86_64, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on # Copy to RAM boot option @@ -27,5 +27,17 @@ It allows you to install Parch Linux or perform system maintenance. ENDTEXT MENU LABEL Parch Linux install medium (x86_64, BIOS, Copy to RAM) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram + + +# compatibility boot option +LABEL arch64compatibility +TEXT HELP +Boot the Parch Linux install medium on BIOS with compatibility mode. +It allows you to install Parch Linux or perform system maintenance. +ENDTEXT +MENU LABEL Parch Linux install medium (x86_64, BIOS, compatibility) +LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodset