From d7df831e841c17309a3dc1835a388cd4dace6cab Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Tue, 9 Feb 2021 10:45:24 +0100 Subject: [PATCH] less complexity will benefit all --- archiso/arcolinux-chaotic-pacman.conf | 129 --------------- archiso/arcolinux-pacman.conf | 122 --------------- archiso/chaotic-pacman.conf | 113 -------------- archiso/example-packages.x86_64 | 217 -------------------------- archiso/no-extra-pacman.conf | 107 ------------- archiso/original-packages.x86_64 | 217 -------------------------- archiso/pacman.conf | 16 ++ 7 files changed, 16 insertions(+), 905 deletions(-) delete mode 100644 archiso/arcolinux-chaotic-pacman.conf delete mode 100644 archiso/arcolinux-pacman.conf delete mode 100644 archiso/chaotic-pacman.conf delete mode 100644 archiso/example-packages.x86_64 delete mode 100644 archiso/no-extra-pacman.conf delete mode 100644 archiso/original-packages.x86_64 diff --git a/archiso/arcolinux-chaotic-pacman.conf b/archiso/arcolinux-chaotic-pacman.conf deleted file mode 100644 index 79c07ab..0000000 --- a/archiso/arcolinux-chaotic-pacman.conf +++ /dev/null @@ -1,129 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -#TotalDownload -# We cannot check disk space from within a chroot environment -#CheckSpace -#VerbosePkgLists - -# 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. -SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[arcolinux_repo_testing] -#SigLevel = Required DatabaseOptional -#Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo] -SigLevel = Required DatabaseOptional -Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo_3party] -SigLevel = Required DatabaseOptional -Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo_xlarge] -SigLevel = Required DatabaseOptional -Include = /etc/pacman.d/arcolinux-mirrorlist - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -[multilib] -Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs - -[alci_repo] -SigLevel = Optional TrustedOnly -Server = https://arcolinuxiso.github.io/$repo/$arch - -#more repositories here : -#https://wiki.archlinux.org/index.php/unofficial_user_repositories - -#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 -[chaotic-aur] -Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/archiso/arcolinux-pacman.conf b/archiso/arcolinux-pacman.conf deleted file mode 100644 index 975a5c7..0000000 --- a/archiso/arcolinux-pacman.conf +++ /dev/null @@ -1,122 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -#TotalDownload -# We cannot check disk space from within a chroot environment -#CheckSpace -#VerbosePkgLists - -# 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. -SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[arcolinux_repo_testing] -#SigLevel = Required DatabaseOptional -#Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo] -SigLevel = Required DatabaseOptional -Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo_3party] -SigLevel = Required DatabaseOptional -Include = /etc/pacman.d/arcolinux-mirrorlist - -[arcolinux_repo_xlarge] -SigLevel = Required DatabaseOptional -Include = /etc/pacman.d/arcolinux-mirrorlist - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -[multilib] -Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs - -[alci_repo] -SigLevel = Optional TrustedOnly -Server = https://arcolinuxiso.github.io/$repo/$arch \ No newline at end of file diff --git a/archiso/chaotic-pacman.conf b/archiso/chaotic-pacman.conf deleted file mode 100644 index 9342258..0000000 --- a/archiso/chaotic-pacman.conf +++ /dev/null @@ -1,113 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -#TotalDownload -# We cannot check disk space from within a chroot environment -#CheckSpace -#VerbosePkgLists - -# 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. -SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -[multilib] -Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs - -[alci_repo] -SigLevel = Optional TrustedOnly -Server = https://arcolinuxiso.github.io/$repo/$arch - -#more repositories here : -#https://wiki.archlinux.org/index.php/unofficial_user_repositories - -#remember to add chaotic-mirrorlist and chaotic-keyring to the packages.x86_64 -[chaotic-aur] -Include = /etc/pacman.d/chaotic-mirrorlist diff --git a/archiso/example-packages.x86_64 b/archiso/example-packages.x86_64 deleted file mode 100644 index b89cb27..0000000 --- a/archiso/example-packages.x86_64 +++ /dev/null @@ -1,217 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later -alsa-utils -amd-ucode -arch-install-scripts -b43-fwcutter -base -bind-tools -brltty -broadcom-wl -btrfs-progs -clonezilla -cloud-init -crda -darkhttpd -ddrescue -dhclient -dhcpcd -diffutils -dmraid -dnsmasq -dosfstools -edk2-shell -efibootmgr -espeakup -ethtool -exfatprogs -f2fs-tools -fatresize -fsarchiver -gnu-netcat -gpart -gpm -gptfdisk -grml-zsh-config -haveged -hdparm -intel-ucode -ipw2100-fw -ipw2200-fw -irssi -iwd -jfsutils -kitty-terminfo -lftp -linux -linux-atm -linux-firmware -livecd-sounds -lsscsi -lvm2 -lynx -man-db -man-pages -mc -mdadm -memtest86+ -mkinitcpio -mkinitcpio-archiso -mkinitcpio-nfs-utils -mtools -nano -nbd -ndisc6 -nfs-utils -nilfs-utils -nmap -ntfs-3g -nvme-cli -openconnect -openssh -openvpn -partclone -parted -partimage -ppp -pptpclient -reflector -reiserfsprogs -rp-pppoe -rsync -rxvt-unicode-terminfo -sdparm -sg3_utils -smartmontools -squashfs-tools -sudo -syslinux -systemd-resolvconf -tcpdump -terminus-font -termite-terminfo -testdisk -tmux -udftools -usb_modeswitch -usbutils -vim -vpnc -wireless-regdb -wireless_tools -wpa_supplicant -wvdial -xfsprogs -xl2tpd -zsh - - -# everything above comes from archiso releng folder -####################################################### -### ALCI ### -####################################################### - -####################################################### -### PACKAGES THAT ARE REMOVED AFTER INSTALLATION ### -### VIA CALAMARES CONFIG ### -####################################################### - -sddm - -alci-dwm -#alci-dwm-nemesis -alci-calamares -#alci-calamares-config -alci-calamares-config-dev -xterm - -####################################################### -### PACKAGES THAT STAY AFTER INSTALLATION ### -####################################################### - -bash-completion -grub -os-prober -dex -libxinerama -make -xorg-xkill -xterm -xorg-xrdb - -##### you can also use nmtui from the terminal -networkmanager -network-manager-applet - -####################################################### -### EXTRAS ### -####################################################### - -##### xorg applications - -xorg-server -xorg-apps - - - -##### Drivers for graphical cards - -#xf86-video-intel -#xf86-video-amdgpu -#xf86-video-nouveau - -#nvidia -#nvidia-settings -#nvidia-utils - - - -##### lightdm display manager - -lightdm -lightdm-gtk-greeter - -##### sddm display manager - -#sddm - -##### gdm display manager - -#gdm - - - -##### want to have base-devel group - -base-devel - -##### want to have linux-headers - -linux-headers - - - -##### want to have a desktop - -#test -xfce4 -xfce4-goodies -neofetch - - - -##### want to add/use the ArcoLinux repos - -arcolinux-mirrorlist-git -arcolinux-keyring - -#test -arcolinux-wallpapers-git - -##### want to add/use the Chaotic repo - -chaotic-mirrorlist -chaotic-keyring - -#test -xcursor-sweet diff --git a/archiso/no-extra-pacman.conf b/archiso/no-extra-pacman.conf deleted file mode 100644 index ba93379..0000000 --- a/archiso/no-extra-pacman.conf +++ /dev/null @@ -1,107 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives -# -# SPDX-License-Identifier: GPL-3.0-or-later - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -#Color -#TotalDownload -# We cannot check disk space from within a chroot environment -#CheckSpace -#VerbosePkgLists - -# 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. -SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -#[multilib] -#Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs - -[alci_repo] -SigLevel = Optional TrustedOnly -Server = https://arcolinuxiso.github.io/$repo/$arch - diff --git a/archiso/original-packages.x86_64 b/archiso/original-packages.x86_64 deleted file mode 100644 index b327587..0000000 --- a/archiso/original-packages.x86_64 +++ /dev/null @@ -1,217 +0,0 @@ -# -# SPDX-License-Identifier: GPL-3.0-or-later -alsa-utils -amd-ucode -arch-install-scripts -b43-fwcutter -base -bind-tools -brltty -broadcom-wl -btrfs-progs -clonezilla -cloud-init -crda -darkhttpd -ddrescue -dhclient -dhcpcd -diffutils -dmraid -dnsmasq -dosfstools -edk2-shell -efibootmgr -espeakup -ethtool -exfatprogs -f2fs-tools -fatresize -fsarchiver -gnu-netcat -gpart -gpm -gptfdisk -grml-zsh-config -haveged -hdparm -intel-ucode -ipw2100-fw -ipw2200-fw -irssi -iwd -jfsutils -kitty-terminfo -lftp -linux -linux-atm -linux-firmware -livecd-sounds -lsscsi -lvm2 -lynx -man-db -man-pages -mc -mdadm -memtest86+ -mkinitcpio -mkinitcpio-archiso -mkinitcpio-nfs-utils -mtools -nano -nbd -ndisc6 -nfs-utils -nilfs-utils -nmap -ntfs-3g -nvme-cli -openconnect -openssh -openvpn -partclone -parted -partimage -ppp -pptpclient -reflector -reiserfsprogs -rp-pppoe -rsync -rxvt-unicode-terminfo -sdparm -sg3_utils -smartmontools -squashfs-tools -sudo -syslinux -systemd-resolvconf -tcpdump -terminus-font -termite-terminfo -testdisk -tmux -udftools -usb_modeswitch -usbutils -vim -vpnc -wireless-regdb -wireless_tools -wpa_supplicant -wvdial -xfsprogs -xl2tpd -zsh - - -# everything above comes from archiso releng folder -####################################################### -### ALCI ### -####################################################### - -####################################################### -### PACKAGES THAT ARE REMOVED AFTER INSTALLATION ### -### VIA CALAMARES CONFIG ### -####################################################### - -sddm - -alci-dwm -#alci-dwm-nemesis -alci-calamares -#alci-calamares-config -alci-calamares-config-dev -xterm - -####################################################### -### PACKAGES THAT STAY AFTER INSTALLATION ### -####################################################### - -bash-completion -grub -os-prober -dex -libxinerama -make -xorg-xkill -xterm -xorg-xrdb - -##### you can also use nmtui from the terminal -networkmanager -network-manager-applet - -####################################################### -### EXTRAS ### -####################################################### - -##### xorg applications - -#xorg-server -#xorg-apps - - - -##### Drivers for graphical cards - -#xf86-video-intel -#xf86-video-amdgpu -#xf86-video-nouveau - -#nvidia -#nvidia-settings -#nvidia-utils - - - -##### lightdm display manager - -#lightdm -#lightdm-gtk-greeter - -##### sddm display manager - -#sddm - -##### gdm display manager - -#gdm - - - -##### want to have base-devel group - -#base-devel - -##### want to have linux-headers - -#linux-headers - - - -##### want to have a desktop - -#test -#xfce4 -#xfce4-goodies -#neofetch - - - -##### want to add/use the ArcoLinux repos - -#arcolinux-mirrorlist-git -#arcolinux-keyring - -#test -#arcolinux-wallpapers-git - -##### want to add/use the Chaotic repo - -#chaotic-mirrorlist -#chaotic-keyring - -#test -#xcursor-sweet diff --git a/archiso/pacman.conf b/archiso/pacman.conf index ca18b4d..448bb5b 100644 --- a/archiso/pacman.conf +++ b/archiso/pacman.conf @@ -71,6 +71,22 @@ 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. +#[arcolinux_repo_testing] +#SigLevel = Required DatabaseOptional +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo] +#SigLevel = Required DatabaseOptional +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_3party] +#SigLevel = Required DatabaseOptional +#Include = /etc/pacman.d/arcolinux-mirrorlist + +#[arcolinux_repo_xlarge] +#SigLevel = Required DatabaseOptional +#Include = /etc/pacman.d/arcolinux-mirrorlist + #[testing] #Include = /etc/pacman.d/mirrorlist