qt6ct

I may have nuked one or the other package, please review.

Reviewed-on: #9
Co-authored-by: artoo <artoo@artixlinux.org>
Co-committed-by: artoo <artoo@artixlinux.org>

TODO

@@ -1,5 +1,23 @@
 TO-{DO,FIX} LIST
 
+22-01-29
+community editions don't use common/etc/hostname
+
+
+21-12-XX
+FIXED community-gtk: installed system user autologins
+FIXED community-qt: LXQt is unresponsive at live boot; needs sddm restart to work
+DONE lxqt: default icon theme is mate, must be breeze
+FIXED xfce-suite66 calamares fails
+FIXED lxde-s6 calamares fails
+DONE lxde screenshot set to scrot
+FIXED autologin: runit
+FIXED no-autologin: dinit, openrc, s6, suite66
+FIXED calamares fail: lxde
+FIXED lxqt 'frozen' widgets: 
+
+21-11-01
+========
 DONE = Symlinks in profiles are dereferenced, move 80-net-link-something.rules into package
 = Move some stuff out of the profiles into packages
 DONE  |_ Desktop settings -> artix-$DE-presets
@@ -12,21 +30,26 @@ Openbox not deleted from xsessions <-- see next
 DONE Make rc.local execute stuff in /etc/local.d under runit/s6:
      ls -l /sbin/init | sed 's/.*->\ \(.*\)-init/\1/'
 DONE mimeapps.list must be separate for each profile
-
 DONE Networkmanager in LXQt
 DONE GRUB remove 1280x1024
 
+2021-10-15
+==========
+DONE Fix libreoffice-7 bright side-pane; perhaps related, /etc/profile.d/libreoffice-fresh.sh: SAL_USE_VCLPLUGIN=gtk3 spurts (soffice:5766): Gtk-WARNING **: Theme parsing error: gtk.css:14:33: Failed to import: Error opening file /home/artix/.config/gtk-3.0/window_decorations.css: No such file or directory
+DONE Plasma is getting fucked-up with QT_* set to gtk; see kinfocenter - the alternative kvantum-dark has ugly widgets
+
 2020-03-08
 ==========
-
 DONE Use firefox-dark-reader instead of local/skel profile's
 DONE Also consider a few more addons from the group
 DONE Test firefox before releasing
 
 2020-04-18
+==========
 DONE XFCE4 profile
 
 2020-06-08
+==========
 Autologin-session selection
 Cinnamon fonts should change to Roboto 11 instead of M$ ones, for consistency
 DONE Remove screengrab from plasma
@@ -38,6 +61,4 @@ community-qt still boots into LXQt
 DONE The SDDM theme could use some darkening
 DONE Perhaps add man-pages to the ISOs
 
-2020-10-15
+DONE Fix plasma desktop icons (~/.local/share/.....)
-Fix libreoffice-7 bright side-pane; perhaps related, /etc/profile.d/libreoffice-fresh.sh: SAL_USE_VCLPLUGIN=gtk3 spurts (soffice:5766): Gtk-WARNING **: Theme parsing error: gtk.css:14:33: Failed to import: Error opening file /home/artix/.config/gtk-3.0/window_decorations.css: No such file or directory
-Plasma is getting fucked-up with QT_* set to gtk; see kinfocenter - the alternative kvantum-dark has ugly widgets

base/Packages-Root

@@ -1,111 +1,8 @@
-base
+# loads by default common/packages-{base,apps}
-@openrc elogind-openrc
-@runit elogind-runit
-@s6 elogind-s6
-acpi
-b43-fwcutter
-btrfs-progs
-crda
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-exfat-utils
-f2fs-tools
-grub
-inetutils
-iptables
-ipw2100-fw
-ipw2200-fw
-jfsutils
-linux
-linux-headers
-linux-firmware
-logrotate
-lsb-release
-man-db
-man-pages
-memtest86+
-mkinitcpio
-mkinitcpio-openswap
-nano
-vi
-net-tools
-ntfs-3g
-@openrc acpid-openrc
-@openrc cronie-openrc
-@openrc cryptsetup-openrc
-@openrc dhcpcd-openrc
-@openrc haveged-openrc
-@openrc lvm2-openrc
-@openrc mdadm-openrc
-@openrc nfs-utils-openrc
-@openrc rsync-openrc
-@openrc openssh-openrc
-@openrc wpa_supplicant-openrc
-@openrc metalog-openrc
-@runit acpid-runit
-@runit cronie-runit
-@runit cryptsetup-runit
-@runit dhcpcd-runit
-@runit haveged-runit
-@runit lvm2-runit
-@runit mdadm-runit
-@runit nfs-utils-runit
-@runit rsync-runit
-@runit openssh-runit
-@runit wpa_supplicant-runit
-@runit metalog-runit
-@s6 acpid-s6
-@s6 cronie-s6
-@s6 cryptsetup-s6
-@s6 dhcpcd-s6
-@s6 haveged-s6
-@s6 lvm2-s6
-@s6 mdadm-s6
-@s6 nfs-utils-s6
-@s6 rsync-s6
-@s6 openssh-s6
-@s6 wpa_supplicant-s6
-@s6 metalog-s6
-os-prober
-reiserfsprogs
-s-nail
-sudo
-sysfsutils
-texinfo
-usbutils
-which
-efibootmgr
-xfsprogs
-zsh
-modemmanager
-usb_modeswitch
 
 mkinitcpio-nfs-utils
 squashfs-tools
-nbd
-
-@openrc artix-live-openrc
-@runit artix-live-runit
-@s6 artix-live-s6
-
-@openrc connman-openrc
-@openrc ntp-openrc
-@openrc bluez-openrc
-@runit connman-runit
-@runit ntp-runit
-@runit bluez-runit
-@s6 connman-s6
-@s6 ntp-s6
-@s6 bluez-s6
-
-intel-ucode
-amd-ucode
 
 artix-grub-live
-artix-grub-theme
+
-artix-branding-base
+artix-live-@initsys@

base/profile.conf

@@ -1,25 +1,17 @@
 ################ install ################
 
-# default displaymanager: none
-# supported: lightdm, sddm, gdm, lxdm, mdm
-# DISPLAYMANAGER="none"
-
-# Set to false to disable autologin in the livecd
-AUTOLOGIN="false"
-
 # start services
-SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
+# bluetoothd, cupsd, DM are added to the pkglist dynamicly
+# metalog or syslog-ng is added to the pkglist dynamicly
+# connmand or NetworkManager is added to the pkglist dynamicly
+# only added if in array, these pkgs have no list entry
 
-# default group membership
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'connmand')
-# ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
 
 ################# live-session #################
 
-# default value
-# HOST_NANE="artix"
-
-# default value
-# USER_NAME="artix"
-
 # default value
 # PASSWORD="artix"
+
+# Set to false to disable autologin in the live session
+AUTOLOGIN="false"

base/root-overlay/etc/default/grub

@@ -48,3 +48,6 @@ GRUB_THEME="/usr/share/grub/themes/artix/theme.txt"
 GRUB_SAVEDEFAULT="true"
 
 GRUB_DISABLE_LINUX_RECOVERY="true"
+
+# Probe for other installed operating systems
+GRUB_DISABLE_OS_PROBER="false"

buildISOs-weekly-cron.sh

@@ -2,7 +2,7 @@
 
 # Automated ISO build script
 # Builds all profiles, all inits and rsyncs to ISO download server
-# 2019-2020, nous
+# 2019-2021, nous
 
 export TERM=xterm-256color
 source /usr/share/makepkg/util/message.sh
@@ -12,7 +12,7 @@ WORKSPACE=/home/$USER/artools-workspace
 PROFILES=${WORKSPACE}/iso-profiles
 REPO=/srv/iso/weekly-iso
 #RSYNCARGS="-au --delete-after --bwlimit=5M"
-RSYNCARGS="-au --delete-after"
+RSYNCARGS="-au --delete-before"
 CWD=$PROFILES
 DATE=$(date +"%Y%m%d")
 
@@ -27,8 +27,9 @@ else
 fi
 
 cd $PROFILES
-all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|logs|community$" | sort))
+all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|logs|lowmem|anon|gnome|i3|community$" | sort))
-all_inits=('openrc' 'runit' 's6')
+#all_inits=('openrc' 'runit' 's6' 'suite66' 'dinit')
+all_inits=('openrc' 'runit' 's6' 'dinit')
 
 usage() {
     echo
@@ -59,8 +60,8 @@ echo "		branch		${BOLD}${_branch}${ALL_OFF}"
 echo "		profiles 	${GREEN}${profiles[@]}${ALL_OFF}"
 echo "		inits		${CYAN}${inits[@]}${ALL_OFF}"
 
-echo "REMOVING EXISTING ISOs IN 10 SECONDS!"
+echo -n "REMOVING EXISTING ISOs IN 10 SECONDS!   "; i=9; while [ $i -ne 0 ]; do echo -n "$i "; let i--; sleep 1; done
-sleep 10
+echo
 rm -fr $REPO/* &
 
 cd $PROFILES && git checkout master
@@ -70,7 +71,7 @@ for profile in ${profiles[@]}; do
         logfile_debug=$logfile-$profile-$init
         echo "#################################" >> $logfile.log
         stamp=$(timestamp)
-        [[ $profile =~ 'community' ]] && [[ $init == 'runit' || $init == 's6' ]] && \
+        [[ $profile =~ 'community' ]] && [[ $init != 'openrc' ]] && \
             { echo "$stamp == ${YELLOW}Skipping building ${_branch} $profile ISO with $init${ALL_OFF}" >> $logfile.log; continue; }
         echo "$stamp == Begin building    ${_branch} $profile ISO with $init" >> $logfile.log
         [[ $init == 'openrc' ]] && cp -f ${PROFILES}/rc.conf ${PROFILES}/$profile/root-overlay/etc/
@@ -104,7 +105,7 @@ for profile in ${profiles[@]}; do
 done
 # Redundancy tasks
 rm -f ${PROFILES}/*/root-overlay/etc/{rc.conf,buildinfo}
-rm -f ${REPO}/artix-*community*{runit,s6}*.iso
+rm -f ${REPO}/artix-*community*{runit,s6,dinit}*.iso
 port=$(cat $WORKSPACE/port)
-rsync $RSYNCARGS ${REPO}/ nous@iso.artixlinux.org:/srv/iso/weekly-iso/ -e "ssh -p $port"
 rsync $RSYNCARGS ${REPO}/ nous@download.artixlinux.org:/srv/iso/weekly-iso/ -e "ssh -p $port"
+rsync $RSYNCARGS ${REPO}/ nous@iso.artixlinux.org:/srv/iso/weekly-iso/ -e "ssh -p $port"

buildISOs-weekly.sh

@@ -2,7 +2,7 @@
 
 # Automated ISO build script
 # Builds select profiles / inits
-# 2019-2020, nous
+# 2019-2021, nous
 
 export TERM=xterm-256color
 source /usr/share/makepkg/util/message.sh
@@ -25,8 +25,9 @@ else
 fi
 
 cd $PROFILES
-all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|logs|community$" | sort))
+all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|logs|lowmem|anon|gnome|i3|community$" | sort))
-all_inits=('openrc' 'runit' 's6')
+all_inits=('openrc' 'runit' 's6' 'suite66' 'dinit')
+all_inits=('openrc' 'runit' 's6' 'dinit')
 
 usage() {
     echo
@@ -92,7 +93,7 @@ for profile in ${profiles[@]}; do
         logfile_debug=$logfile-$profile-$init
         echo "#################################" >> ${logfile}.log
         stamp=$(timestamp)
-        [[ $profile =~ 'community' ]] && [[ $init == 'runit' || $init == 's6' ]] && \
+        [[ $profile =~ 'community' ]] && [[ $init != 'openrc' ]] && \
             { echo "$stamp == ${YELLOW}Skipping building ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log; continue; }
         echo "$stamp == Begin building    ${_branch} ${profile}-${init}" >> $logfile.log
         [[ $init == 'openrc' ]] && cp ${WORKSPACE}/tweaks/rc.conf ${PROFILES}/$profile/root-overlay/etc/
@@ -120,7 +121,7 @@ for profile in ${profiles[@]}; do
         sudo rm -fr /var/lib/artools/buildiso/$profile
 #        [[ $res == 0 ]]	&& { echo "$stamp == ${GREEN}Finished building ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log; } \
 #                        || { echo "$stamp == ${RED}Failed building   ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log; continue; }
-        mv -v ${WORKSPACE}/iso/$profile/artix-$profile-$init-*.iso ${REPO}/
+        mv -v ${WORKSPACE}/iso/$profile/artix-$profile-$init-*.iso ${REPO}/ 2>/dev/null
         cd $REPO && { sha256sum artix-*.iso > ${REPO}/sha256sums & }
     done
 done

buildISOs.sh

@@ -13,7 +13,7 @@ CWD=`pwd`
 
 cd $PROFILES
 all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|community$" | sort))
-all_inits=('openrc' 'runit' 's6')
+all_inits=('openrc' 'runit' 's6' 'suite66')
 
 usage() {
     echo
@@ -55,7 +55,7 @@ while getopts "b:p:i:" option; do
         i)
             _init=$OPTARG
             for i in ${all_inits[@]}; do
-                [[ ${_init} =~ $i ]] && inits+=($i)
+                [[ ${_init} == $i ]] && inits+=($i)
             done
             [[ ${_init} == all ]]    && inits=(${all_inits[@]})
             ;;

cinnamon/Packages-Live

@@ -2,22 +2,19 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd
 
-@openrc artix-live-openrc
-@runit artix-live-runit
-@s6 artix-live-s6
-
 calamares-branding
 gparted
 
 artix-grub-live
 artix-grub-theme
 
-virtualbox-guest-modules-artix
 virtualbox-guest-utils
-#open-vm-tools
+
 broadcom-wl
 
 intel-ucode
 amd-ucode
 artix-docs
 hexchat
+
+artix-live-@initsys@

cinnamon/Packages-Root

@@ -1,155 +1,4 @@
-base
+# loads by default common/packages-{base,apps,xorg}
-@openrc elogind-openrc
-@runit elogind-runit
-@s6 elogind-s6
-acpi
-b43-fwcutter
-btrfs-progs
-crda
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-exfat-utils
-f2fs-tools
-grub
-htop
-inetutils
-iptables
-ipw2100-fw
-ipw2200-fw
-jfsutils
-linux
-linux-headers
-linux-firmware
-logrotate
-lsb-release
-man-db
-man-pages
-memtest86+
-mkinitcpio
-mkinitcpio-openswap
-nano
-vi
-net-tools
-ntfs-3g
-@openrc acpid-openrc
-@openrc cronie-openrc
-@openrc cryptsetup-openrc
-@openrc dhcpcd-openrc
-@openrc haveged-openrc
-@openrc lvm2-openrc
-@openrc mdadm-openrc
-@openrc nfs-utils-openrc
-@openrc rsync-openrc
-@openrc openssh-openrc
-@openrc wpa_supplicant-openrc
-@openrc syslog-ng-openrc
-@runit acpid-runit
-@runit cronie-runit
-@runit cryptsetup-runit
-@runit dhcpcd-runit
-@runit haveged-runit
-@runit lvm2-runit
-@runit mdadm-runit
-@runit nfs-utils-runit
-@runit rsync-runit
-@runit openssh-runit
-@runit wpa_supplicant-runit
-@runit syslog-ng-runit
-@s6 acpid-s6
-@s6 cronie-s6
-@s6 cryptsetup-s6
-@s6 dhcpcd-s6
-@s6 haveged-s6
-@s6 lvm2-s6
-@s6 mdadm-s6
-@s6 nfs-utils-s6
-@s6 rsync-s6
-@s6 openssh-s6
-@s6 wpa_supplicant-s6
-@s6 syslog-ng-s6
-os-prober
-reiserfsprogs
-s-nail
-sudo
-sysfsutils
-texinfo
-usbutils
-which
-efibootmgr
-xfsprogs
-zsh
-
-alsa-firmware
-powertop
-inxi
-modemmanager
-usb_modeswitch
-
-@openrc alsa-utils-openrc
-@openrc avahi-openrc
-@openrc networkmanager-openrc
-@openrc displaymanager-openrc
-@openrc ntp-openrc
-@openrc openrc-settingsd
-@openrc bluez-openrc
-@runit alsa-utils-runit
-@runit avahi-runit
-@runit bluez-runit
-@runit networkmanager-runit
-@runit ntp-runit
-@runit lightdm-runit
-@runit blocaled
-@s6 blocaled
-@s6 alsa-utils-s6
-@s6 avahi-s6
-@s6 bluez-s6
-@s6 networkmanager-s6
-@s6 ntp-s6
-@s6 lightdm-s6
-
-librabbitmq-c
-libmongoc
-
-terminus-font
-ttf-droid
-ttf-roboto
-ttf-roboto-mono
-ttf-inconsolata
-ttf-liberation
-
-xdg-user-dirs
-xdg-utils
-
-xorg-server
-xorg-xinit
-xorg-xhost
-
-xf86-input-vmmouse
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
-# Core ISO packages end here
-
-# Branding
-artix-grub-theme
-artix-dark-theme
-artix-branding-base
-artix-gtk-presets
-artix-qt-presets
-xcursor-premium
 
 # Cinnamon
 cinnamon
@@ -171,15 +20,10 @@ nemo-seahorse
 nemo-share
 xcursor-vanilla-dmz
 
-# Basic usability apps
-leafpad
-midori
-atril
 lightdm-gtk-greeter
 light-locker
-mpv
+
-ffmpegthumbnailer
+# GTK
-ffmpegthumbs
+epiphany
-raw-thumbnailer
+leafpad
-qt5-imageformats
+atril
-gvfs-mtp

cinnamon/profile.conf

@@ -1,25 +1,17 @@
 ################ install ################
 
-# default displaymanager: none
-# supported: lightdm, sddm, gdm, lxdm, mdm
-DISPLAYMANAGER="lightdm"
-
-# Set to false to disable autologin in the livecd
-AUTOLOGIN="true"
-
 # start services
-SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager')
+# bluetoothd, cupsd, DM are added to the pkglist dynamicly
+# metalog or syslog-ng is added to the pkglist dynamicly
+# connmand or NetworkManager is added to the pkglist dynamicly
+# only added if in array, these pkgs have no list entry
 
-# default group membership
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'NetworkManager' 'lightdm')
-ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
 
 ################# live-session #################
 
-# unset defaults to given value
-# HOST_NAME="artix"
-
-# unset defaults to given value
-# USER_NAME="artix"
-
 # unset defaults to given value
 # PASSWORD="artix"
+
+# Set to false to disable autologin in the live session
+AUTOLOGIN="true"

cinnamon/root-overlay/etc/lightdm/lightdm.conf

@@ -26,7 +26,7 @@
 #lock-memory=true
 #user-authority-in-system-dir=false
 #guest-account-script=guest-account
-#logind-check-graphical=false
+logind-check-graphical=true
 #log-directory=/var/log/lightdm
 run-directory=/run/lightdm
 #cache-directory=/var/cache/lightdm

common/Packages-apps

@@ -0,0 +1,2 @@
+powertop
+inxi

common/Packages-base

@@ -0,0 +1,68 @@
+# Packages common in all profiles
+base
+intel-ucode
+amd-ucode
+artix-grub-theme
+artix-branding-base
+
+elogind-@initsys@
+acpi
+acpid-@initsys@
+alsa-firmware
+alsa-utils-@initsys@
+avahi-@initsys@
+b43-fwcutter
+bluez-@initsys@
+btrfs-progs
+crda
+cronie-@initsys@
+cryptsetup-@initsys@
+dhclient
+dhcpcd-@initsys@
+diffutils
+dmraid
+dosfstools
+e2fsprogs
+ecryptfs-utils
+efibootmgr
+exfat-utils
+f2fs-tools
+grub
+haveged-@initsys@
+inetutils
+iptables
+jfsutils
+linux
+linux-firmware
+linux-headers
+lsb-release
+logrotate
+lsb-release
+lvm2-@initsys@
+man-db
+man-pages
+mdadm-@initsys@
+memtest86+
+mkinitcpio
+mkinitcpio-openswap
+modemmanager
+nano
+nbd
+net-tools
+nfs-utils-@initsys@
+ntfs-3g
+ntp-@initsys@
+openssh-@initsys@
+os-prober
+reiserfsprogs
+rsync-@initsys@
+s-nail
+sudo
+sysfsutils
+texinfo
+usbutils
+vi
+which
+wpa_supplicant-@initsys@
+xfsprogs
+zsh

common/Packages-boot

@@ -0,0 +1,5 @@
+# this file is not meant to be appended or edited
+# it just serves as configurable list
+# to create the mkinitcpio initramfs for the iso
+
+iso-initcpio

common/Packages-dinit

@@ -0,0 +1 @@
+blocaled

common/Packages-openrc

@@ -0,0 +1 @@
+openrc-settingsd

common/Packages-runit

@@ -0,0 +1 @@
+blocaled

common/Packages-s6

@@ -0,0 +1 @@
+blocaled

common/Packages-xorg

@@ -0,0 +1,64 @@
+# Xorg
+xorg-server
+xorg-xhost
+xorg-xinit
+xdg-user-dirs
+xdg-utils
+
+# Drivers, libraries and configs
+nvidia-utils-@initsys@
+nvidia
+xf86-input-vmmouse
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-intel
+xf86-video-nouveau
+xf86-video-openchrome
+xf86-video-sisusb
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo
+
+# Layers
+vkd3d
+vulkan-intel
+vulkan-radeon
+vulkan-swrast
+lib32-vkd3d
+lib32-vulkan-intel
+lib32-vulkan-radeon
+lib32-vulkan-mesa-layers
+
+mesa-vdpau
+lib32-mesa-vdpau
+libva-mesa-driver
+libva-vdpau-driver
+libva-intel-driver
+libvdpau-va-gl
+gst-plugins-good
+gst-plugins-bad
+gst-libav
+
+# Fonts
+terminus-font
+ttf-droid
+ttf-inconsolata
+ttf-liberation
+ttf-roboto
+ttf-roboto-mono
+
+# DE branding
+artix-gtk-presets
+artix-qt-presets
+xcursor-premium
+
+# Common DE packages
+mpv
+ffmpegthumbnailer
+ffmpegthumbs
+raw-thumbnailer
+qt5-imageformats
+gvfs-mtp
+scrot

common/live-overlay/etc/calamares/modules/bootloader.conf

@@ -1,12 +1,67 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Bootloader configuration. The bootloader is installed to allow
+# the system to start (and pick one of the installed operating
+# systems to run).
 ---
+# Define which bootloader you want to use for EFI installations
+# Possible options are 'grub', 'sb-shim' and 'systemd-boot'.
 efiBootLoader: "grub"
+
+# systemd-boot configuration files settings, set kernel and initramfs file names
+# and amount of time before default selection boots
 kernel: "/vmlinuz-linux-x86_64"
 img: "/initramfs-linux-x86_64.img"
 fallback: "/initramfs-linux-x86_64-fallback.img"
 timeout: "10"
-kernelLine: ", with linux"
+
-fallbackKernelLine: ", with linux (fallback initramfs)"
+# Optionally set the menu entry name and kernel name to use in systemd-boot.
+# If not specified here, these settings will be taken from branding.desc.
+#
+# bootloaderEntryName: "Generic GNU/Linux"
+# kernelLine: ", with Stable-Kernel"
+# fallbackKernelLine:  ", with Stable-Kernel (fallback initramfs)"
+
+# GRUB 2 binary names and boot directory
+# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
+# These names are also used when using sb-shim, since that needs some
+# GRUB functionality (notably grub-probe) to work. As needed, you may use
+# complete paths like `/usr/bin/efibootmgr` for the executables.
+#
 grubInstall: "grub-install"
 grubMkconfig: "grub-mkconfig"
 grubCfg: "/boot/grub/grub.cfg"
+grubProbe: "grub-probe"
+efiBootMgr: "efibootmgr"
+
+# Optionally set the bootloader ID to use for EFI. This is passed to
+# grub-install --bootloader-id.
+#
+# If not set here, the value from bootloaderEntryName from branding.desc
+# is used, with problematic characters (space and slash) replaced.
+#
+# The ID is also used as a directory name within the EFI environment,
+# and the bootloader is copied from /boot/efi/EFI/<dirname>/ . When
+# setting the option here, keep in mind that the name is sanitized
+# (problematic characters, see above, are replaced).
+#
+# There are some special words possible at the end of *efiBootloaderId*:
+#   @@SERIAL@@ can be used to obtain a uniquely-numbered suffix
+#       that is added to the Id (yielding, e.g., `dirname1` or `dirname72`)
+#   @@RANDOM@@ can be used to obtain a unique 4-digit hex suffix
+#   @@PHRASE@@ can be used to obtain a unique 1-to-3-word suffix
+#       from a dictionary of space-themed words
+# Note that these must be at the **end** of the *efiBootloaderId* value.
+# There must also be at most one of them. If there is none, no suffix-
+# processing is done and the *efiBootloaderId* is used unchanged.
+#
 # efiBootloaderId: "dirname"
+
+# Optionally install a copy of the GRUB EFI bootloader as the EFI
+# fallback loader (either bootia32.efi or bootx64.efi depending on
+# the system). This may be needed on certain systems (Intel DH87MC
+# seems to be the only one). If you set this to false, take care
+# to add another module to optionally install the fallback on those
+# boards that need it.
+installEFIFallback: true

common/live-overlay/etc/calamares/modules/finished.conf

@@ -1,4 +1,47 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Configuration for the "finished" page, which is usually shown only at
+# the end of the installation (successful or not).
 ---
-restartNowEnabled: true
+# DEPRECATED
+#
+# The finished page can hold a "restart system now" checkbox.
+# If this is false, no checkbox is shown and the system is not restarted
+# when Calamares exits.
+# restartNowEnabled: true
+
+# DEPRECATED
+#
+# Initial state of the checkbox "restart now". Only relevant when the
+# checkbox is shown by restartNowEnabled.
 restartNowChecked: false
+
+# Behavior of the "restart system now" button.
+#
+# There are four usable values:
+#   - never
+#       Does not show the button and does not restart.
+#       This matches the old behavior with restartNowEnabled=false.
+#   - user-unchecked
+#       Shows the button, defaults to unchecked, restarts if it is checked.
+#       This matches the old behavior with restartNowEnabled=true and restartNowChecked=false.
+#   - user-checked
+#       Shows the button, defaults to checked, restarts if it is checked.
+#       This matches the old behavior with restartNowEnabled=true and restartNowChecked=true.
+#   - always
+#       Shows the button, checked, but the user cannot change it.
+#       This is new behavior.
+#
+# The three combinations of legacy values are still supported.
+restartNowMode: user-unchecked
+
+# If the checkbox is shown, and the checkbox is checked, then when
+# Calamares exits from the finished-page it will run this command.
+# If not set, falls back to "shutdown -r now".
 restartNowCommand: "loginctl reboot"
+
+# When the last page is (successfully) reached, send a DBus notification
+# to the desktop that the installation is done. This works only if the
+# user as whom Calamares is run, can reach the regular desktop session bus.
+notifyOnFinished: false

common/live-overlay/etc/calamares/modules/initcpio.conf

@@ -1,2 +1,26 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+# Run mkinitcpio(8) with the given preset value
 ---
+# This key defines the kernel to be loaded.
+# It can have the following values:
+#  - the name of a single mkinitcpio preset
+#  - empty or unset
+#  - the literal string "all"
+#
+# If kernel is set to "all" or empty/unset then mkinitpio is called for all
+# kernels.  Otherwise it is called with a single preset with the value
+# contained in kernel.
+#
 kernel: linux
+
+# Set this to true to turn off mitigations for lax file
+# permissions on initramfs (which, in turn, can compromise
+# your LUKS encryption keys, CVS-2019-13179).
+#
+# If your initramfs are stored in the EFI partition or another non-POSIX
+# filesystem, this has no effect as the file permissions cannot be changed.
+# In this case, ensure the partition is mounted securely.
+#
+be_unsafe: false

common/live-overlay/etc/calamares/modules/partition.conf

@@ -0,0 +1 @@
+availableFileSystemTypes: ["xfs", "btrfs", "ext4", "f2fs"]

common/live-overlay/etc/calamares/modules/postcfg.conf

@@ -0,0 +1,3 @@
+---
+keyrings:
+  - artix

common/live-overlay/etc/calamares/modules/umount.conf

@@ -1,3 +1,14 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+### Umount Module
+#
+# This module represents the last part of the installation, the unmounting
+# of partitions used for the install.  After this, there is no regular way
+# to modify the target system anymore.
+#
+
 ---
-srcLog: "/root/.cache/Calamares/Calamares.log"
+# Setting emergency to true will make it so this module is still run
-destLog: "/var/log/Calamares.log"
+# when a prior module fails
+emergency: false

common/live-overlay/etc/calamares/modules/unpackfs.conf

@@ -0,0 +1,6 @@
+---
+unpack: 
+  - source: "/run/artix/bootmnt/LiveOS/rootfs.img"
+    sourcefs: 'squashfs'
+    destination: ""
+ 

common/live-overlay/etc/calamares/modules/users.conf

@@ -0,0 +1,45 @@
+---
+defaultGroups:
+    - name: users
+      must_exist: true
+      system: true
+    - lp
+    - video
+    - network
+    - storage
+    - name: wheel
+      must_exist: false
+      system: true
+    - audio
+    - power
+    - log
+    - optical
+    - network
+    - scanner
+
+autologinGroup: autologin
+
+doAutologin:     false
+
+sudoersGroup:    wheel
+
+setRootPassword: true
+
+doReusePassword: false
+
+passwordRequirements:
+    nonempty: true
+    minLength: -1  # Password at least this many characters
+    maxLength: -1  # Password at most this many characters
+    libpwquality:
+        - minlen=0
+        - minclass=0
+
+allowWeakPasswords: true
+allowWeakPasswordsDefault: true
+
+userShell: /bin/bash
+
+setHostname: EtcFile
+
+writeHostsFile: true

common/live-overlay/etc/calamares/settings.conf

@@ -34,12 +34,81 @@ sequence:
     - show:
         - finished
 
+# A branding component is a directory, either in SHARE/calamares/branding or
+# in /etc/calamares/branding (the latter takes precedence). The directory must
+# contain a YAML file branding.desc which may reference additional resources
+# (such as images) as paths relative to the current directory.
+#
+# A branding component can also ship a QML slideshow for execution pages,
+# along with translation files.
+#
+# Only the name of the branding component (directory) should be specified
+# here, Calamares then takes care of finding it and loading the contents.
+#
+# YAML: string.
 branding: artix
 
+# If this is set to true, Calamares will show an "Are you sure?" prompt right
+# before each execution phase, i.e. at points of no return. If this is set to
+# false, no prompt is shown. Default is false, but Calamares will complain if
+# this is not explicitly set.
+#
+# YAML: boolean.
 prompt-install: false
 
+# If this is set to true, Calamares will execute all target environment
+# commands in the current environment, without chroot. This setting should
+# only be used when setting up Calamares as a post-install configuration tool,
+# as opposed to a full operating system installer.
+#
+# Some official Calamares modules are not expected to function with this
+# setting. (e.g. partitioning seems like a bad idea, since that is expected to
+# have been done already)
+#
+# Default is false (for a normal installer), but Calamares will complain if
+# this is not explicitly set.
+#
+# YAML: boolean.
 dont-chroot: false
 
+# If this is set to true, Calamares refers to itself as a "setup program"
+# rather than an "installer". Defaults to the value of dont-chroot, but
+# Calamares will complain if this is not explicitly set.
+oem-setup: false
+
+# If this is set to true, the "Cancel" button will be disabled entirely.
+# The button is also hidden from view.
+#
+# This can be useful if when e.g. Calamares is used as a post-install
+# configuration tool and you require the user to go through all the
+# configuration steps.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
 disable-cancel: false
 
+# If this is set to true, the "Cancel" button will be disabled once
+# you start the 'Installation', meaning there won't be a way to cancel
+# the Installation until it has finished or installation has failed.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
 disable-cancel-during-exec: false
+
+# If this is set to true, the "Next" and "Back" button will be hidden once
+# you start the 'Installation'.
+#
+# Default is false, but Calamares will complain if this is not explicitly set.
+#
+# YAML: boolean.
+hide-back-and-next-during-exec: false
+
+# If this is set to true, then once the end of the sequence has
+# been reached, the quit (done) button is clicked automatically
+# and Calamares will close. Default is false: the user will see
+# that the end of installation has been reached, and that things are ok.
+#
+#
+quit-at-end: false

common/live-overlay/etc/elogind/logind.conf

@@ -0,0 +1,54 @@
+#  This file is part of elogind.
+#
+#  elogind is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+# Entries in this file show the compile time defaults.
+# You can change settings by editing this file.
+# Defaults can be restored by simply deleting this file.
+#
+# See logind.conf(5) for details.
+
+[Login]
+KillUserProcesses=no
+#KillOnlyUsers=
+#KillExcludeUsers=root
+#InhibitDelayMaxSec=5
+#HandlePowerKey=poweroff
+HandleSuspendKey=ignore
+HandleHibernateKey=ignore
+HandleLidSwitch=ignore
+#HandleLidSwitchExternalPower=suspend
+#HandleLidSwitchDocked=ignore
+#PowerKeyIgnoreInhibited=no
+#SuspendKeyIgnoreInhibited=no
+#HibernateKeyIgnoreInhibited=no
+#LidSwitchIgnoreInhibited=yes
+#HoldoffTimeoutSec=30s
+#IdleAction=ignore
+#IdleActionSec=30min
+#RuntimeDirectorySize=10%
+#RuntimeDirectoryInodes=400k
+#RemoveIPC=yes
+#InhibitorsMax=8192
+#SessionsMax=8192
+
+[Sleep]
+#AllowSuspend=yes
+#AllowHibernation=yes
+#AllowSuspendThenHibernate=yes
+#AllowHybridSleep=yes
+#AllowPowerOffInterrupts=no
+#BroadcastPowerOffInterrupts=yes
+#AllowSuspendInterrupts=no
+#BroadcastSuspendInterrupts=yes
+#HandleNvidiaSleep=no
+#SuspendState=mem standby freeze
+#SuspendMode=
+#HibernateState=disk
+#HibernateMode=platform shutdown
+#HybridSleepState=disk
+#HybridSleepMode=suspend platform shutdown
+#HibernateDelaySec=10800

common/live-overlay/etc/hostname

@@ -0,0 +1 @@
+artix-live

common/live-overlay/etc/hosts

@@ -0,0 +1,9 @@
+# Static table lookup for hostnames.
+# See hosts(5) for details.
+
+127.0.0.1	localhost.localdomain artix-live localhost
+::1	localhost
+
+#::1	localhost ip6-localhost ip6-loopback
+#ff02::1 ip6-allnodes
+#ff02::2 ip6-allrouters

common/live-overlay/etc/init.d/artix-live

@@ -1,16 +0,0 @@
-#!/usr/bin/openrc-run
-# Copyright 2014 Aaditya Bagga (aaditya_gnulinux@zoho.com)
-# Distributed under the terms of the GNU General Public License v2
-
-description="LiveMedia Config Script"
-
-depend() {
-    need localmount
-    before xdm-setup
-}
-
-start() {
-    ebegin "Starting artix live script"
-    /usr/bin/artix-live
-    eend $?
-}

common/live-overlay/usr/share/applications/calamares.desktop

@@ -18,84 +18,84 @@ Icon[ar]=كالامارس
 GenericName[ar]=مثبت النظام
 Comment[ar]=كالامارس - مثبت النظام
 Name[be]=Усталяваць сістэму
-Icon[be]=calamares
+Icon[be]=artixlinux-logo
 GenericName[be]=Усталёўшчык сістэмы
 Comment[be]=Calamares — усталёўшчык сістэмы
 Name[bg]=Инсталирай системата
-Icon[bg]=calamares
+Icon[bg]=artixlinux-logo
 GenericName[bg]=Системен Инсталатор
 Comment[bg]=Calamares — Системен Инсталатор
 Name[ca]=Instal·la el sistema
-Icon[ca]=calamares
+Icon[ca]=artixlinux-logo
 GenericName[ca]=Instal·lador de sistema
 Comment[ca]=Calamares — Instal·lador de sistema
 Name[da]=Installér system
-Icon[da]=calamares
+Icon[da]=artixlinux-logo
 GenericName[da]=Systeminstallationsprogram
 Comment[da]=Calamares — Systeminstallationsprogram
 Name[de]=System installieren
-Icon[de]=calamares
+Icon[de]=artixlinux-logo
 GenericName[de]=Installation des Betriebssystems
 Comment[de]=Calamares - Installation des Betriebssystems
 Name[el]=Εγκατάσταση συστήματος
-Icon[el]=calamares
+Icon[el]=artixlinux-logo
 GenericName[el]=Εγκατάσταση συστήματος
 Comment[el]=Calamares — Εγκατάσταση συστήματος
 Name[en_GB]=Install System
-Icon[en_GB]=calamares
+Icon[en_GB]=artixlinux-logo
 GenericName[en_GB]=System Installer
 Comment[en_GB]=Calamares — System Installer
 Name[es]=Instalar Sistema
-Icon[es]=calamares
+Icon[es]=artixlinux-logo
 GenericName[es]=Instalador del Sistema
 Comment[es]=Calamares — Instalador del Sistema
 Name[et]=Paigalda süsteem
-Icon[et]=calamares
+Icon[et]=artixlinux-logo
 GenericName[et]=Süsteemipaigaldaja
 Comment[et]=Calamares — süsteemipaigaldaja
 Name[eu]=Sistema instalatu
-Icon[eu]=calamares
+Icon[eu]=artixlinux-logo
 GenericName[eu]=Sistema instalatzailea
 Comment[eu]=Calamares - sistema instalatzailea
 Name[es_PR]=Instalar el sistema
 Name[fr]=Installer le système
-Icon[fr]=calamares
+Icon[fr]=artixlinux-logo
 GenericName[fr]=Installateur système
 Comment[fr]=Calamares - Installateur système
 Name[gl]=Instalación do Sistema
-Icon[gl]=calamares
+Icon[gl]=artixlinux-logo
 GenericName[gl]=Instalador de sistemas
 Comment[gl]=Calamares — Instalador de sistemas
 Name[he]=התקנת מערכת
-Icon[he]=calamares
+Icon[he]=artixlinux-logo
 GenericName[he]=אשף התקנה
 Comment[he]=Calamares - אשף התקנה
 Name[hi]=सिस्टम इंस्टॉल करें
-Icon[hi]=calamares
+Icon[hi]=artixlinux-logo
 GenericName[hi]=सिस्टम इंस्टॉलर
 Comment[hi]=Calamares — सिस्टम इंस्टॉलर
 Name[hr]=Instaliraj sustav
-Icon[hr]=calamares
+Icon[hr]=artixlinux-logo
 GenericName[hr]=Instalacija sustava
 Comment[hr]=Calamares — Instalacija sustava
 Name[hu]=Rendszer telepítése
-Icon[hu]=calamares
+Icon[hu]=artixlinux-logo
 GenericName[hu]=Rendszertelepítő
 Comment[hu]=Calamares – Rendszertelepítő
 Name[id]=Instal Sistem
-Icon[id]=calamares
+Icon[id]=artixlinux-logo
 GenericName[id]=Pemasang
 Comment[id]=Calamares — Pemasang Sistem
 Name[is]=Setja upp kerfið
-Icon[is]=calamares
+Icon[is]=artixlinux-logo
 GenericName[is]=Kerfis uppsetning
 Comment[is]=Calamares — Kerfis uppsetning
 Name[cs_CZ]=Nainstalovat systém
-Icon[cs_CZ]=calamares
+Icon[cs_CZ]=artixlinux-logo
 GenericName[cs_CZ]=Instalátor systému
 Comment[cs_CZ]=Calamares – instalátor operačních systémů
 Name[ja]=システムをインストール
-Icon[ja]=calamares
+Icon[ja]=artixlinux-logo
 GenericName[ja]=システムインストーラー
 Comment[ja]=Calamares — システムインストーラー
 Name[ko]=시스템 설치
@@ -103,15 +103,15 @@ Icon[ko]=깔라마레스 (Calamares)
 GenericName[ko]=시스템 설치 관리자
 Comment[ko]=깔라마레스 (Calamares) — 시스템 설치 관리자
 Name[lt]=Įdiegti Sistemą
-Icon[lt]=calamares
+Icon[lt]=artixlinux-logo
 GenericName[lt]=Sistemos diegimas į kompiuterį
 Comment[lt]=Calamares — Sistemos diegimo programa
 Name[it_IT]=Installa il sistema
-Icon[it_IT]=calamares
+Icon[it_IT]=artixlinux-logo
 GenericName[it_IT]=Programma d'installazione del sistema
 Comment[it_IT]=Calamares — Programma d'installazione del sistema
 Name[mk]=Инсталирај го системот
-Icon[mk]=calamares
+Icon[mk]=artixlinux-logo
 GenericName[mk]=Системен Инсталер
 Comment[mk]=Calamares - Системен Инсталер
 Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യുക
@@ -119,70 +119,70 @@ Icon[ml]=കലാമാരേസ്
 GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ
 Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ
 Name[nb]=Installer System
-Icon[nb]=calamares
+Icon[nb]=artixlinux-logo
 GenericName[nb]=Systeminstallatør
 Comment[nb]=Calamares-systeminstallatør
 Name[nl]=Installeer systeem
-Icon[nl]=calamares
+Icon[nl]=artixlinux-logo
 GenericName[nl]=Installatieprogramma
 Comment[nl]=Calamares — Installatieprogramma
 Name[pl]=Zainstaluj system
-Icon[pl]=calamares
+Icon[pl]=artixlinux-logo
 GenericName[pl]=Instalator systemu
 Comment[pl]=Calamares — Instalator systemu
 Name[pt_BR]=Sistema de Instalação
-Icon[pt_BR]=calamares
+Icon[pt_BR]=artixlinux-logo
 GenericName[pt_BR]=Instalador de Sistema
 Comment[pt_BR]=Calamares — Instalador de Sistema
 Name[ro]=Instalează sistemul
-Icon[ro]=calamares
+Icon[ro]=artixlinux-logo
 GenericName[ro]=Instalator de sistem
 Comment[ro]=Calamares — Instalator de sistem
 Name[ru]=Установить систему
-Icon[ru]=calamares
+Icon[ru]=artixlinux-logo
 GenericName[ru]=Установщик системы
 Comment[ru]=Calamares - Установщик системы
 Name[sk]=Inštalovať systém
-Icon[sk]=calamares
+Icon[sk]=artixlinux-logo
 GenericName[sk]=Inštalátor systému
 Comment[sk]=Calamares — Inštalátor systému
 Name[sl]=Namesti sistem
 Name[sq]=Instalo Sistemin
-Icon[sq]=calamares
+Icon[sq]=artixlinux-logo
 GenericName[sq]=Instalues Sistemi
 Comment[sq]=Calamares — Instalues Sistemi
 Name[fi_FI]=Asenna Järjestelmä
-Icon[fi_FI]=calamares
+Icon[fi_FI]=artixlinux-logo
 GenericName[fi_FI]=Järjestelmän Asennusohjelma
 Comment[fi_FI]=Calamares — Järjestelmän Asentaja
 Name[sr@latin]=Instaliraj sistem
 Name[sr]=Инсталирај систем
-Icon[sr]=calamares
+Icon[sr]=artixlinux-logo
 GenericName[sr]=Инсталатер система
 Comment[sr]=Каламарес — инсталатер система
 Name[sv]=Installera system
-Icon[sv]=calamares
+Icon[sv]=artixlinux-logo
 GenericName[sv]=Systeminstallerare
 Comment[sv]=Calamares — Systeminstallerare
 Name[th]=ติดตั้งระบบ
 Name[uk]=Встановити Систему
-Icon[uk]=calamares
+Icon[uk]=artixlinux-logo
 GenericName[uk]=Встановлювач системи
 Comment[uk]=Calamares - Встановлювач системи
 Name[zh_CN]=安装系统
-Icon[zh_CN]=calamares
+Icon[zh_CN]=artixlinux-logo
 GenericName[zh_CN]=系统安装程序
 Comment[zh_CN]=Calamares — 系统安装程序
 Name[zh_TW]=安裝系統
-Icon[zh_TW]=calamares
+Icon[zh_TW]=artixlinux-logo
 GenericName[zh_TW]=系統安裝程式
 Comment[zh_TW]=Calamares ── 系統安裝程式
 Name[ast]=Instalar el sistema
-Icon[ast]=calamares
+Icon[ast]=artixlinux-logo
 GenericName[ast]=Instalador del sistema
 Comment[ast]=Calamares — Instalador del sistema
 Name[eo]=Instali Sistemo
-Icon[eo]=calamares
+Icon[eo]=artixlinux-logo
 GenericName[eo]=Sistema Instalilo
 Comment[eo]=Calamares — Sistema Instalilo
 Name[ne_NP]=सिस्टम इन्स्टल गर्नुहोस्
@@ -190,14 +190,14 @@ Icon[ne_NP]=Calamares
 GenericName[ne_NP]=सिस्टम इन्स्टलर
 Comment[ne_NP]=Calamares - सिस्टम इन्स्टलर
 Name[es_MX]=Instalar el Sistema
-Icon[es_MX]=calamares
+Icon[es_MX]=artixlinux-logo
 GenericName[es_MX]=Instalador del sistema
 Comment[es_MX]=Calamares - Instalador del sistema
 Name[pt_PT]=Instalar Sistema
-Icon[pt_PT]=calamares
+Icon[pt_PT]=artixlinux-logo
 GenericName[pt_PT]=Instalador de Sistema
 Comment[pt_PT]=Calamares - Instalador de Sistema
 Name[tr_TR]=Sistemi Yükle
-Icon[tr_TR]=calamares
+Icon[tr_TR]=artixlinux-logo
 GenericName[tr_TR]=Sistem Yükleyici
 Comment[tr_TR]=Calamares — Sistem Yükleyici

common/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf

@@ -1,7 +1,7 @@
 [greeter]
 clock-format = %a %d %B %Y, %H:%M:%S
 position = 30%,center
-font-name = Roboto Sans 12
+font-name = Roboto Regular 12
 theme-name = Artix-dark
 icon-theme-name = Adwaita
 xft-antialias = true

community-gtk/Packages-Live

@@ -2,21 +2,18 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd
 
-@openrc artix-live-openrc
-@runit artix-live-runit
-@s6 artix-live-s6
-
 calamares-branding
 gparted
 
 artix-grub-live
 artix-grub-theme
 
-virtualbox-guest-modules-artix
 virtualbox-guest-utils
-#open-vm-tools
+
 broadcom-wl
 
 intel-ucode
 amd-ucode
 artix-docs
+
+artix-live-@initsys@

community-gtk/Packages-Root

@@ -1,156 +1,10 @@
-base
+# loads by default common/packages-{base,apps,xorg}
-@openrc elogind-openrc
-@runit elogind-runit
-@s6 elogind-s6
-acpi
-b43-fwcutter
-btrfs-progs
-crda
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-exfat-utils
-f2fs-tools
-grub
-htop
-inetutils
-iptables
-ipw2100-fw
-ipw2200-fw
-jfsutils
-linux
-linux-headers
-linux-firmware
-logrotate
-lsb-release
-man-db
-man-pages
-memtest86+
-mkinitcpio
-mkinitcpio-openswap
-nano
-vi
-net-tools
-ntfs-3g
-@openrc acpid-openrc
-@openrc cronie-openrc
-@openrc cryptsetup-openrc
-@openrc dhcpcd-openrc
-@openrc haveged-openrc
-@openrc lvm2-openrc
-@openrc mdadm-openrc
-@openrc nfs-utils-openrc
-@openrc rsync-openrc
-@openrc openssh-openrc
-@openrc wpa_supplicant-openrc
-@openrc syslog-ng-openrc
-@runit acpid-runit
-@runit cronie-runit
-@runit cryptsetup-runit
-@runit dhcpcd-runit
-@runit haveged-runit
-@runit lvm2-runit
-@runit mdadm-runit
-@runit nfs-utils-runit
-@runit rsync-runit
-@runit openssh-runit
-@runit wpa_supplicant-runit
-@runit syslog-ng-runit
-@s6 acpid-s6
-@s6 cronie-s6
-@s6 cryptsetup-s6
-@s6 dhcpcd-s6
-@s6 haveged-s6
-@s6 lvm2-s6
-@s6 mdadm-s6
-@s6 nfs-utils-s6
-@s6 rsync-s6
-@s6 openssh-s6
-@s6 wpa_supplicant-s6
-@s6 syslog-ng-s6
-os-prober
-reiserfsprogs
-s-nail
-sudo
-sysfsutils
-texinfo
-usbutils
-which
-efibootmgr
-xfsprogs
-zsh
-
-alsa-firmware
-powertop
-inxi
-modemmanager
-usb_modeswitch
-
-@openrc alsa-utils-openrc
-@openrc avahi-openrc
-@openrc connman-openrc
-@openrc displaymanager-openrc
-@openrc ntp-openrc
-@openrc openrc-settingsd
-@openrc bluez-openrc
-@runit alsa-utils-runit
-@runit avahi-runit
-@runit bluez-runit
-@runit connman-runit
-@runit ntp-runit
-@runit lightdm-runit
-@runit blocaled
-@s6 blocaled
-@s6 alsa-utils-s6
-@s6 avahi-s6
-@s6 bluez-s6
-@s6 connman-s6
-@s6 ntp-s6
-@s6 lightdm-s6
-
-librabbitmq-c
-libmongoc
-
-terminus-font
-ttf-droid
-ttf-roboto
-ttf-roboto-mono
-ttf-inconsolata
-ttf-liberation
-
-xdg-user-dirs
-xdg-utils
-
-xorg-server
-xorg-xinit
-xorg-xhost
-
-xf86-input-vmmouse
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
-# Core ISO packages end here
 
 # Branding
-artix-grub-theme
-artix-dark-theme
-artix-branding-base
 artix-community-presets
-xcursor-premium
 
 # Community goodies
+artix-archlinux-support
 base-devel
 xorg-xwininfo
 xorg-xprop
@@ -161,11 +15,9 @@ wireless_tools
 nftables
 pacman-contrib
 hddtemp
-
+timeshift
-# That hated other
+schedtool
-wine-mono
+breeze-icons
-wine-gecko
-winetricks
 
 # MATE
 mate
@@ -208,6 +60,7 @@ openbox
 pcmanfm
 
 # Applications and helpers
+scribus
 veracrypt
 firefox
 firefox-dark-reader
@@ -215,11 +68,6 @@ firefox-adblock-plus
 firefox-noscript
 firefox-ublock-origin
 libreoffice-fresh
-mpv
-ffmpegthumbnailer
-ffmpegthumbs
-raw-thumbnailer
-qt5-imageformats
 youtube-dl
 pulseaudio-alsa
 p7zip
@@ -227,21 +75,17 @@ unrar
 fortune-mod
 links
 redshift
-libunrar
 torsocks
 pulseaudio-bluetooth
 frei0r-plugins
 movit
-lib32-mesa-vdpau
+nvidia-utils
-libva-mesa-driver
+lib32-nvidia-utils
-libva-vdpau-driver
+nvidia-settings
-libva-intel-driver
+vulkan-tools
-gst-plugins-good
+libunrar
-gst-plugins-bad
+vdpauinfo
-gst-libav
 mesa-demos
-opencl-mesa
-ocl-icd
 chafa
 tigervnc
 strace
@@ -250,7 +94,6 @@ lsof
 # pacman frontend
 pamac
 
-breeze-icons
 
 # Network management
 connman-gtk
@@ -258,7 +101,7 @@ modem-manager-gui
 
 # GTK pkgs
 geany-plugins
-syncthing-gtk
+#syncthing-gtk-python3
 handbrake
 audacity
 gimp
@@ -266,6 +109,9 @@ inkscape
 hexchat
 gufw
 meld
+mcomix
+blueman
+transmission-sequential-gtk
 lightdm-gtk-greeter
 light-locker
 atril
@@ -273,15 +119,27 @@ brasero
 pluma
 thunderbird
 claws-mail
-midori
+epiphany
 leafpad
 
-# other stuff
+# Multimedia
-qt5-imageformats
+yt-dlp
-gtk-engines
+kodi
+subdl
+subdownloader
+aegisub
+subtitleeditor
+guvcview
+songrec
+mp3splt-gtk
+osdlyrics
+glyr
+
+# Misc stuff
 accountsservice
 bluez-utils
 trizen
+yaourtix
 hunspell-en_US
 picom
 
@@ -292,24 +150,47 @@ smb4k
 clementine
 projectm-pulseaudio
 projectm-sdl
+telegram-desktop
+xdg-desktop-portal
+xdg-desktop-portal-gtk
 
 # Uniform QT/GTK look
 kvantum-qt5
 qt5-styleplugins
 qt5ct
+qt6ct
 breeze-gtk
 vertex-themes
 oxygen
+gtk-engines
 
 # KIO is still lacking
-gvfs-mtp
 gvfs-smb
 gvfs-afc
 gvfs-google
 gvfs-gphoto2
 
-virtualbox-guest-utils
+# Nice-to-haves
 mc
 screen
 tmux
 hdparm
+ext4magic
+testdisk
+r-linux
+extundelete
+rdesktop
+
+# Emulation
+lib32-artix-archlinux-support
+wine-mono
+wine-gecko
+winetricks
+gamescope
+steam
+lutris
+dosbox
+fs-uae-launcher
+
+# Misc
+virtualbox-guest-utils

community-gtk/live-overlay/etc/conf.d

@@ -1 +0,0 @@
-../../../community/live-overlay/etc/conf.d

community-gtk/live-overlay/etc/hostname

@@ -0,0 +1 @@
+../../../community/live-overlay/etc/hostname

community-gtk/live-overlay/etc/init.d/xdm-setup

@@ -1,14 +0,0 @@
-#!/usr/bin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	after artix-live
-}
-
-start() {
-	if get_bootparam "nox" ; then
-		touch /etc/.noxdm
-	fi
-}

community-gtk/live-overlay/etc/lightdm/lightdm-gtk-greeter.conf

@@ -2,7 +2,7 @@
 clock-format = %a %d %B %Y, %H:%M:%S
 position = 30%,center
 font-name = Roboto 12
-theme-name = Vertex-Dark
+theme-name = Artix-dark
 icon-theme-name = Adwaita
 xft-antialias = true
 #xft-dpi = 115

community-gtk/live-overlay/etc/runlevels

@@ -1 +0,0 @@
-../../../community/live-overlay/etc/runlevels

community-gtk/profile.conf

@@ -1,24 +1,17 @@
 ################ install ################
-# default displaymanager: none
-# supported: lightdm, sddm, gdm, lxdm, mdm
-DISPLAYMANAGER="lightdm"
-
-# Set to false to disable autologin in the livecd
-AUTOLOGIN="true"
 
 # start services
-SERVICES=('consolefont' 'acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'connmand' 'xdm')
+# bluetoothd, cupsd, DM are added to the pkglist dynamicly
+# metalog or syslog-ng is added to the pkglist dynamicly
+# connmand or NetworkManager is added to the pkglist dynamicly
+# only added if in array, these pkgs have no list entry
 
-# default group membership
+SERVICES=('consolefont' 'acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'connmand' 'lightdm')
-#ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
 
 ################# live-session #################
 
-# unset defaults to given value
-# HOST_NAME="artix"
-
-# unset defaults to given value
-# USER_NAME="artix"
-
 # unset defaults to given value
 # PASSWORD="artix"
+
+# Set to false to disable autologin in the live session
+AUTOLOGIN="true"

community-gtk/root-overlay/etc/lightdm/lightdm.conf

@@ -26,7 +26,7 @@
 #lock-memory=true
 #user-authority-in-system-dir=false
 #guest-account-script=guest-account
-#logind-check-graphical=false
+logind-check-graphical=true
 #log-directory=/var/log/lightdm
 run-directory=/run/lightdm
 #cache-directory=/var/cache/lightdm

community-gtk/root-overlay/etc/runlevels

@@ -1 +0,0 @@
-../../../community/root-overlay/etc/runlevels

community-qt/Packages-Live

@@ -2,21 +2,18 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd
 
-@openrc artix-live-openrc
-@runit artix-live-runit
-@s6 artix-live-s6
-
 calamares-branding
 gparted
 
 artix-grub-live
 artix-grub-theme
 
-virtualbox-guest-modules-artix
 virtualbox-guest-utils
-#open-vm-tools
+
 broadcom-wl
 
 intel-ucode
 amd-ucode
 artix-docs
+
+artix-live-@initsys@

community-qt/Packages-Root

@@ -1,157 +1,11 @@
-base
+# loads by default common/packages-{base,apps,xorg}
-@openrc elogind-openrc
-@runit elogind-runit
-@s6 elogind-s6
-acpi
-b43-fwcutter
-btrfs-progs
-crda
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-exfat-utils
-f2fs-tools
-grub
-htop
-inetutils
-iptables
-ipw2100-fw
-ipw2200-fw
-jfsutils
-linux
-linux-headers
-linux-firmware
-logrotate
-lsb-release
-man-db
-man-pages
-memtest86+
-mkinitcpio
-mkinitcpio-openswap
-nano
-vi
-net-tools
-ntfs-3g
-@openrc acpid-openrc
-@openrc cronie-openrc
-@openrc cryptsetup-openrc
-@openrc dhcpcd-openrc
-@openrc haveged-openrc
-@openrc lvm2-openrc
-@openrc mdadm-openrc
-@openrc nfs-utils-openrc
-@openrc rsync-openrc
-@openrc openssh-openrc
-@openrc wpa_supplicant-openrc
-@openrc syslog-ng-openrc
-@runit acpid-runit
-@runit cronie-runit
-@runit cryptsetup-runit
-@runit dhcpcd-runit
-@runit haveged-runit
-@runit lvm2-runit
-@runit mdadm-runit
-@runit nfs-utils-runit
-@runit rsync-runit
-@runit openssh-runit
-@runit wpa_supplicant-runit
-@runit syslog-ng-runit
-@s6 acpid-s6
-@s6 cronie-s6
-@s6 cryptsetup-s6
-@s6 dhcpcd-s6
-@s6 haveged-s6
-@s6 lvm2-s6
-@s6 mdadm-s6
-@s6 nfs-utils-s6
-@s6 rsync-s6
-@s6 openssh-s6
-@s6 wpa_supplicant-s6
-@s6 syslog-ng-s6
-os-prober
-reiserfsprogs
-s-nail
-sudo
-sysfsutils
-texinfo
-usbutils
-which
-efibootmgr
-xfsprogs
-zsh
-
-alsa-firmware
-powertop
-inxi
-modemmanager
-usb_modeswitch
-
-@openrc alsa-utils-openrc
-@openrc avahi-openrc
-@openrc networkmanager-openrc
-@openrc displaymanager-openrc
-@openrc ntp-openrc
-@openrc openrc-settingsd
-@openrc bluez-openrc
-@runit alsa-utils-runit
-@runit avahi-runit
-@runit bluez-runit
-@runit networkmanager-runit
-@runit ntp-runit
-@runit sddm-runit
-@runit blocaled
-@s6 blocaled
-@s6 alsa-utils-s6
-@s6 avahi-s6
-@s6 bluez-s6
-@s6 networkmanager-s6
-@s6 ntp-s6
-@s6 sddm-s6
-
-librabbitmq-c
-libmongoc
-
-terminus-font
-ttf-droid
-ttf-roboto
-ttf-roboto-mono
-ttf-inconsolata
-ttf-liberation
-
-xdg-user-dirs
-xdg-utils
-
-xorg-server
-xorg-xinit
-xorg-xhost
-
-xf86-input-vmmouse
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
-# Core ISO packages end here
 
 # Branding
-artix-grub-theme
-artix-dark-theme
-artix-branding-base
 artix-community-presets
-xcursor-premium
 sddm-theme-artix
 
 # Community goodies
+artix-archlinux-support
 base-devel
 xorg-xwininfo
 xorg-xprop
@@ -162,11 +16,9 @@ wireless_tools
 nftables
 pacman-contrib
 hddtemp
-
+timeshift
-# That hated other
+schedtool
-wine-mono
+breeze-icons
-wine-gecko
-winetricks
 
 # KDE Plasma
 plasma
@@ -174,96 +26,11 @@ kf5
 kde-system
 kde-network
 kde-utilities
-kdepim
+kde-pim-meta
-
-# LXQT
-lxqt
-xscreensaver
-qpdfview
-trojita
-
-# Applications and helpers
-veracrypt
-firefox
-firefox-dark-reader
-firefox-adblock-plus
-firefox-noscript
-firefox-ublock-origin
-libreoffice-fresh
-mpv
-ffmpegthumbnailer
-ffmpegthumbs
-raw-thumbnailer
-qt5-imageformats
-youtube-dl
-pulseaudio-alsa
-p7zip
-unrar
-fortune-mod
-links
-redshift
-libunrar
-torsocks
-pulseaudio-bluetooth
-frei0r-plugins
-movit
-lib32-mesa-vdpau
-libva-mesa-driver
-libva-vdpau-driver
-libva-intel-driver
-gst-plugins-good
-gst-plugins-bad
-gst-libav
-mesa-demos
-opencl-mesa
-ocl-icd
-chafa
-tigervnc
-strace
-ltrace
-lsof
-# pacman frontend
-octopi
-
-breeze-icons
-
-# Network management
-network-manager-applet
-modem-manager-gui
-
-# GTK pkgs
-geany-plugins
-syncthing-gtk
-handbrake
-audacity
-gimp
-inkscape
-hexchat
-gufw
-meld
-
-# other stuff
-qt5-imageformats
-gtk-engines
-accountsservice
-bluez-utils
-trizen
-hunspell-en_US
-picom
-
-# Qt pkgs
-kdenlive
-digikam
-smb4k
-clementine
-projectm-pulseaudio
-projectm-sdl
 konversation
 falkon
 ark
 dolphin-plugins
-ffmpegthumbs
-filelight
 filelight
 k3b
 kaddressbook
@@ -293,24 +60,140 @@ spectacle
 svgpart
 sweeper
 okular
+flameshot
+
+
+# LXQT
+lxqt
+libstatgrab
+xscreensaver
+xpdf
+trojita
+lximage-qt
+
+# Applications and helpers
+scribus
+veracrypt
+firefox
+firefox-dark-reader
+firefox-adblock-plus
+firefox-noscript
+firefox-ublock-origin
+libreoffice-fresh
+youtube-dl
+pulseaudio-alsa
+p7zip
+unrar
+fortune-mod
+links
+redshift
+torsocks
+pulseaudio-bluetooth
+frei0r-plugins
+movit
+nvidia-utils
+lib32-nvidia-utils
+nvidia-settings
+vulkan-tools
+libunrar
+vdpauinfo
+mesa-demos
+chafa
+tigervnc
+strace
+ltrace
+lsof
+# pacman frontend
+octopi
+
+
+# Network management
+network-manager-applet
+modem-manager-gui
+
+# GTK pkgs
+geany-plugins
+#syncthing-gtk-python3
+handbrake
+audacity
+gimp
+inkscape
+hexchat
+gufw
+meld
+mcomix
+bluedevil
+transmission-sequential-qt
+
+# Multimedia
+yt-dlp
+kodi
+subdl
+subdownloader
+aegisub
+subtitleeditor
+guvcview-qt
+songrec
+mp3splt-gtk
+osdlyrics
+glyr
+
+# Misc stuff
+accountsservice
+bluez-utils
+trizen
+yaourtix
+hunspell-en_US
+picom
+
+# Qt pkgs
+kdenlive
+digikam
+smb4k
+clementine
+projectm-pulseaudio
+projectm-sdl
+telegram-desktop
+xdg-desktop-portal
+xdg-desktop-portal-kde
 
 # Uniform QT/GTK look
 kvantum-qt5
 qt5-styleplugins
 qt5ct
+qt6ct
 breeze-gtk
 vertex-themes
 oxygen
+gtk-engines
 
 # KIO is still lacking
-gvfs-mtp
 gvfs-smb
 gvfs-afc
 gvfs-google
 gvfs-gphoto2
 
-virtualbox-guest-utils
+# Nice-to-haves
 mc
 screen
 tmux
 hdparm
+ext4magic
+testdisk
+r-linux
+extundelete
+rdesktop
+
+# Emulation
+lib32-artix-archlinux-support
+wine-mono
+wine-gecko
+winetricks
+gamescope
+steam
+lutris
+dosbox
+fs-uae-launcher
+
+# Misc
+virtualbox-guest-utils

community-qt/live-overlay/etc/conf.d

@@ -1 +0,0 @@
-../../../community/live-overlay/etc/conf.d

community-qt/live-overlay/etc/hostname

@@ -0,0 +1 @@
+../../../community/live-overlay/etc/hostname

community-qt/live-overlay/etc/init.d/sddm

@@ -0,0 +1,21 @@
+#!/usr/bin/openrc-run
+
+supervisor=supervise-daemon
+command="/usr/bin/sddm"
+
+depend() {
+    need localmount
+
+    after bootmisc consolefont modules netmount
+    after ypbind autofs openvpn gpm lircmd
+    after quota keymaps
+    before alsasound
+    want logind
+    use xfs
+
+    provide xdm display-manager
+}
+start_pre() {
+    sed -i 's/sion=lxqt/sion=plasma/' /etc/sddm.conf
+    sed -ie '/start_pre/,+4d' /etc/init.d/sddm
+}

community-qt/live-overlay/etc/runlevels

@@ -1 +0,0 @@
-../../../community/live-overlay/etc/runlevels

community-qt/profile.conf

@@ -1,26 +1,17 @@
 ################ install ################
-# default displaymanager: none
-# supported: lightdm, sddm, gdm, lxdm, mdm
-DISPLAYMANAGER="sddm"
-
-DEFAULT_DESKTOP_FILE="plasma"
-
-# Set to false to disable autologin in the livecd
-AUTOLOGIN="true"
 
 # start services
-SERVICES=('consolefont' 'acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'NetworkManager')
+# bluetoothd, cupsd, DM are added to the pkglist dynamicly
+# metalog or syslog-ng is added to the pkglist dynamicly
+# connmand or NetworkManager is added to the pkglist dynamicly
+# only added if in array, these pkgs have no list entry
 
-# default group membership
+SERVICES=('consolefont' 'acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'NetworkManager' 'sddm')
-#ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
 
 ################# live-session #################
 
-# unset defaults to given value
-# HOST_NAME="artix"
-
-# unset defaults to given value
-# USER_NAME="artix"
-
 # unset defaults to given value
 # PASSWORD="artix"
+
+# Set to false to disable autologin in the live session
+AUTOLOGIN="true"

community-qt/root-overlay/etc/runlevels

@@ -1 +0,0 @@
-../../../community/root-overlay/etc/runlevels

community-qt/root-overlay/etc/skel/.gtkrc-2.0

@@ -0,0 +1 @@
+../../../../lxqt/root-overlay/etc/skel/.gtkrc-2.0

community/live-overlay/etc/bash/bashrc.d/local.bashrc

@@ -21,6 +21,25 @@ alias rot47='tr !-~ P-~!-O'
 alias VirtualBox='QT_STYLE_OVERRIDE=kvantum-dark virtualbox'
 alias virtualbox='QT_STYLE_OVERRIDE=kvantum-dark virtualbox'
 
+# Erase history dupes
+export HISTCONTROL=erasedups
+
+# Some fun stuff
+timestamp() { date +"%Y/%m/%d_%H:%M:%S"; }
+stopwatch() {
+    date1=`date +%s`
+    while true; do
+        days=$(( $(($(date +%s) - date1)) / 86400 ))
+        echo -ne "$days day(s) and $(date -u --date @$((`date +%s` - $date1)) +%H:%M:%S)\r"
+        sleep 0.1
+    done
+}
+tvnoise() {
+    while true; do
+        printf "$(awk -v c="$(tput cols)" -v s="$RANDOM" 'BEGIN{srand(s);while(--c>=0){printf("\xe2\x96\\%s",sprintf("%o",150+int(10*rand())));}}')"
+    done
+}
+
 # No clobber, use >| instead of >
 set -C
 

community/live-overlay/etc/calamares

@@ -1 +0,0 @@
-../../../common/live-overlay/etc/calamares

community/live-overlay/etc/calamares/modules/bootloader.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/bootloader.conf

community/live-overlay/etc/calamares/modules/displaymanager.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/displaymanager.conf

community/live-overlay/etc/calamares/modules/finished.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/finished.conf

community/live-overlay/etc/calamares/modules/initcpio.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/initcpio.conf

community/live-overlay/etc/calamares/modules/locale.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/locale.conf

community/live-overlay/etc/calamares/modules/machineid.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/machineid.conf

community/live-overlay/etc/calamares/modules/postcfg.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/postcfg.conf

community/live-overlay/etc/calamares/modules/unpackfs.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/unpackfs.conf

community/live-overlay/etc/calamares/modules/users.conf

@@ -0,0 +1 @@
+../../../../../common/live-overlay/etc/calamares/modules/users.conf

community/live-overlay/etc/calamares/modules/welcome.conf

@@ -0,0 +1,26 @@
+---
+showSupportUrl:         true
+showKnownIssuesUrl:     true
+showReleaseNotesUrl:    true
+
+requirements:
+    requiredStorage:    10
+    requiredRam:        1.0
+    internetCheckUrl:   https://artixlinux.org
+    check:
+      - storage
+      - ram
+      - power
+      - internet
+      - root
+    required:
+      - storage
+      - ram
+      - root
+
+# geoip:
+#     style:    "none"
+#     url:      "https://geoip.kde.org/v1/ubiquity"  # extended XML format
+#     selector: "CountryCode"  # blank uses default, which is wrong
+
+# languageIcon: set-language

community/live-overlay/etc/calamares/settings.conf

@@ -0,0 +1 @@
+../../../../common/live-overlay/etc/calamares/settings.conf

community/live-overlay/etc/hostname

@@ -0,0 +1 @@
+../../../common/live-overlay/etc/hostname

community/live-overlay/etc/hosts

@@ -1 +0,0 @@
-127.0.0.1	localhost artix

community/live-overlay/etc/hosts

@@ -0,0 +1 @@
+../../../common/live-overlay/etc/hosts

community/live-overlay/etc/local.d/mkinitcpio.start

@@ -4,11 +4,11 @@
 mv -f /etc/mkinitcpio.conf.mod /etc/mkinitcpio.conf 2>/dev/null
 
 # Remove ecnryption-related stuff if unneeded from mkinitcpio.conf, default/grub and grub.cfg
-#if [ ! -e /crypto_keyfile.bin ]; then
+if [ ! -e /crypto_keyfile.bin ]; then
-#    sed -i 's|/crypto_keyfile.bin||' /etc/mkinitcpio.conf*  2>/dev/null
+    sed -i 's|/crypto_keyfile.bin||' /etc/mkinitcpio.conf*  2>/dev/null
-#    sed -i 's|encrypt||' /etc/mkinitcpio.conf* 2>/dev/null
+    sed -i 's|encrypt||' /etc/mkinitcpio.conf* 2>/dev/null
-#    sed -i 's|cryptkey=rootfs:/crypto_keyfile.bin||' /etc/default/grub /boot/grub/grub.cfg 2>/dev/null
+    sed -i 's|cryptkey=rootfs:/crypto_keyfile.bin||' /etc/default/grub /boot/grub/grub.cfg 2>/dev/null
-#fi
+fi
 
 # Run once and disappear
 rm -f $0

community/live-overlay/etc/local.d/networkmanagerfix.start

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+[ -d /etc/NetworkManager/conf.d ] && {
+cat >| /etc/NetworkManager/conf.d/fix-hostname-hang.conf << EOF
+[main]
+plugins=keyfile
+hostname-mode=none
+EOF
+}
+
+# Run once and disappear
+rm -f $0

community/live-overlay/etc/pacman.conf

@@ -32,9 +32,9 @@ Architecture = auto
 # Misc options
 UseSyslog
 Color
-TotalDownload
 CheckSpace
 VerbosePkgLists
+ParallelDownloads = 4
 ILoveCandy
 
 # By default, pacman accepts packages signed by keys that its local keyring
@@ -98,13 +98,22 @@ Include = /etc/pacman.d/mirrorlist
 # [universe] contains packages not in mainstream Artix or Arch repos,
 # maintained by individual Artix devs
 [universe]
+Server = https://mirror1.artixlinux.org/universe/$arch
+Server = https://mirror.pascalpuffke.de/artix-universe/$arch
+Server = https://artixlinux.qontinuum.space:4443/universe/os/$arch
 Server = https://universe.artixlinux.org/$arch
 
+# Omniverse contains packages from the AUR and Arch [community], some with non-free licenses.
+# You *must* agree to their license in order to use them.
+# Packages and descriptions: http://omniverse.artixlinux.org/x86_64/
+[omniverse]
+Server = http://omniverse.artixlinux.org/$arch
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
-#[custom]
+#[localrepo]
 #SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
+#Server = file:///home/user/localrepo
 
 #
 # ARCHLINUX

community/live-overlay/usr

@@ -0,0 +1 @@
+../../common/live-overlay/usr

community/live-overlay/usr/share/applications/calamares.desktop

@@ -1,203 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Install Artix
-GenericName=System Installer
-Keywords=calamares;system;installer;
-TryExec=calamares
-Exec=pkexec env DISPLAY=:0 XAUTHORITY=/home/artix/.Xauthority QT_QPA_PLATFORMTHEME=gtk2 calamares
-Comment=Calamares — System Installer
-Icon=artixlinux-logo
-Terminal=false
-StartupNotify=true
-Categories=Qt;System;
-X-AppStream-Ignore=true
-
-Name[ar]=تثبيت النظام 
-Icon[ar]=كالامارس
-GenericName[ar]=مثبت النظام
-Comment[ar]=كالامارس - مثبت النظام
-Name[be]=Усталяваць сістэму
-Icon[be]=calamares
-GenericName[be]=Усталёўшчык сістэмы
-Comment[be]=Calamares — усталёўшчык сістэмы
-Name[bg]=Инсталирай системата
-Icon[bg]=calamares
-GenericName[bg]=Системен Инсталатор
-Comment[bg]=Calamares — Системен Инсталатор
-Name[ca]=Instal·la el sistema
-Icon[ca]=calamares
-GenericName[ca]=Instal·lador de sistema
-Comment[ca]=Calamares — Instal·lador de sistema
-Name[da]=Installér system
-Icon[da]=calamares
-GenericName[da]=Systeminstallationsprogram
-Comment[da]=Calamares — Systeminstallationsprogram
-Name[de]=System installieren
-Icon[de]=calamares
-GenericName[de]=Installation des Betriebssystems
-Comment[de]=Calamares - Installation des Betriebssystems
-Name[el]=Εγκατάσταση συστήματος
-Icon[el]=calamares
-GenericName[el]=Εγκατάσταση συστήματος
-Comment[el]=Calamares — Εγκατάσταση συστήματος
-Name[en_GB]=Install System
-Icon[en_GB]=calamares
-GenericName[en_GB]=System Installer
-Comment[en_GB]=Calamares — System Installer
-Name[es]=Instalar Sistema
-Icon[es]=calamares
-GenericName[es]=Instalador del Sistema
-Comment[es]=Calamares — Instalador del Sistema
-Name[et]=Paigalda süsteem
-Icon[et]=calamares
-GenericName[et]=Süsteemipaigaldaja
-Comment[et]=Calamares — süsteemipaigaldaja
-Name[eu]=Sistema instalatu
-Icon[eu]=calamares
-GenericName[eu]=Sistema instalatzailea
-Comment[eu]=Calamares - sistema instalatzailea
-Name[es_PR]=Instalar el sistema
-Name[fr]=Installer le système
-Icon[fr]=calamares
-GenericName[fr]=Installateur système
-Comment[fr]=Calamares - Installateur système
-Name[gl]=Instalación do Sistema
-Icon[gl]=calamares
-GenericName[gl]=Instalador de sistemas
-Comment[gl]=Calamares — Instalador de sistemas
-Name[he]=התקנת מערכת
-Icon[he]=calamares
-GenericName[he]=אשף התקנה
-Comment[he]=Calamares - אשף התקנה
-Name[hi]=सिस्टम इंस्टॉल करें
-Icon[hi]=calamares
-GenericName[hi]=सिस्टम इंस्टॉलर
-Comment[hi]=Calamares — सिस्टम इंस्टॉलर
-Name[hr]=Instaliraj sustav
-Icon[hr]=calamares
-GenericName[hr]=Instalacija sustava
-Comment[hr]=Calamares — Instalacija sustava
-Name[hu]=Rendszer telepítése
-Icon[hu]=calamares
-GenericName[hu]=Rendszertelepítő
-Comment[hu]=Calamares – Rendszertelepítő
-Name[id]=Instal Sistem
-Icon[id]=calamares
-GenericName[id]=Pemasang
-Comment[id]=Calamares — Pemasang Sistem
-Name[is]=Setja upp kerfið
-Icon[is]=calamares
-GenericName[is]=Kerfis uppsetning
-Comment[is]=Calamares — Kerfis uppsetning
-Name[cs_CZ]=Nainstalovat systém
-Icon[cs_CZ]=calamares
-GenericName[cs_CZ]=Instalátor systému
-Comment[cs_CZ]=Calamares – instalátor operačních systémů
-Name[ja]=システムをインストール
-Icon[ja]=calamares
-GenericName[ja]=システムインストーラー
-Comment[ja]=Calamares — システムインストーラー
-Name[ko]=시스템 설치
-Icon[ko]=깔라마레스 (Calamares)
-GenericName[ko]=시스템 설치 관리자
-Comment[ko]=깔라마레스 (Calamares) — 시스템 설치 관리자
-Name[lt]=Įdiegti Sistemą
-Icon[lt]=calamares
-GenericName[lt]=Sistemos diegimas į kompiuterį
-Comment[lt]=Calamares — Sistemos diegimo programa
-Name[it_IT]=Installa il sistema
-Icon[it_IT]=calamares
-GenericName[it_IT]=Programma d'installazione del sistema
-Comment[it_IT]=Calamares — Programma d'installazione del sistema
-Name[mk]=Инсталирај го системот
-Icon[mk]=calamares
-GenericName[mk]=Системен Инсталер
-Comment[mk]=Calamares - Системен Инсталер
-Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യുക
-Icon[ml]=കലാമാരേസ്
-GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ
-Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ
-Name[nb]=Installer System
-Icon[nb]=calamares
-GenericName[nb]=Systeminstallatør
-Comment[nb]=Calamares-systeminstallatør
-Name[nl]=Installeer systeem
-Icon[nl]=calamares
-GenericName[nl]=Installatieprogramma
-Comment[nl]=Calamares — Installatieprogramma
-Name[pl]=Zainstaluj system
-Icon[pl]=calamares
-GenericName[pl]=Instalator systemu
-Comment[pl]=Calamares — Instalator systemu
-Name[pt_BR]=Sistema de Instalação
-Icon[pt_BR]=calamares
-GenericName[pt_BR]=Instalador de Sistema
-Comment[pt_BR]=Calamares — Instalador de Sistema
-Name[ro]=Instalează sistemul
-Icon[ro]=calamares
-GenericName[ro]=Instalator de sistem
-Comment[ro]=Calamares — Instalator de sistem
-Name[ru]=Установить систему
-Icon[ru]=calamares
-GenericName[ru]=Установщик системы
-Comment[ru]=Calamares - Установщик системы
-Name[sk]=Inštalovať systém
-Icon[sk]=calamares
-GenericName[sk]=Inštalátor systému
-Comment[sk]=Calamares — Inštalátor systému
-Name[sl]=Namesti sistem
-Name[sq]=Instalo Sistemin
-Icon[sq]=calamares
-GenericName[sq]=Instalues Sistemi
-Comment[sq]=Calamares — Instalues Sistemi
-Name[fi_FI]=Asenna Järjestelmä
-Icon[fi_FI]=calamares
-GenericName[fi_FI]=Järjestelmän Asennusohjelma
-Comment[fi_FI]=Calamares — Järjestelmän Asentaja
-Name[sr@latin]=Instaliraj sistem
-Name[sr]=Инсталирај систем
-Icon[sr]=calamares
-GenericName[sr]=Инсталатер система
-Comment[sr]=Каламарес — инсталатер система
-Name[sv]=Installera system
-Icon[sv]=calamares
-GenericName[sv]=Systeminstallerare
-Comment[sv]=Calamares — Systeminstallerare
-Name[th]=ติดตั้งระบบ
-Name[uk]=Встановити Систему
-Icon[uk]=calamares
-GenericName[uk]=Встановлювач системи
-Comment[uk]=Calamares - Встановлювач системи
-Name[zh_CN]=安装系统
-Icon[zh_CN]=calamares
-GenericName[zh_CN]=系统安装程序
-Comment[zh_CN]=Calamares — 系统安装程序
-Name[zh_TW]=安裝系統
-Icon[zh_TW]=calamares
-GenericName[zh_TW]=系統安裝程式
-Comment[zh_TW]=Calamares ── 系統安裝程式
-Name[ast]=Instalar el sistema
-Icon[ast]=calamares
-GenericName[ast]=Instalador del sistema
-Comment[ast]=Calamares — Instalador del sistema
-Name[eo]=Instali Sistemo
-Icon[eo]=calamares
-GenericName[eo]=Sistema Instalilo
-Comment[eo]=Calamares — Sistema Instalilo
-Name[ne_NP]=सिस्टम इन्स्टल गर्नुहोस्
-Icon[ne_NP]=Calamares
-GenericName[ne_NP]=सिस्टम इन्स्टलर
-Comment[ne_NP]=Calamares - सिस्टम इन्स्टलर
-Name[es_MX]=Instalar el Sistema
-Icon[es_MX]=calamares
-GenericName[es_MX]=Instalador del sistema
-Comment[es_MX]=Calamares - Instalador del sistema
-Name[pt_PT]=Instalar Sistema
-Icon[pt_PT]=calamares
-GenericName[pt_PT]=Instalador de Sistema
-Comment[pt_PT]=Calamares - Instalador de Sistema
-Name[tr_TR]=Sistemi Yükle
-Icon[tr_TR]=calamares
-GenericName[tr_TR]=Sistem Yükleyici
-Comment[tr_TR]=Calamares — Sistem Yükleyici

community/live-overlay/usr/share/icons/matefaenzadark/places/22/start-here.png

@@ -1 +0,0 @@
-start-here-mate.png

community/live-overlay/usr/share/icons/matefaenzadark/places/24/start-here.png

@@ -1 +0,0 @@
-start-here-mate.png

community/root-overlay/etc/conf.d

@@ -1 +0,0 @@
-../../live-overlay/etc/conf.d

community/root-overlay/etc/default/grub

@@ -48,3 +48,6 @@ GRUB_THEME="/usr/share/grub/themes/artix/theme.txt"
 GRUB_SAVEDEFAULT="true"
 
 GRUB_DISABLE_LINUX_RECOVERY="true"
+
+# Probe for other installed operating systems
+GRUB_DISABLE_OS_PROBER="false"

community/root-overlay/etc/mkinitcpio.conf.mod

@@ -60,7 +60,8 @@ HOOKS=(consolefont base udev autodetect modconf encrypt block filesystems keyboa
 #COMPRESSION="xz"
 #COMPRESSION="lzop"
 #COMPRESSION="lz4"
+COMPRESSION="zstd"
 
 # COMPRESSION_OPTIONS
 # Additional options for the compressor
-#COMPRESSION_OPTIONS=()
+COMPRESSION_OPTIONS=(-T0 -10)

community/root-overlay/etc/pacman.d/mirrorlist

@@ -1,19 +1,43 @@
 ##
 ## Artix Linux repository mirrorlist
-## Generated on 2019-03-14
+## Generated on 2021-12-12
 ##
 
 # Artix mirrors
 
+
+## Europe
 Server = https://mirrors.dotsrc.org/artix-linux/repos/$repo/os/$arch
 Server = http://ftp.ntua.gr/pub/linux/artix-linux/$repo/os/$arch
+Server = https://ftp.cc.uoc.gr/mirrors/linux/artixlinux/$repo/os/$arch
+Server = https://quantum-mirror.hu/mirrors/pub/artix-linux/$repo/os/$arch
+Server = https://ftp.sh.cvut.cz/artix-linux/$repo/os/$arch
+Server = https://artix.unixpeople.org/repos/$repo/os/$arch
+Server = https://artix.cccp.io/$repo/os/$arch
+Server = https://mirror.linux.pizza/artix-linux/$repo/os/$arch
+Server = http://mirrors.redcorelinux.org/artixlinux/$repo/os/$arch
+Server = https://mirror.one.com/artix/$repo/os/$arch
+Server = https://mirror.pascalpuffke.de/artix-linux/$repo/os/$arch
+Server = https://artixlinux.qontinuum.space:4443/$repo/os/$arch
+Server = https://ftp.ludd.ltu.se/mirrors/artix/$repo/os/$arch
+Server = https://mirror.alphvino.com/artix-linux/$repo/os/$arch
+Server = http://artist.artixlinux.org/repos/$repo/os/$arch
+Server = https://mirror.theanonymouse.xyz/artix-linux/$repo/os/$arch
+Server = https://mirror1.artixlinux.org/repos/$repo/os/$arch
+Server = https://eu-mirror.artixlinux.org/repos/$repo/os/$arch
+
+
+## North America
 Server = https://artix.wheaton.edu/repos/$repo/os/$arch
 Server = https://mirror.clarkson.edu/artix-linux/repos/$repo/os/$arch
-Server = https://ftp.cc.uoc.gr/mirrors/linux/artixlinux/$repo/os/$arch
+Server = https://mirrors.rit.edu/artixlinux/$repo/os/$arch
-Server = https://artix.unixpeople.org/repos/$repo/os/$arch
+Server = https://mirror.csclub.uwaterloo.ca/artixlinux/$repo/os/$arch
-Server = https://artix.rw-net.de/repos/$repo/os/$arch
-Server = https://mirrors.tuna.tsinghua.edu.cn/artixlinux/$repo/os/$arch
-Server = https://ftp.sh.cvut.cz/artix-linux/$repo/os/$arch
-Server = https://mirrors.nettek.us/artix-linux/$repo/os/$arch
 Server = http://www.nylxs.com/mirror/repos/$repo/os/$arch
-Server = http://mirror1.artixlinux.org/repos/$repo/os/$arch
+Server = https://mirrors.nettek.us/artix-linux/$repo/os/$arch
+Server = https://us-mirror.artixlinux.org/$repo/os/$arch
+
+
+## Asia
+Server = https://mirrors.tuna.tsinghua.edu.cn/artixlinux/$repo/os/$arch
+Server = https://mirrors.cloud.tencent.com/artixlinux/$repo/os/$arch
+Server = https://mirror.funami.tech/artix/$repo/os/$arch

community/root-overlay/etc/pacman.d/mirrorlist-arch

@@ -1,18 +1,25 @@
 ##
 ## Arch Linux repository mirrorlist
-## Generated on 2018-10-21
+## Generated on 2020-09-20
 ##
 
 ## Worldwide
+Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
+Server = https://mirror.selfnet.de/archlinux/$repo/os/$arch
 #Server = http://mirrors.evowise.com/archlinux/$repo/os/$arch
 #Server = http://mirror.rackspace.com/archlinux/$repo/os/$arch
+#Server = https://mirror.rackspace.com/archlinux/$repo/os/$arch
 
 ## Australia
 #Server = https://mirror.aarnet.edu.au/pub/archlinux/$repo/os/$arch
 #Server = http://archlinux.mirror.digitalpacific.com.au/$repo/os/$arch
+#Server = https://archlinux.mirror.digitalpacific.com.au/$repo/os/$arch
 #Server = http://ftp.iinet.net.au/pub/archlinux/$repo/os/$arch
 #Server = http://mirror.internode.on.net/pub/archlinux/$repo/os/$arch
-#Server = http://archlinux.melbourneitmirror.net/$repo/os/$arch
+#Server = http://mirror.launtel.net.au/repo/arch/$repo/os/$arch
+#Server = https://mirror.launtel.net.au/repo/arch/$repo/os/$arch
+#Server = http://syd.mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://syd.mirror.rackspace.com/archlinux/$repo/os/$arch
 #Server = http://ftp.swin.edu.au/archlinux/$repo/os/$arch
 
 ## Austria
@@ -31,6 +38,7 @@
 ## Belgium
 #Server = http://archlinux.cu.be/$repo/os/$arch
 #Server = http://archlinux.mirror.kangaroot.net/$repo/os/$arch
+#Server = http://mirror.tiguinet.net/arch/$repo/os/$arch
 
 ## Bosnia and Herzegovina
 #Server = http://archlinux.mirror.ba/$repo/os/$arch
@@ -41,14 +49,12 @@
 #Server = http://www.caco.ic.unicamp.br/archlinux/$repo/os/$arch
 #Server = https://www.caco.ic.unicamp.br/archlinux/$repo/os/$arch
 #Server = http://linorg.usp.br/archlinux/$repo/os/$arch
-#Server = http://pet.inf.ufsc.br/mirrors/archlinux/$repo/os/$arch
 #Server = http://archlinux.pop-es.rnp.br/$repo/os/$arch
 #Server = http://mirror.ufam.edu.br/archlinux/$repo/os/$arch
 #Server = http://mirror.ufscar.br/archlinux/$repo/os/$arch
 
 ## Bulgaria
 #Server = http://mirror.host.ag/archlinux/$repo/os/$arch
-#Server = https://mirrors.itbox.bg/archlinux/$repo/os/$arch
 #Server = http://mirrors.netix.net/archlinux/$repo/os/$arch
 #Server = http://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch
 #Server = https://mirrors.uni-plovdiv.net/archlinux/$repo/os/$arch
@@ -58,36 +64,50 @@
 #Server = http://archlinux.mirror.colo-serv.net/$repo/os/$arch
 #Server = http://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch
 #Server = https://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/$arch
+#Server = http://mirror2.evolution-host.com/archlinux/$repo/os/$arch
+#Server = https://mirror2.evolution-host.com/archlinux/$repo/os/$arch
 #Server = http://mirror.its.dal.ca/archlinux/$repo/os/$arch
 #Server = http://muug.ca/mirror/archlinux/$repo/os/$arch
 #Server = https://muug.ca/mirror/archlinux/$repo/os/$arch
 #Server = http://archlinux.mirror.rafal.ca/$repo/os/$arch
+#Server = http://mirror.scd31.com/arch/$repo/os/$arch
+#Server = https://mirror.scd31.com/arch/$repo/os/$arch
 #Server = http://mirror.sergal.org/archlinux/$repo/os/$arch
 #Server = https://mirror.sergal.org/archlinux/$repo/os/$arch
 
 ## Chile
+#Server = http://mirror.anquan.cl/archlinux/$repo/os/$arch
 #Server = http://mirror.archlinux.cl/$repo/os/$arch
+#Server = http://mirror1.cl.netactuate.com/archlinux/$repo/os/$arch
+#Server = https://mirror1.cl.netactuate.com/archlinux/$repo/os/$arch
+#Server = http://mirror.ufro.cl/archlinux/$repo/os/$arch
+#Server = https://mirror.ufro.cl/archlinux/$repo/os/$arch
 
 ## China
 #Server = http://mirrors.163.com/archlinux/$repo/os/$arch
+#Server = http://mirrors.bfsu.edu.cn/archlinux/$repo/os/$arch
+#Server = https://mirrors.bfsu.edu.cn/archlinux/$repo/os/$arch
+#Server = http://mirrors.cqu.edu.cn/archlinux/$repo/os/$arch
+#Server = https://mirrors.cqu.edu.cn/archlinux/$repo/os/$arch
+#Server = http://mirrors.dgut.edu.cn/archlinux/$repo/os/$arch
+#Server = https://mirrors.dgut.edu.cn/archlinux/$repo/os/$arch
 #Server = http://mirror.lzu.edu.cn/archlinux/$repo/os/$arch
 #Server = http://mirrors.neusoft.edu.cn/archlinux/$repo/os/$arch
 #Server = https://mirrors.neusoft.edu.cn/archlinux/$repo/os/$arch
-#Server = http://mirrors.shu.edu.cn/archlinux/$repo/os/$arch
+#Server = http://mirrors.nju.edu.cn/archlinux/$repo/os/$arch
-#Server = https://mirrors.shu.edu.cn/archlinux/$repo/os/$arch
+#Server = https://mirrors.nju.edu.cn/archlinux/$repo/os/$arch
-#Server = https://mirrors.shu6.edu.cn/archlinux/$repo/os/$arch
+#Server = http://mirror.redrock.team/archlinux/$repo/os/$arch
+#Server = https://mirror.redrock.team/archlinux/$repo/os/$arch
 #Server = https://mirrors.sjtug.sjtu.edu.cn/archlinux/$repo/os/$arch
 #Server = http://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch
-#Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch
+Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch
 #Server = http://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch
 #Server = https://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch
-#Server = http://mirrors.xjtu.edu.cn/archlinux/$repo/os/$arch
 #Server = https://mirrors.xjtu.edu.cn/archlinux/$repo/os/$arch
 #Server = http://mirrors.zju.edu.cn/archlinux/$repo/os/$arch
 
 ## Colombia
-#Server = http://mirror.upb.edu.co/archlinux/$repo/os/$arch
+#Server = http://mirrors.udenar.edu.co/archlinux/$repo/os/$arch
-#Server = http://mirror.venturasystems.tech/archlinux/$repo/os/$arch
 
 ## Croatia
 #Server = http://archlinux.iskon.hr/$repo/os/$arch
@@ -105,9 +125,8 @@
 #Server = http://mirror.vpsfree.cz/archlinux/$repo/os/$arch
 
 ## Denmark
-Server = http://mirrors.dotsrc.org/archlinux/$repo/os/$arch
+#Server = http://mirrors.dotsrc.org/archlinux/$repo/os/$arch
 #Server = https://mirrors.dotsrc.org/archlinux/$repo/os/$arch
-#Server = http://ftp.klid.dk/ftp/archlinux/$repo/os/$arch
 #Server = http://mirror.one.com/archlinux/$repo/os/$arch
 #Server = https://mirror.one.com/archlinux/$repo/os/$arch
 
@@ -118,118 +137,129 @@ Server = http://mirrors.dotsrc.org/archlinux/$repo/os/$arch
 
 ## Finland
 #Server = http://arch.mirror.far.fi/$repo/os/$arch
+#Server = http://mirror.hosthink.net/archlinux/$repo/os/$arch
+#Server = http://mirror.pseudoform.org/$repo/os/$arch
+#Server = https://mirror.pseudoform.org/$repo/os/$arch
 #Server = https://mirror.srv.fail/archlinux/$repo/os/$arch
+#Server = http://mirror.wuki.li/archlinux/$repo/os/$arch
+#Server = https://mirror.wuki.li/archlinux/$repo/os/$arch
 
 ## France
 #Server = http://archlinux.de-labrusse.fr/$repo/os/$arch
 #Server = http://mirror.archlinux.ikoula.com/archlinux/$repo/os/$arch
 #Server = http://archlinux.vi-di.fr/$repo/os/$arch
-#Server = https://archlinux.vi-di.fr/$repo/os/$arch
-#Server = http://mirror.armbrust.me/archlinux/$repo/os/$arch
-#Server = https://mirror.armbrust.me/archlinux/$repo/os/$arch
-#Server = http://mirrors.arnoldthebat.co.uk/archlinux/$repo/os/$arch
-#Server = https://mirrors.arnoldthebat.co.uk/archlinux/$repo/os/$arch
 #Server = http://archlinux.mirrors.benatherton.com/$repo/os/$arch
-#Server = http://fooo.biz/archlinux/$repo/os/$arch
+#Server = http://mirror.cyberbits.eu/archlinux/$repo/os/$arch
-#Server = https://fooo.biz/archlinux/$repo/os/$arch
+#Server = https://mirror.cyberbits.eu/archlinux/$repo/os/$arch
+#Server = https://mirrors.eric.ovh/arch/$repo/os/$arch
 #Server = http://mirror.ibcp.fr/pub/archlinux/$repo/os/$arch
 #Server = http://mirror.lastmikoi.net/archlinux/$repo/os/$arch
+#Server = https://arch-mirror.cloud.louifox.house/$repo/os/$arch
 #Server = http://archlinux.mailtunnel.eu/$repo/os/$arch
 #Server = https://archlinux.mailtunnel.eu/$repo/os/$arch
 #Server = http://mir.archlinux.fr/$repo/os/$arch
 #Server = http://mirrors.celianvdb.fr/archlinux/$repo/os/$arch
-#Server = https://mirrors.celianvdb.fr/archlinux/$repo/os/$arch
+Server = https://mirrors.celianvdb.fr/archlinux/$repo/os/$arch
-#Server = http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch
+#Server = http://arch.nimukaito.net/$repo/os/$arch
-#Server = http://mirrors.phx.ms/arch/$repo/os/$arch
+#Server = https://arch.nimukaito.net/$repo/os/$arch
-#Server = https://mirrors.phx.ms/arch/$repo/os/$arch
-#Server = http://archlinux.mirror.pkern.at/$repo/os/$arch
-#Server = https://archlinux.mirror.pkern.at/$repo/os/$arch
-#Server = http://archlinux.polymorf.fr/$repo/os/$arch
-#Server = http://mirrors.standaloneinstaller.com/archlinux/$repo/os/$arch
-#Server = http://arch.tamcore.eu/$repo/os/$arch
-#Server = https://mirror.thekinrar.fr/archlinux/$repo/os/$arch
-#Server = http://ftp.u-strasbg.fr/linux/distributions/archlinux/$repo/os/$arch
 #Server = http://mirror.oldsql.cc/archlinux/$repo/os/$arch
 #Server = https://mirror.oldsql.cc/archlinux/$repo/os/$arch
+#Server = http://archlinux.mirrors.ovh.net/archlinux/$repo/os/$arch
+#Server = http://archlinux.polymorf.fr/$repo/os/$arch
+#Server = http://archlinux.rezopole.net/$repo/os/$arch
+#Server = https://mirrors.slaanesh.org/archlinux/$repo/os/$arch
+#Server = http://mirrors.standaloneinstaller.com/archlinux/$repo/os/$arch
+#Server = https://mirror.sysa.tech/archlinux/$repo/os/$arch
+#Server = https://mirror.thekinrar.fr/archlinux/$repo/os/$arch
+#Server = http://ftp.u-strasbg.fr/linux/distributions/archlinux/$repo/os/$arch
 #Server = https://mirror.wormhole.eu/archlinux/$repo/os/$arch
+#Server = http://mirroir.wptheme.fr/archlinux/$repo/os/$arch
+#Server = https://mirroir.wptheme.fr/archlinux/$repo/os/$arch
 #Server = http://arch.yourlabs.org/$repo/os/$arch
 #Server = https://arch.yourlabs.org/$repo/os/$arch
 
+## Georgia
+#Server = http://archlinux.grena.ge/$repo/os/$arch
+#Server = https://archlinux.grena.ge/$repo/os/$arch
+
 ## Germany
-#Server = http://mirror.23media.de/archlinux/$repo/os/$arch
+#Server = http://mirror.23media.com/archlinux/$repo/os/$arch
+#Server = https://mirror.23media.com/archlinux/$repo/os/$arch
 #Server = https://appuals.com/archlinux/$repo/os/$arch
 #Server = http://artfiles.org/archlinux.org/$repo/os/$arch
 #Server = https://mirror.bethselamin.de/$repo/os/$arch
+#Server = http://mirror.chaoticum.net/arch/$repo/os/$arch
+#Server = https://mirror.chaoticum.net/arch/$repo/os/$arch
 #Server = http://mirror.checkdomain.de/archlinux/$repo/os/$arch
 #Server = https://mirror.checkdomain.de/archlinux/$repo/os/$arch
-#Server = http://arch.eckner.net/archlinux/$repo/os/$arch
+#Server = https://mirror.dogado.de/archlinux/$repo/os/$arch
-#Server = https://arch.eckner.net/archlinux/$repo/os/$arch
 #Server = http://mirror.f4st.host/archlinux/$repo/os/$arch
 #Server = https://mirror.f4st.host/archlinux/$repo/os/$arch
 #Server = http://ftp.fau.de/archlinux/$repo/os/$arch
 #Server = https://ftp.fau.de/archlinux/$repo/os/$arch
-#Server = http://mirror.gnomus.de/$repo/os/$arch
+#Server = https://dist-mirror.fem.tu-ilmenau.de/archlinux/$repo/os/$arch
+#Server = http://mirror.fsrv.services/archlinux/$repo/os/$arch
+#Server = https://mirror.fsrv.services/archlinux/$repo/os/$arch
+#Server = https://mirror.gnomus.de/$repo/os/$arch
 #Server = http://www.gutscheindrache.com/mirror/archlinux/$repo/os/$arch
 #Server = http://ftp.gwdg.de/pub/linux/archlinux/$repo/os/$arch
-#Server = http://mirror.hactar.xyz/$repo/os/$arch
-#Server = https://mirror.hactar.xyz/$repo/os/$arch
 #Server = http://archlinux.honkgong.info/$repo/os/$arch
 #Server = http://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/$arch
 #Server = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/$arch
 #Server = http://archlinux.mirror.iphh.net/$repo/os/$arch
-#Server = http://repo.itmettke.de/archlinux/$repo/os/$arch
-#Server = https://repo.itmettke.de/archlinux/$repo/os/$arch
-#Server = https://mirror.jankoppe.de/archlinux/$repo/os/$arch
 #Server = http://arch.jensgutermuth.de/$repo/os/$arch
 #Server = https://arch.jensgutermuth.de/$repo/os/$arch
-#Server = http://k42.ch/mirror/archlinux/$repo/os/$arch
+#Server = http://mirror.kumi.systems/archlinux/$repo/os/$arch
-#Server = https://k42.ch/mirror/archlinux/$repo/os/$arch
+#Server = https://mirror.kumi.systems/archlinux/$repo/os/$arch
-#Server = https://archlinux.layer8.fail/$repo/os/$arch
 #Server = http://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch
 #Server = https://mirror.fra10.de.leaseweb.net/archlinux/$repo/os/$arch
 #Server = http://mirror.metalgamer.eu/archlinux/$repo/os/$arch
 #Server = https://mirror.metalgamer.eu/archlinux/$repo/os/$arch
+#Server = http://mirror.mikrogravitation.org/archlinux/$repo/os/$arch
+#Server = https://mirror.mikrogravitation.org/archlinux/$repo/os/$arch
+#Server = https://ger.mirror.pkgbuild.com/$repo/os/$arch
+#Server = https://mirror.pkgbuild.com/$repo/os/$arch
 #Server = http://mirrors.n-ix.net/archlinux/$repo/os/$arch
 #Server = https://mirrors.n-ix.net/archlinux/$repo/os/$arch
 #Server = http://mirror.netcologne.de/archlinux/$repo/os/$arch
-#Server = https://mirror.netcologne.de/archlinux/$repo/os/$arch
+Server = https://mirror.netcologne.de/archlinux/$repo/os/$arch
 #Server = http://mirrors.niyawe.de/archlinux/$repo/os/$arch
 #Server = https://mirrors.niyawe.de/archlinux/$repo/os/$arch
-#Server = http://archlinux.nullpointer.io/$repo/os/$arch
-#Server = https://archlinux.nullpointer.io/$repo/os/$arch
 #Server = http://mirror.orbit-os.com/archlinux/$repo/os/$arch
 #Server = https://mirror.orbit-os.com/archlinux/$repo/os/$arch
 #Server = http://packages.oth-regensburg.de/archlinux/$repo/os/$arch
 #Server = https://packages.oth-regensburg.de/archlinux/$repo/os/$arch
-#Server = http://mirror.pseudoform.org/$repo/os/$arch
+#Server = http://phinau.de/arch/$repo/os/$arch
-#Server = https://mirror.pseudoform.org/$repo/os/$arch
+#Server = https://phinau.de/arch/$repo/os/$arch
 #Server = https://www.ratenzahlung.de/mirror/archlinux/$repo/os/$arch
 #Server = http://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
 #Server = https://ftp.halifax.rwth-aachen.de/archlinux/$repo/os/$arch
 #Server = http://linux.rz.rub.de/archlinux/$repo/os/$arch
+#Server = http://mirror.satis-faction.de/archlinux/$repo/os/$arch
+#Server = https://mirror.satis-faction.de/archlinux/$repo/os/$arch
 #Server = http://mirror.selfnet.de/archlinux/$repo/os/$arch
+#Server = https://mirror.selfnet.de/archlinux/$repo/os/$arch
 #Server = http://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch
 #Server = https://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/$arch
 #Server = http://archlinux.thaller.ws/$repo/os/$arch
 #Server = https://archlinux.thaller.ws/$repo/os/$arch
-#Server = http://archlinux.thelinuxnetworx.rocks/$repo/os/$arch
-#Server = https://archlinux.thelinuxnetworx.rocks/$repo/os/$arch
-#Server = http://mirror.thomaskilian.net/archlinux/$repo/os/$arch
-#Server = https://mirror.thomaskilian.net/archlinux/$repo/os/$arch
 #Server = http://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/$arch
 #Server = http://mirror.ubrco.de/archlinux/$repo/os/$arch
 #Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
+#Server = http://mirror.undisclose.de/archlinux/$repo/os/$arch
+#Server = https://mirror.undisclose.de/archlinux/$repo/os/$arch
 #Server = http://ftp.uni-bayreuth.de/linux/archlinux/$repo/os/$arch
 #Server = http://ftp.uni-hannover.de/archlinux/$repo/os/$arch
 #Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/$arch
 #Server = http://mirror.united-gameserver.de/archlinux/$repo/os/$arch
+#Server = https://arch.unixpeople.org/$repo/os/$arch
 #Server = http://ftp.wrz.de/pub/archlinux/$repo/os/$arch
 #Server = https://ftp.wrz.de/pub/archlinux/$repo/os/$arch
+#Server = http://mirror.wtnet.de/arch/$repo/os/$arch
+#Server = https://mirror.wtnet.de/arch/$repo/os/$arch
 
 ## Greece
 #Server = http://ftp.cc.uoc.gr/mirrors/linux/archlinux/$repo/os/$arch
-#Server = http://foss.aueb.gr/mirrors/linux/archlinux/$repo/os/$arch
-#Server = https://foss.aueb.gr/mirrors/linux/archlinux/$repo/os/$arch
 #Server = http://mirrors.myaegean.gr/linux/archlinux/$repo/os/$arch
 Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 #Server = http://ftp.otenet.gr/linux/archlinux/$repo/os/$arch
@@ -237,8 +267,8 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 ## Hong Kong
 #Server = http://mirror-hk.koddos.net/archlinux/$repo/os/$arch
 #Server = https://mirror-hk.koddos.net/archlinux/$repo/os/$arch
-#Server = http://mirrors.kurnode.com/archlinux/$repo/os/$arch
+#Server = http://hkg.mirror.rackspace.com/archlinux/$repo/os/$arch
-#Server = https://mirrors.kurnode.com/archlinux/$repo/os/$arch
+#Server = https://hkg.mirror.rackspace.com/archlinux/$repo/os/$arch
 #Server = https://arch-mirror.wtako.net/$repo/os/$arch
 #Server = http://mirror.xtom.com.hk/archlinux/$repo/os/$arch
 #Server = https://mirror.xtom.com.hk/archlinux/$repo/os/$arch
@@ -246,6 +276,12 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 ## Hungary
 #Server = http://ftp.energia.mta.hu/pub/mirrors/ftp.archlinux.org/$repo/os/$arch
 #Server = http://archmirror.hbit.sztaki.hu/archlinux/$repo/os/$arch
+#Server = http://nova.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch
+#Server = http://quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch
+#Server = http://super.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch
+#Server = https://nova.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch
+#Server = https://quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch
+#Server = https://super.quantum-mirror.hu/mirrors/pub/archlinux/$repo/os/$arch
 
 ## Iceland
 #Server = http://mirror.system.is/arch/$repo/os/$arch
@@ -253,19 +289,25 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 
 ## India
 #Server = http://mirror.cse.iitk.ac.in/archlinux/$repo/os/$arch
-#Server = http://ftp.iitm.ac.in/archlinux/$repo/os/$arch
+#Server = http://mirrors.piconets.webwerks.in/archlinux-mirror/$repo/os/$arch
-#Server = https://ind.mirror.pkgbuild.com/$repo/os/$arch
+#Server = https://mirrors.piconets.webwerks.in/archlinux-mirror/$repo/os/$arch
 
 ## Indonesia
+#Server = http://mirror.gi.co.id/archlinux/$repo/os/$arch
+#Server = https://mirror.gi.co.id/archlinux/$repo/os/$arch
+#Server = http://mirror.labkom.id/archlinux/$repo/os/$arch
+#Server = http://mirror.papua.go.id/archlinux/$repo/os/$arch
+#Server = https://mirror.papua.go.id/archlinux/$repo/os/$arch
 #Server = http://mirror.poliwangi.ac.id/archlinux/$repo/os/$arch
 #Server = http://suro.ubaya.ac.id/archlinux/$repo/os/$arch
+#Server = http://mirror.telkomuniversity.ac.id/archlinux/$repo/os/$arch
+#Server = https://mirror.telkomuniversity.ac.id/archlinux/$repo/os/$arch
 
 ## Iran
 #Server = http://repo.iut.ac.ir/repo/archlinux/$repo/os/$arch
-#Server = http://linuxmirrors.ir/pub/archlinux/$repo/os/$arch
+#Server = http://mirror.nak-mci.ir/arch/$repo/os/$arch
-#Server = https://linuxmirrors.ir/pub/archlinux/$repo/os/$arch
+#Server = http://mirror.rasanegar.com/archlinux/$repo/os/$arch
-#Server = http://repo.sadjad.ac.ir/arch/$repo/os/$arch
+#Server = https://mirror.rasanegar.com/archlinux/$repo/os/$arch
-#Server = https://repo.sadjad.ac.ir/arch/$repo/os/$arch
 
 ## Ireland
 #Server = http://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/$arch
@@ -277,7 +319,7 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 
 ## Italy
 #Server = https://archlinux.beccacervello.it/archlinux/$repo/os/$arch
-#Server = http://mi.mirror.garr.it/mirrors/archlinux/$repo/os/$arch
+#Server = http://archlinux.mirror.garr.it/archlinux/$repo/os/$arch
 #Server = http://mirrors.prometeus.net/archlinux/$repo/os/$arch
 
 ## Japan
@@ -286,46 +328,60 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 #Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch
 #Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
 #Server = https://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
-#Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
 
 ## Kazakhstan
 #Server = http://mirror.ps.kz/archlinux/$repo/os/$arch
 #Server = https://mirror.ps.kz/archlinux/$repo/os/$arch
 
+## Kenya
+#Server = http://archlinux.mirror.liquidtelecom.com/$repo/os/$arch
+#Server = https://archlinux.mirror.liquidtelecom.com/$repo/os/$arch
+
 ## Latvia
 #Server = http://archlinux.koyanet.lv/archlinux/$repo/os/$arch
 
 ## Lithuania
 #Server = http://mirrors.atviras.lt/archlinux/$repo/os/$arch
 #Server = https://mirrors.atviras.lt/archlinux/$repo/os/$arch
+#Server = http://mirrors.ims.nksc.lt/archlinux/$repo/os/$arch
+#Server = https://mirrors.ims.nksc.lt/archlinux/$repo/os/$arch
 
 ## Luxembourg
 #Server = http://archlinux.mirror.root.lu/$repo/os/$arch
 
-## Macedonia
-#Server = http://arch.softver.org.mk/archlinux/$repo/os/$arch
-#Server = http://mirror.t-home.mk/archlinux/$repo/os/$arch
-#Server = https://mirror.t-home.mk/archlinux/$repo/os/$arch
-
-## Mexico
-#Server = https://mex.mirror.pkgbuild.com/$repo/os/$arch
-
 ## Netherlands
+#Server = https://mirrors.daan.vodka/archlinux/$repo/os/$arch
 #Server = http://mirror.i3d.net/pub/archlinux/$repo/os/$arch
 #Server = https://mirror.i3d.net/pub/archlinux/$repo/os/$arch
+#Server = https://arch.jeweet.net/$repo/os/$arch
 #Server = http://mirror.koddos.net/archlinux/$repo/os/$arch
 #Server = https://mirror.koddos.net/archlinux/$repo/os/$arch
-#Server = http://archmirror.lavatech.top/$repo/os/$arch
+#Server = http://arch.mirrors.lavatech.top/$repo/os/$arch
-#Server = https://archmirror.lavatech.top/$repo/os/$arch
+#Server = https://arch.mirrors.lavatech.top/$repo/os/$arch
 #Server = http://mirror.ams1.nl.leaseweb.net/archlinux/$repo/os/$arch
 #Server = https://mirror.ams1.nl.leaseweb.net/archlinux/$repo/os/$arch
+#Server = http://archlinux.mirror.liteserver.nl/$repo/os/$arch
+#Server = https://archlinux.mirror.liteserver.nl/$repo/os/$arch
+#Server = http://mirror.lyrahosting.com/archlinux/$repo/os/$arch
+#Server = https://mirror.lyrahosting.com/archlinux/$repo/os/$arch
+#Server = http://mirror.mijn.host/archlinux/$repo/os/$arch
+#Server = https://mirror.mijn.host/archlinux/$repo/os/$arch
 #Server = http://mirror.neostrada.nl/archlinux/$repo/os/$arch
 #Server = https://mirror.neostrada.nl/archlinux/$repo/os/$arch
-#Server = http://mirror.netrouting.net/archlinux/$repo/os/$arch
 #Server = http://ftp.nluug.nl/os/Linux/distr/archlinux/$repo/os/$arch
+#Server = http://archlinux.mirror.pcextreme.nl/$repo/os/$arch
+#Server = https://archlinux.mirror.pcextreme.nl/$repo/os/$arch
+#Server = http://mirror.serverion.com/archlinux/$repo/os/$arch
+#Server = https://mirror.serverion.com/archlinux/$repo/os/$arch
 #Server = http://ftp.snt.utwente.nl/pub/os/linux/archlinux/$repo/os/$arch
+#Server = http://mirror.tarellia.net/distr/archlinux/$repo/os/$arch
+#Server = https://mirror.tarellia.net/distr/archlinux/$repo/os/$arch
 #Server = http://archlinux.mirror.wearetriple.com/$repo/os/$arch
 #Server = https://archlinux.mirror.wearetriple.com/$repo/os/$arch
+#Server = http://mirror-archlinux.webruimtehosting.nl/$repo/os/$arch
+#Server = https://mirror-archlinux.webruimtehosting.nl/$repo/os/$arch
+#Server = http://mirrors.xtom.nl/archlinux/$repo/os/$arch
+#Server = https://mirrors.xtom.nl/archlinux/$repo/os/$arch
 
 ## New Caledonia
 #Server = http://mirror.lagoon.nc/pub/archlinux/$repo/os/$arch
@@ -333,25 +389,46 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 #Server = https://archlinux.nautile.nc/archlinux/$repo/os/$arch
 
 ## New Zealand
+#Server = http://mirror.fsmg.org.nz/archlinux/$repo/os/$arch
+#Server = https://mirror.fsmg.org.nz/archlinux/$repo/os/$arch
 #Server = http://mirror.smith.geek.nz/archlinux/$repo/os/$arch
 #Server = https://mirror.smith.geek.nz/archlinux/$repo/os/$arch
-#Server = https://arch.mirrors.theom.nz/$repo/os/$arch
+
+## North Macedonia
+#Server = http://arch.softver.org.mk/archlinux/$repo/os/$arch
+#Server = http://mirror.onevip.mk/archlinux/$repo/os/$arch
+#Server = http://mirror.t-home.mk/archlinux/$repo/os/$arch
+#Server = https://mirror.t-home.mk/archlinux/$repo/os/$arch
 
 ## Norway
 #Server = http://mirror.archlinux.no/$repo/os/$arch
+#Server = https://mirror.archlinux.no/$repo/os/$arch
 #Server = http://archlinux.uib.no/$repo/os/$arch
-#Server = http://mirror.homelab.no/archlinux/$repo/os/$arch
-#Server = https://mirror.homelab.no/archlinux/$repo/os/$arch
 #Server = http://mirror.neuf.no/archlinux/$repo/os/$arch
 #Server = https://mirror.neuf.no/archlinux/$repo/os/$arch
+#Server = http://mirror.terrahost.no/linux/archlinux/$repo/os/$arch
+
+## Pakistan
+#Server = http://repo.inara.pk/archlinux/$repo/os/$arch
+#Server = https://repo.inara.pk/archlinux/$repo/os/$arch
+
+## Paraguay
+#Server = http://archlinux.mirror.py/archlinux/$repo/os/$arch
 
 ## Philippines
 #Server = http://mirror.rise.ph/archlinux/$repo/os/$arch
 
 ## Poland
+#Server = http://ftp.icm.edu.pl/pub/Linux/dist/archlinux/$repo/os/$arch
+#Server = https://ftp.icm.edu.pl/pub/Linux/dist/archlinux/$repo/os/$arch
 #Server = http://arch.midov.pl/arch/$repo/os/$arch
+#Server = https://arch.midov.pl/arch/$repo/os/$arch
+#Server = http://arch.nixlab.pl/$repo/os/$arch
+#Server = https://arch.nixlab.pl/$repo/os/$arch
 #Server = http://mirror.onet.pl/pub/mirrors/archlinux/$repo/os/$arch
 #Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/$arch
+#Server = http://mirror.sfinae.tech/pub/mirrors/archlinux/$repo/os/$arch
+#Server = https://mirror.sfinae.tech/pub/mirrors/archlinux/$repo/os/$arch
 #Server = http://ftp.vectranet.pl/archlinux/$repo/os/$arch
 
 ## Portugal
@@ -360,10 +437,13 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 #Server = http://ftp.rnl.tecnico.ulisboa.pt/pub/archlinux/$repo/os/$arch
 #Server = https://ftp.rnl.tecnico.ulisboa.pt/pub/archlinux/$repo/os/$arch
 
-## Qatar
-#Server = http://mirror.qnren.qa/archlinux/$repo/os/$arch
-
 ## Romania
+#Server = http://mirrors.chroot.ro/archlinux/$repo/os/$arch
+#Server = https://mirrors.chroot.ro/archlinux/$repo/os/$arch
+#Server = http://mirror.efect.ro/archlinux/$repo/os/$arch
+#Server = https://mirror.efect.ro/archlinux/$repo/os/$arch
+#Server = http://mirrors.hostico.ro/archlinux/$repo/os/$arch
+#Server = https://mirrors.hostico.ro/archlinux/$repo/os/$arch
 #Server = http://archlinux.mirrors.linux.ro/$repo/os/$arch
 #Server = http://mirrors.m247.ro/archlinux/$repo/os/$arch
 #Server = http://mirrors.nav.ro/archlinux/$repo/os/$arch
@@ -373,8 +453,7 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 #Server = https://mirrors.pidginhost.com/arch/$repo/os/$arch
 
 ## Russia
-#Server = http://mirror.aur.rocks/$repo/os/$arch
+#Server = http://mirrors.powernet.com.ru/archlinux/$repo/os/$arch
-#Server = https://mirror.aur.rocks/$repo/os/$arch
 #Server = http://mirror.rol.ru/archlinux/$repo/os/$arch
 #Server = https://mirror.rol.ru/archlinux/$repo/os/$arch
 #Server = http://mirror.truenetwork.ru/archlinux/$repo/os/$arch
@@ -389,7 +468,9 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 ## Singapore
 #Server = http://mirror.0x.sg/archlinux/$repo/os/$arch
 #Server = https://mirror.0x.sg/archlinux/$repo/os/$arch
-#Server = https://sgp.mirror.pkgbuild.com/$repo/os/$arch
+#Server = http://mirror.aktkn.sg/archlinux/$repo/os/$arch
+#Server = https://mirror.aktkn.sg/archlinux/$repo/os/$arch
+#Server = https://download.nus.edu.sg/mirror/archlinux/$repo/os/$arch
 #Server = http://mirror.nus.edu.sg/archlinux/$repo/os/$arch
 
 ## Slovakia
@@ -402,25 +483,35 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 #Server = https://archimonde.ts.si/archlinux/$repo/os/$arch
 
 ## South Africa
+#Server = http://archlinux.za.mirror.allworldit.com/archlinux/$repo/os/$arch
+#Server = https://archlinux.za.mirror.allworldit.com/archlinux/$repo/os/$arch
 #Server = http://za.mirror.archlinux-br.org/$repo/os/$arch
 #Server = http://mirror.is.co.za/mirror/archlinux.org/$repo/os/$arch
-#Server = http://mirror.wbs.co.za/archlinux/$repo/os/$arch
+#Server = http://mirrors.urbanwave.co.za/archlinux/$repo/os/$arch
+#Server = https://mirrors.urbanwave.co.za/archlinux/$repo/os/$arch
 
 ## South Korea
-#Server = http://ftp.kaist.ac.kr/ArchLinux/$repo/os/$arch
+#Server = http://ftp.harukasan.org/archlinux/$repo/os/$arch
+#Server = https://ftp.harukasan.org/archlinux/$repo/os/$arch
 #Server = http://ftp.lanet.kr/pub/archlinux/$repo/os/$arch
 #Server = https://ftp.lanet.kr/pub/archlinux/$repo/os/$arch
 #Server = http://mirror.premi.st/archlinux/$repo/os/$arch
+#Server = https://mirror.premi.st/archlinux/$repo/os/$arch
 
 ## Spain
-#Server = http://osl.ugr.es/archlinux/$repo/os/$arch
+#Server = https://mirror.cloroformo.org/archlinux/$repo/os/$arch
+#Server = http://mirror.librelabucm.org/archlinux/$repo/os/$arch
+#Server = https://mirror.librelabucm.org/archlinux/$repo/os/$arch
+#Server = https://osl.ugr.es/archlinux/$repo/os/$arch
 #Server = http://ftp.rediris.es/mirror/archlinux/$repo/os/$arch
+#Server = http://sharing.thelinuxsect.com/archlinux/$repo/os/$arch
 
 ## Sweden
 #Server = http://ftp.acc.umu.se/mirror/archlinux/$repo/os/$arch
 #Server = https://ftp.acc.umu.se/mirror/archlinux/$repo/os/$arch
 #Server = http://archlinux.dynamict.se/$repo/os/$arch
 #Server = https://archlinux.dynamict.se/$repo/os/$arch
+#Server = http://ftpmirror.infania.net/mirror/archlinux/$repo/os/$arch
 #Server = http://ftp.lysator.liu.se/pub/archlinux/$repo/os/$arch
 #Server = https://ftp.lysator.liu.se/pub/archlinux/$repo/os/$arch
 #Server = http://ftp.myrveln.se/pub/linux/archlinux/$repo/os/$arch
@@ -430,15 +521,20 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 ## Switzerland
 #Server = http://pkg.adfinis-sygroup.ch/archlinux/$repo/os/$arch
 #Server = https://pkg.adfinis-sygroup.ch/archlinux/$repo/os/$arch
-#Server = https://mirror.datacenterlight.ch/mirror/packages/archlinux/$repo/os/$arch
+#Server = http://mirror.init7.net/archlinux/$repo/os/$arch
+#Server = https://mirror.init7.net/archlinux/$repo/os/$arch
 #Server = http://mirror.puzzle.ch/archlinux/$repo/os/$arch
 #Server = https://mirror.puzzle.ch/archlinux/$repo/os/$arch
+#Server = https://mirror.ungleich.ch/mirror/packages/archlinux/$repo/os/$arch
 
 ## Taiwan
+#Server = http://archlinux.ccns.ncku.edu.tw/archlinux/$repo/os/$arch
 #Server = http://archlinux.cs.nctu.edu.tw/$repo/os/$arch
 #Server = http://shadow.ind.ntou.edu.tw/archlinux/$repo/os/$arch
+#Server = https://shadow.ind.ntou.edu.tw/archlinux/$repo/os/$arch
 #Server = http://ftp.tku.edu.tw/Linux/ArchLinux/$repo/os/$arch
 #Server = http://ftp.yzu.edu.tw/Linux/archlinux/$repo/os/$arch
+#Server = https://ftp.yzu.edu.tw/Linux/archlinux/$repo/os/$arch
 
 ## Thailand
 #Server = http://mirror.kku.ac.th/archlinux/$repo/os/$arch
@@ -452,15 +548,27 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 ## Ukraine
 #Server = http://archlinux.ip-connect.vn.ua/$repo/os/$arch
 #Server = https://archlinux.ip-connect.vn.ua/$repo/os/$arch
+#Server = http://mirror.mirohost.net/archlinux/$repo/os/$arch
+#Server = https://mirror.mirohost.net/archlinux/$repo/os/$arch
 #Server = http://mirrors.nix.org.ua/linux/archlinux/$repo/os/$arch
 #Server = https://mirrors.nix.org.ua/linux/archlinux/$repo/os/$arch
 
 ## United Kingdom
+#Server = http://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch
+#Server = https://archlinux.uk.mirror.allworldit.com/archlinux/$repo/os/$arch
 #Server = http://mirror.bytemark.co.uk/archlinux/$repo/os/$arch
 #Server = https://mirror.bytemark.co.uk/archlinux/$repo/os/$arch
+#Server = http://mirrors.gethosted.online/archlinux/$repo/os/$arch
+#Server = https://mirrors.gethosted.online/archlinux/$repo/os/$arch
 #Server = http://mirrors.manchester.m247.com/arch-linux/$repo/os/$arch
+#Server = http://mirrors.melbourne.co.uk/archlinux/$repo/os/$arch
+#Server = https://mirrors.melbourne.co.uk/archlinux/$repo/os/$arch
 #Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/$arch
 #Server = https://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/$arch
+#Server = http://mirror.netweaver.uk/archlinux/$repo/os/$arch
+#Server = https://mirror.netweaver.uk/archlinux/$repo/os/$arch
+#Server = http://lon.mirror.rackspace.com/archlinux/$repo/os/$arch
+Server = https://lon.mirror.rackspace.com/archlinux/$repo/os/$arch
 #Server = http://arch.serverspace.co.uk/arch/$repo/os/$arch
 #Server = http://archlinux.mirrors.uk2.net/$repo/os/$arch
 #Server = http://mirrors.ukfast.co.uk/sites/archlinux.org/$repo/os/$arch
@@ -474,59 +582,83 @@ Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/$arch
 #Server = http://il.us.mirror.archlinux-br.org/$repo/os/$arch
 #Server = http://archlinux.surlyjake.com/archlinux/$repo/os/$arch
 #Server = https://archlinux.surlyjake.com/archlinux/$repo/os/$arch
+#Server = http://mirror.arizona.edu/archlinux/$repo/os/$arch
+#Server = https://mirror.arizona.edu/archlinux/$repo/os/$arch
 #Server = http://arlm.tyzoid.com/$repo/os/$arch
 #Server = https://arlm.tyzoid.com/$repo/os/$arch
-#Server = http://mirror.as65535.net/archlinux/$repo/os/$arch
 #Server = http://mirrors.cat.pdx.edu/archlinux/$repo/os/$arch
 #Server = http://mirror.cc.columbia.edu/pub/linux/archlinux/$repo/os/$arch
-#Server = http://centos.mbni.med.umich.edu/archlinux/$repo/os/$arch
 #Server = http://arch.mirror.constant.com/$repo/os/$arch
 #Server = https://arch.mirror.constant.com/$repo/os/$arch
 #Server = http://mirror.cs.pitt.edu/archlinux/$repo/os/$arch
 #Server = http://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/$arch
 #Server = http://distro.ibiblio.org/archlinux/$repo/os/$arch
-#Server = http://mirror.epiphyte.network/archlinux/$repo/os/$arch
-#Server = https://mirror.epiphyte.network/archlinux/$repo/os/$arch
 #Server = http://mirror.es.its.nyu.edu/archlinux/$repo/os/$arch
 #Server = http://mirrors.gigenet.com/archlinux/$repo/os/$arch
-#Server = http://mirror.grig.io/archlinux/$repo/os/$arch
-#Server = https://mirror.grig.io/archlinux/$repo/os/$arch
 #Server = http://www.gtlib.gatech.edu/pub/archlinux/$repo/os/$arch
-#Server = http://mirror.hackingand.coffee/arch/$repo/os/$arch
+#Server = http://mirror.dc02.hackingand.coffee/arch/$repo/os/$arch
-#Server = https://mirror.hackingand.coffee/arch/$repo/os/$arch
+#Server = https://mirror.dc02.hackingand.coffee/arch/$repo/os/$arch
+#Server = https://mirror.hodgepodge.dev/archlinux/$repo/os/$arch
+#Server = http://arch.hu.fo/archlinux/$repo/os/$arch
+#Server = https://arch.hu.fo/archlinux/$repo/os/$arch
+#Server = http://repo.ialab.dsu.edu/archlinux/$repo/os/$arch
+#Server = https://repo.ialab.dsu.edu/archlinux/$repo/os/$arch
 #Server = http://mirrors.kernel.org/archlinux/$repo/os/$arch
 #Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch
 #Server = http://mirror.dal10.us.leaseweb.net/archlinux/$repo/os/$arch
+#Server = http://mirror.mia11.us.leaseweb.net/archlinux/$repo/os/$arch
 #Server = http://mirror.sfo12.us.leaseweb.net/archlinux/$repo/os/$arch
 #Server = http://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch
 #Server = https://mirror.dal10.us.leaseweb.net/archlinux/$repo/os/$arch
+#Server = https://mirror.mia11.us.leaseweb.net/archlinux/$repo/os/$arch
 #Server = https://mirror.sfo12.us.leaseweb.net/archlinux/$repo/os/$arch
 #Server = https://mirror.wdc1.us.leaseweb.net/archlinux/$repo/os/$arch
 #Server = http://mirrors.liquidweb.com/archlinux/$repo/os/$arch
 #Server = http://mirror.lty.me/archlinux/$repo/os/$arch
 #Server = https://mirror.lty.me/archlinux/$repo/os/$arch
+#Server = http://reflector.luehm.com/arch/$repo/os/$arch
+#Server = https://reflector.luehm.com/arch/$repo/os/$arch
 #Server = http://mirrors.lug.mtu.edu/archlinux/$repo/os/$arch
 #Server = https://mirrors.lug.mtu.edu/archlinux/$repo/os/$arch
 #Server = http://mirror.math.princeton.edu/pub/archlinux/$repo/os/$arch
 #Server = http://mirror.metrocast.net/archlinux/$repo/os/$arch
 #Server = http://mirror.kaminski.io/archlinux/$repo/os/$arch
 #Server = https://mirror.kaminski.io/archlinux/$repo/os/$arch
+#Server = http://iad.mirrors.misaka.one/archlinux/$repo/os/$arch
+#Server = https://iad.mirrors.misaka.one/archlinux/$repo/os/$arch
+#Server = http://repo.miserver.it.umich.edu/archlinux/$repo/os/$arch
+#Server = http://mirrors.mit.edu/archlinux/$repo/os/$arch
+#Server = https://mirrors.mit.edu/archlinux/$repo/os/$arch
 #Server = http://mirrors.ocf.berkeley.edu/archlinux/$repo/os/$arch
-#Server = https://mirrors.ocf.berkeley.edu/archlinux/$repo/os/$arch
+Server = https://mirrors.ocf.berkeley.edu/archlinux/$repo/os/$arch
+#Server = http://archmirror1.octyl.net/$repo/os/$arch
+#Server = https://archmirror1.octyl.net/$repo/os/$arch
 #Server = http://ftp.osuosl.org/pub/archlinux/$repo/os/$arch
 #Server = http://arch.mirrors.pair.com/$repo/os/$arch
+#Server = http://dfw.mirror.rackspace.com/archlinux/$repo/os/$arch
+#Server = http://iad.mirror.rackspace.com/archlinux/$repo/os/$arch
+#Server = http://ord.mirror.rackspace.com/archlinux/$repo/os/$arch
+#Server = https://dfw.mirror.rackspace.com/archlinux/$repo/os/$arch
+#Server = https://iad.mirror.rackspace.com/archlinux/$repo/os/$arch
+#Server = https://ord.mirror.rackspace.com/archlinux/$repo/os/$arch
+#Server = http://plug-mirror.rcac.purdue.edu/archlinux/$repo/os/$arch
+#Server = https://plug-mirror.rcac.purdue.edu/archlinux/$repo/os/$arch
 #Server = http://mirrors.rit.edu/archlinux/$repo/os/$arch
 #Server = https://mirrors.rit.edu/archlinux/$repo/os/$arch
+#Server = https://arch.rrig.gs/$repo/os/$arch
 #Server = http://mirrors.rutgers.edu/archlinux/$repo/os/$arch
-#Server = https://mirrors.rutgers.edu/archlinux/$repo/os/$arch
+Server = https://mirrors.rutgers.edu/archlinux/$repo/os/$arch
+#Server = http://mirror.siena.edu/archlinux/$repo/os/$arch
 #Server = http://mirrors.sonic.net/archlinux/$repo/os/$arch
 #Server = https://mirrors.sonic.net/archlinux/$repo/os/$arch
-#Server = http://mirrors.sorengard.com/archlinux/$repo/os/$arch
-#Server = https://mirrors.sorengard.com/archlinux/$repo/os/$arch
 #Server = http://arch.mirror.square-r00t.net/$repo/os/$arch
 #Server = https://arch.mirror.square-r00t.net/$repo/os/$arch
 #Server = http://mirror.stephen304.com/archlinux/$repo/os/$arch
 #Server = https://mirror.stephen304.com/archlinux/$repo/os/$arch
+#Server = http://ftp.sudhip.com/archlinux/$repo/os/$arch
+#Server = https://ftp.sudhip.com/archlinux/$repo/os/$arch
+#Server = http://mirror.pit.teraswitch.com/archlinux/$repo/os/$arch
+#Server = https://mirror.pit.teraswitch.com/archlinux/$repo/os/$arch
 #Server = http://mirror.umd.edu/archlinux/$repo/os/$arch
 #Server = http://mirror.vtti.vt.edu/archlinux/$repo/os/$arch
 #Server = http://mirrors.xmission.com/archlinux/$repo/os/$arch

community/root-overlay/etc/runlevels

@@ -1 +0,0 @@
-../../live-overlay/etc/runlevels

community/root-overlay/etc/runlevels/boot/consolefont

@@ -0,0 +1 @@
+../../init.d/consolefont

community/root-overlay/usr/lib/firefox/distribution/distribution.ini

@@ -5,7 +5,8 @@ about=Mozilla Firefox for Artix Linux
 
 [Preferences]
 app.distributor=artixlinux
-app.distributor.channel=firefox
+app.distributor.channel=$pkgname
+app.partner.artixlinux=artixlinux
 
 # Disable multiple tab close warning
 browser.tabs.warnOnClose=false
@@ -27,10 +28,10 @@ network.cookie.cookieBehavior=1
 privacy.trackingprotection.enabled=true
 privacy.trackingprotection.introCount=20
 
-# Telemetry: report everything, no prompting.
+# Telemetry: report nothing, no prompting.
-toolkit.telemetry.enabled=true
+toolkit.telemetry.enabled=false
-browser.crashReports.unsubmittedCheck.autoSubmit=true
+browser.crashReports.unsubmittedCheck.autoSubmit=false
-datareporting.policy.dataSubmissionPolicyBypassNotification=true
+datareporting.policy.dataSubmissionPolicyBypassNotification=false
 
 # Disable first-run annoyances.
 browser.rights.3.shown=true
@@ -49,10 +50,6 @@ browser.startup.firstrunSkipsHomepage=false
 browser.search.widget.inNavBar=true
 datareporting.healthreport.uploadEnabled=false
 
-#extensions.update.autoUpdateDefault=true
-#extensions.installedDistroAddon.addon@darkreader.org=false
-#extensions.webextensions.ExtensionStorageIDB.migrated.addon@darkreader.org=false
-
 # This will be needed from FF69 onwards
 toolkit.legacyUserProfileCustomizations.stylesheets=true
 
@@ -60,7 +57,6 @@ toolkit.legacyUserProfileCustomizations.stylesheets=true
 [LocalizablePreferences]
 browser.startup.homepage="https://artixlinux.org"
 
-
 [BookmarksToolbar]
 item.1.title=Artix
 item.1.link=https://artixlinux.org/

fucktheskullofsystemd.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # nous,2019-2020
 
 # How to use
@@ -19,17 +19,16 @@
 source /usr/share/makepkg/util/message.sh
 colorize
 
-echo "$BOLD You should run this from inside screen(1) or tmux(1),"
+echo "$ALL_OFF$BOLD You should run this from inside screen(1) or tmux(1),"
 echo "$BOLD especially if this is a remote box."
 echo "$BOLD Use a terminal/session with a large scrollback buffer"
 echo
-echo "$RED Last chance to press CTRL-C, ENTER to continue."
+read -n 1 -p "$RED Last chance to press CTRL-C, ENTER to continue. "
-read
 echo
 echo "$CYAN Starting operation FUCKTHESKULLOFSYSTEMD"
 echo
 
-testerror() { [[ $res > 0 ]] && { echo "$RED An error occured, aborting to prevent incomplete conversion. Fix it and re-run the script FROM THE LAST STEP ONWARDS."; exit 1; } }
+testerror() { [[ $res > 0 ]] && { echo "$RED An error occured, aborting to prevent incomplete conversion. Fix it and re-run the script FROM THE LAST STEP ONWARDS.$ALL_OFF"; exit 1; } }
 [[ $1 == openrc ]] && target=openrc
 [[ $1 == runit ]] && target=runit
 
@@ -40,10 +39,10 @@ testerror() { [[ $res > 0 ]] && { echo "$RED An error occured, aborting to preve
 rm -f /var/lib/pacman/db.lck
 sed -i s/Arch/Artix/g /etc/default/grub
 # A full systemd update is needed, because libsystemd->systemd-libs
-echo "$GREEN Updating system first, if this fails abort and update manually; then re-run the script $ALL_OFF"
+echo "$GREEN Updating Arch system first, if this fails abort and update manually; then re-run the script $ALL_OFF"
 pacman -Syu --noconfirm
 res=$?; testerror
-pacman -S --needed --noconfirm wget nano
+pacman -S --needed --noconfirm wget nano rsync
 res=$?; testerror
 
 cd /etc
@@ -52,6 +51,7 @@ echo "$GREEN Replacing Arch repositories with Artix $ALL_OFF"
 mv -vf pacman.conf pacman.conf.arch
 wget https://gitea.artixlinux.org/packagesP/pacman/raw/branch/master/trunk/pacman.conf -O /etc/pacman.conf
 res=$?; testerror
+sed -i 's/#Parallel/Parallel/' /etc/pacman.conf
 mv -vf pacman.d/mirrorlist pacman.d/mirrorlist-arch
 wget https://gitea.artixlinux.org/packagesA/artix-mirrorlist/raw/branch/master/trunk/mirrorlist -O pacman.d/mirrorlist
 res=$?; testerror
@@ -62,9 +62,8 @@ echo "$GREEN Refreshing package databases $ALL_OFF"
 pacman -Syy --noconfirm
 res=$?; testerror
 echo
-echo "$GREEN Press ENTER and answer <yes> to the next question to make sure all packages come from Artix repos $ALL_OFF"
+read -n 1 -p "$GREEN Press ENTER and answer <yes> to the next question to make sure all packages come from Artix repos $ALL_OFF "
 echo
-read
 pacman -Scc
 
 echo "$GREEN Importing Artix keys $ALL_OFF"
@@ -75,24 +74,26 @@ res=$?; testerror
 pacman-key --lsign-key 95AEC5D0C1E294FC9F82B253573A673A53C01BC2
 res=$?; testerror
 
-systemctl list-units --state=running | grep -v systemd | awk '{print $1}' | grep service > /root/daemon.list
+[ -x /bin/systemctl ] && systemctl list-units --state=running | grep -v systemd | awk '{print $1}' | grep service > /root/daemon.list
 echo "$MAGENTA Your systemd running units are saved in /root/daemon.list.$ALL_OFF"
 echo
-echo "$RED Do not proceed if you've seen errors above - press CTRL-C to abort or ENTER to continue $ALL_OFF"
+read -n 1 -p "$RED Do not proceed if you've seen errors above - press CTRL-C to abort or ENTER to continue $ALL_OFF "
-read
 echo
 echo "$GREEN Downloading systemd-free packages from Artix $ALL_OFF"
-pacman -Sw --noconfirm base base-devel openrc-system grub linux-lts linux-lts-headers elogind-openrc openrc netifrc grub mkinitcpio archlinux-mirrorlist net-tools rsync nano lsb-release opensysusers opentmpfiles
+pacman -Sw --noconfirm base base-devel openrc-system grub linux-lts linux-lts-headers elogind-openrc openrc netifrc grub mkinitcpio archlinux-mirrorlist net-tools rsync nano lsb-release esysusers etmpfiles
 res=$?; testerror
 echo "$YELLOW This is the best part: removing systemd $ALL_OFF"
 pacman -Rdd --noconfirm systemd systemd-libs systemd-sysvcompat pacman-mirrorlist dbus
-res=$?; testerror
 
 # Previous pacman-mirrorlist removal also deleted this, restoring
 cp -vf pacman.d/mirrorlist.artix pacman.d/mirrorlist
 
 echo "$GREEN Installing clean Artix packages $ALL_OFF"
-pacman -S --noconfirm --overwrite '*' base base-devel openrc-system linux-lts linux-lts-headers elogind-openrc openrc netifrc grub mkinitcpio archlinux-mirrorlist net-tools rsync nano lsb-release connman opensysusers opentmpfiles
+pacman -S --noconfirm elogind-openrc
+pacman -Qqn | pacman -S --noconfirm --overwrite '*' -
+res=$?; testerror
+echo "$GREEN Installing Artix system packages $ALL_OFF"
+pacman -S --noconfirm --needed --overwrite '*' base base-devel openrc-system linux-lts linux-lts-headers elogind-openrc openrc netifrc grub mkinitcpio archlinux-mirrorlist net-tools rsync nano lsb-release connman esysusers etmpfiles artix-branding-base
 res=$?; testerror
 echo "$GREEN Installing service files $ALL_OFF"
 pacman -S --noconfirm --needed at-openrc xinetd-openrc cronie-openrc haveged-openrc hdparm-openrc openssh-openrc syslog-ng-openrc connman-openrc
@@ -111,9 +112,9 @@ echo "$BOLD Activating standard network interface naming (i.e. enp72^7s128%397 -
 echo "$BOLD If you prefer the persistent naming, remove the last line from /etc/default/grub"
 echo "$BOLD and run $ALL_OFF grub-mkconfig -o /boot/grub/grub.cfg $BOLD when this script prompts for reboot."
 echo
-echo "Press ENTER $ALL_OFF"
+read -n 1 -p "Press ENTER $ALL_OFF"
-read
 echo 'GRUB_CMDLINE_LINUX="net.ifnames=0"' >>/etc/default/grub
+echo 'GRUB_DISABLE_OS_PROBER="false"' >>/etc/default/grub
 
 pacman -S --needed --noconfirm netifrc
 echo "============================="
@@ -128,7 +129,7 @@ echo "$BOLD you MUST enable the daemon manually BEFORE rebooting.         "
 echo "$BOLD You will be given the option at the end of this procedure.    "
 echo "$BOLD Default setting is DHCP for eth0, should be enough for most.$ALL_OFF"
 echo "==============================================================="
-read
+read -n 1 -p " "
 nano /etc/conf.d/net
 ln -sf /etc/init.d/net.lo /etc/init.d/net.eth0
 rc-update add net.eth0 default
@@ -166,7 +167,7 @@ echo "=Or switch console/terminal and type as root="
 echo "= $BOLD         rc-service add connmand        $ALL_OFF  ="
 echo "=    then switch back here and continue     ="
 echo "============================================="
-read
+read -n 1 -p " "
 sync
 mount -f / -o remount,ro
 echo s >| /proc/sysrq-trigger

linexa/Packages-Live

@@ -1,77 +0,0 @@
-### packages added here will not be installed on the target system
-
-mkinitcpio-nfs-utils
-squashfs-tools
-nbd
-
-@openrc artix-live-openrc
-@runit artix-live-runit
-@s6 artix-live-s6
-
-artix-grub-theme
-
-sddm-theme-artix
-artix-lxqt-presets
-artix-docs
-
-@openrc connman-openrc
-@openrc ntp-openrc
-@openrc bluez-openrc
-
-@runit connman-runit
-@runit ntp-runit
-@runit bluez-runit
-@runit blocaled
-
-@s6 blocaled
-@s6 connman-s6
-@s6 ntp-s6
-@s6 bluez-s6
-
-intel-ucode
-amd-ucode
-sddm
-@openrc displaymanager-openrc
-@runit sddm-runit
-@s6 sddm-s6
-cmst
-
-calamares-branding
-
-lxqt
-
-compton
-lximage-qt
-qpdfview
-gvfs
-kwrite
-obconf-qt
-pcmanfm-qt
-falkon
-xarchiver
-
-terminus-font
-ttf-bitstream-vera
-ttf-dejavu
-ttf-droid
-ttf-inconsolata
-ttf-liberation
-
-xdg-user-dirs
-xdg-utils
-
-xorg-server
-xorg-xinit
-
-xf86-input-vmmouse
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo

linexa/Packages-Root

@@ -1,97 +0,0 @@
-base
-@openrc elogind-openrc
-@runit elogind-runit
-@s6 elogind-s6
-acpi
-b43-fwcutter
-btrfs-progs
-crda
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-exfat-utils
-f2fs-tools
-grub
-htop
-inetutils
-iptables
-ipw2100-fw
-ipw2200-fw
-jfsutils
-linux
-linux-headers
-linux-firmware
-logrotate
-lsb-release
-man-db
-man-pages
-memtest86+
-mkinitcpio
-mkinitcpio-openswap
-nano
-vi
-net-tools
-ntfs-3g
-@openrc acpid-openrc
-@openrc cronie-openrc
-@openrc cryptsetup-openrc
-@openrc dhcpcd-openrc
-@openrc haveged-openrc
-@openrc lvm2-openrc
-@openrc mdadm-openrc
-@openrc nfs-utils-openrc
-@openrc rsync-openrc
-@openrc openssh-openrc
-@openrc wpa_supplicant-openrc
-@openrc syslog-ng-openrc
-@runit acpid-runit
-@runit cronie-runit
-@runit cryptsetup-runit
-@runit dhcpcd-runit
-@runit haveged-runit
-@runit lvm2-runit
-@runit mdadm-runit
-@runit nfs-utils-runit
-@runit rsync-runit
-@runit openssh-runit
-@runit wpa_supplicant-runit
-@runit syslog-ng-runit
-@s6 acpid-s6
-@s6 cronie-s6
-@s6 cryptsetup-s6
-@s6 dhcpcd-s6
-@s6 haveged-s6
-@s6 lvm2-s6
-@s6 mdadm-s6
-@s6 nfs-utils-s6
-@s6 rsync-s6
-@s6 openssh-s6
-@s6 wpa_supplicant-s6
-@s6 syslog-ng-s6
-os-prober
-reiserfsprogs
-s-nail
-sudo
-sysfsutils
-texinfo
-usbutils
-which
-efibootmgr
-xfsprogs
-zsh
-
-## server
-@openrc apache-openrc
-#@openrc mysql-openrc
-@openrc postgresql-openrc
-#@openrc cups-openrc
-php
-php-apache
-php-cgi
-@openrc backuppc-openrc
-
-base-devel

linexa/live-overlay

@@ -1 +0,0 @@
-../common/live-overlay

linexa/profile.conf

@@ -1,25 +0,0 @@
-################ install ################
-
-# default displaymanager: none
-# supported: lightdm, sddm, gdm, lxdm, mdm
-DISPLAYMANAGER="sddm"
-
-# Set to false to disable autologin in the livecd
-# AUTOLOGIN="false"
-
-# start services
-SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connman')
-
-# default group membership
-# ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
-
-################# live-session #################
-
-# default value
-HOST_NANE="linexa"
-
-# default value
-# USER_NAME="artix"
-
-# default value
-# PASSWORD="artix"

lxde/Packages-Live

@@ -2,22 +2,19 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd
 
-@openrc artix-live-openrc
-@runit artix-live-runit
-@s6 artix-live-s6
-
 calamares-branding
 gparted
 
 artix-grub-live
 artix-grub-theme
 
-virtualbox-guest-modules-artix
 virtualbox-guest-utils
-#open-vm-tools
+
 broadcom-wl
 
 intel-ucode
 amd-ucode
 artix-docs
 hexchat
+
+artix-live-@initsys@

lxde/Packages-Root

@@ -1,155 +1,4 @@
-base
+# loads by default common/packages-{base,apps,xorg}
-@openrc elogind-openrc
-@runit elogind-runit
-@s6 elogind-s6
-acpi
-b43-fwcutter
-btrfs-progs
-crda
-dhclient
-diffutils
-dmraid
-dnsmasq
-dosfstools
-e2fsprogs
-ecryptfs-utils
-exfat-utils
-f2fs-tools
-grub
-htop
-inetutils
-iptables
-ipw2100-fw
-ipw2200-fw
-jfsutils
-linux
-linux-headers
-linux-firmware
-logrotate
-lsb-release
-man-db
-man-pages
-memtest86+
-mkinitcpio
-mkinitcpio-openswap
-nano
-vi
-net-tools
-ntfs-3g
-@openrc acpid-openrc
-@openrc cronie-openrc
-@openrc cryptsetup-openrc
-@openrc dhcpcd-openrc
-@openrc haveged-openrc
-@openrc lvm2-openrc
-@openrc mdadm-openrc
-@openrc nfs-utils-openrc
-@openrc rsync-openrc
-@openrc openssh-openrc
-@openrc wpa_supplicant-openrc
-@openrc syslog-ng-openrc
-@runit acpid-runit
-@runit cronie-runit
-@runit cryptsetup-runit
-@runit dhcpcd-runit
-@runit haveged-runit
-@runit lvm2-runit
-@runit mdadm-runit
-@runit nfs-utils-runit
-@runit rsync-runit
-@runit openssh-runit
-@runit wpa_supplicant-runit
-@runit syslog-ng-runit
-@s6 acpid-s6
-@s6 cronie-s6
-@s6 cryptsetup-s6
-@s6 dhcpcd-s6
-@s6 haveged-s6
-@s6 lvm2-s6
-@s6 mdadm-s6
-@s6 nfs-utils-s6
-@s6 rsync-s6
-@s6 openssh-s6
-@s6 wpa_supplicant-s6
-@s6 syslog-ng-s6
-os-prober
-reiserfsprogs
-s-nail
-sudo
-sysfsutils
-texinfo
-usbutils
-which
-efibootmgr
-xfsprogs
-zsh
-
-alsa-firmware
-powertop
-inxi
-modemmanager
-usb_modeswitch
-
-@openrc alsa-utils-openrc
-@openrc avahi-openrc
-@openrc connman-openrc
-@openrc displaymanager-openrc
-@openrc ntp-openrc
-@openrc openrc-settingsd
-@openrc bluez-openrc
-@runit alsa-utils-runit
-@runit avahi-runit
-@runit bluez-runit
-@runit connman-runit
-@runit ntp-runit
-@runit lightdm-runit
-@runit blocaled
-@s6 blocaled
-@s6 alsa-utils-s6
-@s6 avahi-s6
-@s6 bluez-s6
-@s6 connman-s6
-@s6 ntp-s6
-@s6 lightdm-s6
-
-librabbitmq-c
-libmongoc
-
-terminus-font
-ttf-droid
-ttf-roboto
-ttf-roboto-mono
-ttf-inconsolata
-ttf-liberation
-
-xdg-user-dirs
-xdg-utils
-
-xorg-server
-xorg-xinit
-xorg-xhost
-
-xf86-input-vmmouse
-xf86-video-amdgpu
-xf86-video-ati
-xf86-video-dummy
-xf86-video-fbdev
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-video-sisusb
-xf86-video-vesa
-xf86-video-vmware
-xf86-video-voodoo
-# Core ISO packages end here
-
-# Branding
-artix-grub-theme
-artix-dark-theme
-artix-branding-base
-artix-gtk-presets
-artix-qt-presets
-xcursor-premium
 
 # LXDE
 gpicview
@@ -169,16 +18,11 @@ lxterminal
 openbox
 pcmanfm
 
-# Basic usability apps
 connman-gtk
-leafpad
-midori
-atril
 lightdm-gtk-greeter
 light-locker
-mpv
+
-ffmpegthumbnailer
+# GTK
-ffmpegthumbs
+epiphany
-raw-thumbnailer
+leafpad
-qt5-imageformats
+atril
-gvfs-mtp

lxde/profile.conf

@@ -1,25 +1,17 @@
 ################ install ################
 
-# default displaymanager: none
-# supported: lightdm, sddm, gdm, lxdm, mdm
-DISPLAYMANAGER="lightdm"
-
-# Set to false to disable autologin in the livecd
-AUTOLOGIN="true"
-
 # start services
-SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
+# bluetoothd, cupsd, DM are added to the pkglist dynamicly
+# metalog or syslog-ng is added to the pkglist dynamicly
+# connmand or NetworkManager is added to the pkglist dynamicly
+# only added if in array, these pkgs have no list entry
 
-# default group membership
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'syslog-ng' 'connmand' 'lightdm')
-ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
 
 ################# live-session #################
 
-# unset defaults to given value
-# HOST_NAME="artix"
-
-# unset defaults to given value
-# USER_NAME="artix"
-
 # unset defaults to given value
 # PASSWORD="artix"
+
+# Set to false to disable autologin in the live session
+AUTOLOGIN="true"

lxde/root-overlay/etc/lightdm/lightdm.conf

@@ -26,7 +26,7 @@
 #lock-memory=true
 #user-authority-in-system-dir=false
 #guest-account-script=guest-account
-#logind-check-graphical=false
+logind-check-graphical=true
 #log-directory=/var/log/lightdm
 run-directory=/run/lightdm
 #cache-directory=/var/cache/lightdm

lxqt/Packages-Live

@@ -2,22 +2,19 @@ mkinitcpio-nfs-utils
 squashfs-tools
 nbd
 
-@openrc artix-live-openrc
-@runit artix-live-runit
-@s6 artix-live-s6
-
 calamares-branding
 partitionmanager
 
 artix-grub-live
 artix-grub-theme
 
-virtualbox-guest-modules-artix
 virtualbox-guest-utils
-#open-vm-tools
+
 broadcom-wl
 
 intel-ucode
 amd-ucode
 artix-docs
 konversation
+
+artix-live-@initsys@