diff --git a/archiso/airootfs/etc/pacman-more.conf b/archiso/airootfs/etc/pacman-more.conf index e76e6df..3f1ad05 100755 --- a/archiso/airootfs/etc/pacman-more.conf +++ b/archiso/airootfs/etc/pacman-more.conf @@ -48,48 +48,6 @@ LocalFileSigLevel = Optional # 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 diff --git a/archiso/airootfs/etc/pacman.conf b/archiso/airootfs/etc/pacman.conf index f0dc73d..3c47a16 100755 --- a/archiso/airootfs/etc/pacman.conf +++ b/archiso/airootfs/etc/pacman.conf @@ -50,31 +50,6 @@ LocalFileSigLevel = Optional # 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. - -#[core-testing] -#Include = /etc/pacman.d/mirrorlist [custom] SigLevel = Optional TrustAll @@ -98,10 +73,5 @@ Server = https://mirror.yuyujing.cn/archlinux/os/$arch #[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 diff --git a/archiso/airootfs/etc/skel/.Xresources b/archiso/airootfs/etc/skel/.Xresources deleted file mode 100755 index 368ec2c..0000000 --- a/archiso/airootfs/etc/skel/.Xresources +++ /dev/null @@ -1,34 +0,0 @@ -! ------------------------------------------------------------------------------ -! xterm standard arcolinux theme -! ------------------------------------------------------------------------------ -! https://critical.ch/xterm/ -! ------------------------------------------------------------------------------ - -xterm*faceName: Monospace -xterm*faceSize: 13 -xterm*loginShell: true -xterm*saveLines: 4000 -xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 -xterm*termName: xterm-color -xterm*eightBitInput: false -xterm*foreground: rgb:d9/d4/d4 -xterm*background: rgb:32/32/32 -xterm*color0: rgb:00/00/00 -xterm*color1: rgb:a8/00/00 -xterm*color2: rgb:00/a8/00 -xterm*color3: rgb:a8/54/00 -xterm*color4: rgb:5f/81/9d -xterm*color5: rgb:a8/00/a8 -xterm*color6: rgb:00/a8/a8 -xterm*color7: rgb:70/78/80 -xterm*color8: rgb:54/54/54 -xterm*color9: rgb:fc/54/54 -xterm*color10: rgb:54/fc/54 -xterm*color11: rgb:fc/fc/54 -xterm*color12: rgb:81/a2/be -xterm*color13: rgb:fc/54/fc -xterm*color14: rgb:54/fc/fc -xterm*color15: rgb:c5/c8/c6 -xterm*boldMode: false - - diff --git a/archiso/airootfs/home/smart/.Xresources b/archiso/airootfs/home/smart/.Xresources deleted file mode 100755 index 368ec2c..0000000 --- a/archiso/airootfs/home/smart/.Xresources +++ /dev/null @@ -1,34 +0,0 @@ -! ------------------------------------------------------------------------------ -! xterm standard arcolinux theme -! ------------------------------------------------------------------------------ -! https://critical.ch/xterm/ -! ------------------------------------------------------------------------------ - -xterm*faceName: Monospace -xterm*faceSize: 13 -xterm*loginShell: true -xterm*saveLines: 4000 -xterm*charClass: 33:48,35:48,37:48,43:48,45-47:48,64:48,95:48,126:48 -xterm*termName: xterm-color -xterm*eightBitInput: false -xterm*foreground: rgb:d9/d4/d4 -xterm*background: rgb:32/32/32 -xterm*color0: rgb:00/00/00 -xterm*color1: rgb:a8/00/00 -xterm*color2: rgb:00/a8/00 -xterm*color3: rgb:a8/54/00 -xterm*color4: rgb:5f/81/9d -xterm*color5: rgb:a8/00/a8 -xterm*color6: rgb:00/a8/a8 -xterm*color7: rgb:70/78/80 -xterm*color8: rgb:54/54/54 -xterm*color9: rgb:fc/54/54 -xterm*color10: rgb:54/fc/54 -xterm*color11: rgb:fc/fc/54 -xterm*color12: rgb:81/a2/be -xterm*color13: rgb:fc/54/fc -xterm*color14: rgb:54/fc/fc -xterm*color15: rgb:c5/c8/c6 -xterm*boldMode: false - - diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 904fb8b..f64077e 100755 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -52,25 +52,19 @@ else fi # Set default menu entry -default=BBTTMS +default=bbttms timeout=15 timeout_style=menu # Menu entries -menuentry "BBTTMS Linux install (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { +menuentry "BBTTMS Linux install (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'bbttms' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n quiet splash plymouth.uuid=%ARCHISO_UUID% initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img } -menuentry "BBTTMS Linux install with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n quiet splash plymouth.uuid=%ARCHISO_UUID% - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -} - if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { diff --git a/archiso/grub/loopback.cfg b/archiso/grub/loopback.cfg index fc84cd3..3d7ffd1 100755 --- a/archiso/grub/loopback.cfg +++ b/archiso/grub/loopback.cfg @@ -21,26 +21,19 @@ else fi # Set default menu entry -default=archlinux +default=bbttms timeout=15 timeout_style=menu # Menu entries -menuentry "BBTTMS Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { +menuentry "BBTTMS Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'bbttms' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img } -menuentry "BBTTMS Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on - initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -} - - if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { set gfxpayload=800x600,1024x768 diff --git a/up+.sh b/up+.sh index f8b9d6a..df4b6e7 100755 --- a/up+.sh +++ b/up+.sh @@ -1,31 +1,5 @@ #!/bin/bash #set -e -################################################################################################################## -# Author : Erik Dubois -# Website : https://www.erikdubois.be -# Website : https://www.alci.online -# Website : https://www.ariser.eu -# Website : https://www.arcolinux.info -# Website : https://www.arcolinux.com -# Website : https://www.arcolinuxd.com -# Website : https://www.arcolinuxb.com -# Website : https://www.arcolinuxiso.com -# Website : https://www.arcolinuxforum.com -################################################################################################################## -# -# DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. -# -################################################################################################################## -#tput setaf 0 = black -#tput setaf 1 = red -#tput setaf 2 = green -#tput setaf 3 = yellow -#tput setaf 4 = dark blue -#tput setaf 5 = purple -#tput setaf 6 = cyan -#tput setaf 7 = gray -#tput setaf 8 = light blue -################################################################################################################## # reset - commit your changes or stash them before you merge # git reset --hard - personal alias - grh