test-switch to xlibre

branch xlibre
fix lxqt usb automount
2025-06-18 23:45:48 +03:00 · 2025-06-18 23:18:56 +03:00 · 2025-05-09 19:43:26 +03:00 · 2025-04-21 02:09:08 +03:00 · 2025-03-19 11:50:02 +01:00 · 2025-03-19 11:46:49 +01:00
286 changed files with 8673 additions and 4189 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 to_package/
+**/rc.conf
--- a/README.md
+++ b/README.md
@@ -9,6 +9,6 @@ Base only offers a bare minimum system, installable from the CLI. For advanced u

 Minimal profiles (come with a basic DE (LXDE, LXQt, Cinnamon and MATE), slightly preconfigured. The graphics installer of choice is Calamares. For knowledgeable users.

-The community profiles come in two flavours, GTK (with MATE and LXDE), and QT (with Plasma and LXQt). They are fully preconfigured and contain many applications for everyday use. Ideal for average or novice users or people that just want a well-endowed live ISO for setting up an out-of-the-box working OS.
+The community profiles come in two flavours, GTK (with XFCE and MATE), and QT (with Plasma and LXQt). They are fully preconfigured and contain many applications for everyday use. Ideal for average or novice users or people that just want a well-endowed live ISO for setting up an out-of-the-box working OS.

 Common settings among all minimal profiles are stored in ''common''.
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -0,0 +1,11 @@
+2025-03 RELEASE NOTES
+---------------------
+
+The first official release for 2025 comes with kernel 6.13.5 and the latest versions of software at the time of release. As usual, we provide a wide range of installation desktops and init systems, suited to all levels of Linux experience: from base profiles installable from command-line to the fully-equipped community editions which offer a complete desktop setup. All settings have been updated to the newest releases of their respective DEs and applications.
+
+- All software at latest versions, the list is too long to include
+- The uniform dark theme adapted to the most recent Qt6 and Gtk4 quirks
+- The default desktop in community-gtk is now XFCE; the alternative is MATE, replacing LXDE
+- LXQt dropped from community-qt, only Plasma 6 is present
+- The exaile music player in community-gtk has been replaced by pragha
+- Plasma on Wayland may crash on some systems; read https://wiki.artixlinux.org/Main/Troubleshooting#Plasma.2FWayland_immediately_crashes_back_to_SDDM for a couple of workarounds
--- a/63
+++ b/63
@@ -1,5 +1,43 @@
+25-04-21
+DONE Replace firefox with waterfox
+
+25-03-15
+FIXED Plasma login crash with Wayland
+
+24-08-05
+FIXED on root-overlay, needs to go to alpm-hooks - s6 installed won't start lightdm
+FIXED as above - runit lxqt won't start sddm and other services
+FIXED dinit error runnin local.d/pacman-init.start in plasma
+FIXED dinit not running local.d but rc.local
+
+24-07-22
+FIXED dinit starts lightdm/sddm before autologin is implemented
+FIXED lxqt isn't dark
+FIXED cinnamon calamares icon is shit
+
 TO-{DO,FIX} LIST

+24-02-05
+DONE Adjust profiles to new artitx-tools / calamares
+Test /etc/environment vars in lxqt and plasma
+
+22-01-29
+FIXED in 2024 - 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,17 +50,34 @@ 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
-Autologin-session doesn't work
+
+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
-TODO Test firefox before releasing
+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
+DONE Use QTWEBENGINE_CHROMIUM_FLAGS=--blink-settings=darkMode=4,darkModeImagePolicy=1/--blink-settings=darkModeEnabled=true,darkModeInversionAlgorithm=4/--force-dark-mode or whatever works with Qt-5.15
+DONE The window title font in XFCE needs to be adjusted
+DONE The Libreoffice background needs to change from 'Automatic' to '#2a2a2a'
+DONE Fluid is dark in GTK but light in Qt
+community-qt still boots into LXQt
+DONE The SDDM theme could use some darkening
+DONE Perhaps add man-pages to the ISOs
+DONE Fix plasma desktop icons (~/.local/share/.....)
--- a/base/Packages-Root
+++ b/base/Packages-Root
@@ -1,108 +1,8 @@
-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
-inetutils
-iptables
-ipw2100-fw
-ipw2200-fw
-jfsutils
-linux
-linux-headers
-linux-firmware
-logrotate
-lsb-release
-man-db
-man-pages
-memtest86+
-mkinitcpio
-mkinitcpio-openswap
-nano
-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
+# loads by default common/packages-{base,apps}

 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@
--- a/base/profile.conf
+++ b/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 for keyboards and mice
+# 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
-# ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'metalog' 'connmand')

 ################# 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"
--- a/base/root-overlay/etc/default/grub
+++ b/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"
--- a/base/root-overlay/etc/elogind/logind.conf
+++ b/base/root-overlay/etc/elogind/logind.conf
@@ -0,0 +1,45 @@
+#  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. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the logind.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
+#
+# See logind.conf(5) for details.
+
+[Login]
+KillUserProcesses=no
+#KillOnlyUsers=
+#KillExcludeUsers=root
+#InhibitDelayMaxSec=5
+#UserStopDelaySec=10
+#HandlePowerKey=poweroff
+#HandlePowerKeyLongPress=ignore
+#HandleRebootKey=reboot
+#HandleRebootKeyLongPress=poweroff
+#HandleSuspendKey=suspend
+#HandleSuspendKeyLongPress=hibernate
+#HandleHibernateKey=hibernate
+#HandleHibernateKeyLongPress=ignore
+#HandleLidSwitch=suspend
+#HandleLidSwitchExternalPower=suspend
+#HandleLidSwitchDocked=ignore
+#PowerKeyIgnoreInhibited=no
+#SuspendKeyIgnoreInhibited=no
+#HibernateKeyIgnoreInhibited=no
+#LidSwitchIgnoreInhibited=yes
+#RebootKeyIgnoreInhibited=no
+#HoldoffTimeoutSec=30s
+#IdleAction=ignore
+#IdleActionSec=30min
+#RuntimeDirectorySize=10%
+#RuntimeDirectoryInodesMax=
+#RemoveIPC=yes
+#InhibitorsMax=8192
+#SessionsMax=8192
+#StopIdleSessionSec=infinity
--- a/base/root-overlay/etc/hostname
+++ b/base/root-overlay/etc/hostname
@@ -0,0 +1 @@
+artix-live
--- a/base/root-overlay/etc/hosts
+++ b/base/root-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
--- a/base/root-overlay/etc/issue
+++ b/base/root-overlay/etc/issue
@@ -18,3 +18,4 @@
  'ooooi:'`                `'';ioxxo'
 'i:'`                          '':io'
 '`                                   `'[0m
+[?25h[?7h
--- a/base/root-overlay/etc/issue.live
+++ b/base/root-overlay/etc/issue.live
@@ -4,6 +4,6 @@
         # Welcome to Artix #

 login for the live environment:
-    user     'artix'
+    user     'artix' or 'root'
    password 'artix'

--- a/buildISOs-weekly-cron.sh
+++ b/buildISOs-weekly-cron.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Automated ISO build script
+# Builds all profiles, all inits and rsyncs to ISO download server
+# 2019-2024, nous
+
+export TERM=xterm-256color
+source /usr/share/makepkg/util/message.sh
+colorize
+
+WORKSPACE=/home/$USER/artools-workspace
+PROFILES=${WORKSPACE}/iso-profiles
+REPO=/srv/iso/weekly-iso
+#RSYNCARGS="-au --delete-after --bwlimit=5M"
+RSYNCARGS="-au --delete-before"
+CWD=$PROFILES
+BRANCH=wip
+DATE=$(date +"%Y%m%d")
+
+mkdir -p ${PROFILES}/logs
+
+cd $WORKSPACE
+if [[ -d $PROFILES ]]; then
+    cd $PROFILES
+#    git checkout wip
+    git pull
+else
+    git clone https://gitea.artixlinux.org/artix/iso-profiles.git
+#    git checkout wip
+fi
+
+cd $PROFILES && git checkout $BRANCH
+all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|logs|lowmem|anon|gnome|plasma5|i3|community$" | sort))
+all_inits=('openrc' 'runit' 's6' 'dinit')
+
+usage() {
+    echo
+    echo -n "${BOLD}Usage:  "
+    echo "$0 [-b stable|gremlins] -p <profile>[,profile,...]|[all] -i <init>[,init,...]|[all]${ALL_OFF}"
+    echo
+    echo -n "All profiles, all inits:  "
+    echo "$0 -p all -i all"
+    echo
+    echo "Available branches: ${BOLD}stable (default, if omitted), gremlins${ALL_OFF}"
+    echo "Available profiles: ${GREEN}${all_profiles[@]}${ALL_OFF}"
+    echo "Available inits:    ${CYAN}${all_inits[@]} ${ALL_OFF}"
+    echo
+    echo "Example: $0 -p base,lxqt,lxde -i openrc,runit"
+    echo "         $0 -b gremlins -p base -i s6"
+    echo
+    exit 1
+}
+
+timestamp() { date +"%Y/%m/%d-%H:%M:%S"; }
+
+profiles=(${all_profiles[@]})
+inits=(${all_inits[@]})
+branch=''
+
+echo "Building ISO(s):"
+echo "		branch		${BOLD}${_branch}${ALL_OFF}"
+echo "		profiles 	${GREEN}${profiles[@]}${ALL_OFF}"
+echo "		inits		${CYAN}${inits[@]}${ALL_OFF}"
+
+echo -n "REMOVING EXISTING ISOs IN 10 SECONDS!   "; i=9; while [ $i -ne 0 ]; do echo -n "$i "; let i--; sleep 1; done
+echo
+rm -fr $REPO/* &
+
+cd $PROFILES
+for profile in ${profiles[@]}; do
+    unset COPY_PACMAN_CONF
+    [[ $profile =~ 'community' ]] && COPY_PACMAN_CONF='-w'
+    for init in ${inits[@]}; do
+        logfile=$PROFILES/logs/buildiso-$DATE
+        logfile_debug=$logfile-$profile-$init
+        echo "#################################" >> $logfile.log
+        stamp=$(timestamp)
+        [[ $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 ${WORKSPACE}/tweaks/rc.conf ${PROFILES}/$profile/root-overlay/etc/
+        echo "VERSION_ID=$DATE" >| ${PROFILES}/$profile/root-overlay/etc/buildinfo
+        echo "VARIANT=${profile}-${init}" >> ${PROFILES}/$profile/root-overlay/etc/buildinfo
+        nice -n 20 buildiso${branch} -p $profile -i $init $COPY_PACMAN_CONF 2>&1 >> ${logfile_debug}.log
+        res=$?
+        stamp=$(timestamp)
+        if [ $res == 0 ]; then
+            echo "$stamp == ${GREEN}Finished building ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
+        else
+            echo "$stamp == ${RED}Failed building   ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
+            echo "$stamp == ${RED}Retrying once     ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
+            echo "$stamp == Re-building       ${_branch} ${profile}-${init}" >> $logfile.log
+            nice -n 20 buildiso${branch} -p $profile -i $init $COPY_PACMAN_CONF 2>&1 >> ${logfile_debug}.log
+            res=$?
+            stamp=$(timestamp)
+            if [ $res == 0 ]; then
+                { echo "$stamp == ${GREEN}Finished building ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log; } \
+            else
+                { echo "$stamp == ${RED}Failed building   ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log; continue; }
+            fi
+        fi
+        rm -f ${PROFILES}/$profile/root-overlay/etc/{rc.conf,buildinfo}
+        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}/
+        cd $REPO && { sha256sum artix-*.iso > ${REPO}/sha256sums & }
+    done
+done
+# Redundancy tasks
+rm -f ${PROFILES}/*/root-overlay/etc/{rc.conf,buildinfo}
+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"
--- a/buildISOs-weekly.sh
+++ b/buildISOs-weekly.sh
@@ -0,0 +1,132 @@
+#!/bin/bash
+
+# Automated ISO build script
+# Builds all profiles, all inits and rsyncs to ISO download server
+# 2019-2024, nous
+
+export TERM=xterm-256color
+source /usr/share/makepkg/util/message.sh
+colorize
+
+WORKSPACE=/home/$USER/artools-workspace
+PROFILES=${WORKSPACE}/iso-profiles
+REPO=/srv/iso/weekly-iso
+CWD=$PROFILES
+BRANCH=wip
+DATE=$(date +"%Y%m%d")
+
+mkdir -p ${PROFILES}/logs
+
+cd $WORKSPACE
+if [[ -d $PROFILES ]]; then
+    cd $PROFILES
+#    git checkout wip
+    git pull
+else
+    git clone https://gitea.artixlinux.org/artix/iso-profiles.git
+#    git checkout wip
+fi
+
+cd $PROFILES && git checkout $BRANCH
+all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|logs|lowmem|anon|gnome|plasma5|i3|community$" | sort))
+all_inits=('openrc' 'runit' 's6' 'dinit')
+
+usage() {
+    echo
+    echo -n "${BOLD}Usage:  "
+    echo "$0 [-b stable|gremlins] -p <profile>[,profile,...]|[all] -i <init>[,init,...]|[all]${ALL_OFF}"
+    echo
+    echo -n "All profiles, all inits:  "
+    echo "$0 -p all -i all"
+    echo
+    echo "Available branches: ${BOLD}stable (default, if omitted), gremlins${ALL_OFF}"
+    echo "Available profiles: ${GREEN}${all_profiles[@]}${ALL_OFF}"
+    echo "Available inits:    ${CYAN}${all_inits[@]} ${ALL_OFF}"
+    echo
+    echo "Example: $0 -p base,lxqt,lxde -i openrc,runit"
+    echo "         $0 -b gremlins -p base -i s6"
+    echo
+    exit 1
+}
+
+timestamp() { date +"%Y/%m/%d-%H:%M:%S"; }
+
+[[ $# -eq 0 ]] && usage
+
+while getopts "b:p:i:" option; do
+    case $option in
+        b)
+            _branch=$OPTARG
+            [[ ${_branch} =~ (^$|stable|gremlins) ]] || { echo; echo "${RED}No valid branch selected!${ALL_OFF}"; echo; usage; }
+            [[ ${_branch} == 'stable' || ${_branch} == '' ]] && { _branch='stable'; branch=''; }
+            [[ ${_branch} == 'gremlins' ]] && branch='-gremlins'
+            ;;
+        p)
+            _profile=$OPTARG
+            for p in ${all_profiles[@]}; do
+                [[ ${_profile} =~ $p ]] && profiles+=($p)
+            done
+            [[ ${_profile} == all ]]    && profiles=(${all_profiles[@]})
+            ;;
+        i)
+            _init=$OPTARG
+            for i in ${all_inits[@]}; do
+                [[ ${_init} =~ $i ]] && inits+=($i)
+            done
+            [[ ${_init} == all ]]    && inits=(${all_inits[@]})
+            ;;
+    esac
+done
+
+[[ $branch ]] || { _branch='stable'; branch=''; }
+[[ ${#profiles[@]} -eq 0 ]] && { echo; echo "${RED}No valid profiles selected!${ALL_OFF}"; echo; usage; }
+[[ ${#inits[@]} -eq 0 ]]	&& { echo; echo "${RED}No valid inits selected!"${ALL_OFF}; echo; usage; }
+
+echo "Building ISO(s):"
+echo "		branch		${BOLD}${_branch}${ALL_OFF}"
+echo "		profiles 	${GREEN}${profiles[@]}${ALL_OFF}"
+echo "		inits		${CYAN}${inits[@]}${ALL_OFF}"
+
+
+cd $PROFILES
+for profile in ${profiles[@]}; do
+    unset COPY_PACMAN_CONF
+    [[ $profile =~ 'community' ]] && COPY_PACMAN_CONF='-w'
+    for init in ${inits[@]}; do
+        logfile=$PROFILES/logs/buildiso-$DATE
+        logfile_debug=$logfile-$profile-$init
+        echo "#################################" >> $logfile.log
+        stamp=$(timestamp)
+        [[ $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 ${WORKSPACE}/tweaks/rc.conf ${PROFILES}/$profile/root-overlay/etc/
+        echo "VERSION_ID=$DATE" >| ${PROFILES}/$profile/root-overlay/etc/buildinfo
+        echo "VARIANT=${profile}-${init}" >> ${PROFILES}/$profile/root-overlay/etc/buildinfo
+        nice -n 20 buildiso${branch} -p $profile -i $init $COPY_PACMAN_CONF 2>&1 >> ${logfile_debug}.log
+        res=$?
+        stamp=$(timestamp)
+        if [ $res == 0 ]; then
+            echo "$stamp == ${GREEN}Finished building ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
+        else
+            echo "$stamp == ${RED}Failed building   ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
+            echo "$stamp == ${RED}Retrying once     ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
+            echo "$stamp == Re-building       ${_branch} ${profile}-${init}" >> $logfile.log
+            nice -n 20 buildiso${branch} -p $profile -i $init $COPY_PACMAN_CONF 2>&1 >> ${logfile_debug}.log
+            res=$?
+            stamp=$(timestamp)
+            if [ $res == 0 ]; then
+                { echo "$stamp == ${GREEN}Finished building ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log; } \
+            else
+                { echo "$stamp == ${RED}Failed building   ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log; continue; }
+            fi
+        fi
+        rm -f ${PROFILES}/$profile/root-overlay/etc/{rc.conf,buildinfo}
+        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}/ 2>/dev/null
+        cd $REPO && { sha256sum artix-*.iso > ${REPO}/sha256sums & }
+    done
+done
+rm -f ${PROFILES}/*/root-overlay/etc/{rc.conf,buildinfo}
--- a/buildISOs.sh
+++ b/buildISOs.sh
@@ -8,12 +8,12 @@ colorize

 WORKSPACE=/home/$USER/artools-workspace
 PROFILES=${WORKSPACE}/iso-profiles
-REPO=/srv/iso/testing-iso
+REPO=/srv/iso/weekly-iso
 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' 'dinit')

 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[@]})
            ;;
--- a/cinnamon/Packages-Live
+++ b/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
+calamares-extensions
 gparted

 artix-grub-live
-artix-grub-theme
+#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@
--- a/cinnamon/Packages-Root
+++ b/cinnamon/Packages-Root
@@ -1,153 +1,4 @@
-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
-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
-
-@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
-artix-sddm-theme
+# loads by default common/packages-{base,apps,xorg}

 # Cinnamon
 cinnamon
@@ -160,7 +11,7 @@ gnome-disk-utility
 gnome-keyring
 gnome-online-accounts
 gnome-screenshot
-gnome-system-log
+#gnome-system-log
 gnome-system-monitor
 gnome-terminal
 nemo-fileroller
@@ -169,15 +20,11 @@ nemo-seahorse
 nemo-share
 xcursor-vanilla-dmz

-# Basic usability apps
-leafpad
-midori
-atril
 lightdm-gtk-greeter
-light-locker
-mpv
-ffmpegthumbnailer
-ffmpegthumbs
-raw-thumbnailer
-qt5-imageformats
-gvfs-mtp
+#light-locker
+
+# GTK apps
+epiphany
+leafpad
+atril
+pavucontrol
--- a/cinnamon/profile.conf
+++ b/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
-ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'NetworkManager' 'lightdm')

 ################# 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"
--- a/cinnamon/root-overlay/etc/issue
+++ b/cinnamon/root-overlay/etc/issue
@@ -0,0 +1 @@
+../../../common/root-overlay/etc/issue
--- a/cinnamon/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/cinnamon/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
@@ -1 +1 @@
-../../../../common/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
+../../../../community/live-overlay/etc/lightdm/lightdm-gtk-greeter.conf
--- a/cinnamon/root-overlay/etc/lightdm/lightdm.conf
+++ b/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
--- a/cinnamon/root-overlay/etc/local.d
+++ b/cinnamon/root-overlay/etc/local.d
@@ -0,0 +1 @@
+../../../common/root-overlay/etc/local.d
--- a/cinnamon/root-overlay/etc/pacman.conf
+++ b/cinnamon/root-overlay/etc/pacman.conf
@@ -0,0 +1 @@
+../../../common/root-overlay/etc/pacman.conf
--- a/common/Packages-apps
+++ b/common/Packages-apps
@@ -0,0 +1,3 @@
+powertop
+inxi
+fastfetch
--- a/common/Packages-base
+++ b/common/Packages-base
@@ -0,0 +1,70 @@
+# 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
+exfatprogs
+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
+openntpd-@initsys@
+openssh-@initsys@
+os-prober
+pulseaudio-alsa
+pulseaudio-bluetooth
+pulseaudio-zeroconf
+rsync-@initsys@
+s-nail
+sudo
+sysfsutils
+texinfo
+usbutils
+vi
+which
+wpa_supplicant-@initsys@
+xfsprogs
+zsh
--- a/common/Packages-boot
+++ b/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
--- a/common/Packages-dinit
+++ b/common/Packages-dinit
@@ -0,0 +1 @@
+blocaled
--- a/common/Packages-openrc
+++ b/common/Packages-openrc
@@ -0,0 +1 @@
+openrc-settingsd
--- a/common/Packages-runit
+++ b/common/Packages-runit
@@ -0,0 +1,2 @@
+blocaled
+rsm
--- a/common/Packages-s6
+++ b/common/Packages-s6
@@ -0,0 +1 @@
+blocaled
--- a/common/Packages-xlibre
+++ b/common/Packages-xlibre
@@ -0,0 +1,58 @@
+# Xorg
+xlibre-server
+xorg-xhost
+xorg-xinit
+xdg-user-dirs
+xdg-utils
+
+# Drivers, libraries and configs
+#nvidia-utils
+#nvidia
+xlibre-xf86-input-vmmouse
+xlibre-xf86-video-amdgpu
+xlibre-xf86-video-ati
+xlibre-xf86-video-dummy
+xlibre-xf86-video-fbdev
+xlibre-xf86-video-intel
+xlibre-xf86-video-nouveau
+xlibre-xf86-video-sisusb
+xlibre-xf86-video-vesa
+xlibre-xf86-video-vmware
+xlibre-xf86-video-voodoo
+
+# Layers
+vkd3d
+vulkan-intel
+vulkan-radeon
+vulkan-swrast
+
+mesa-vdpau
+libva-mesa-driver
+libva-intel-driver
+gst-plugins-good
+gst-plugins-bad
+gst-plugins-ugly
+gst-libav
+
+# Fonts
+terminus-font
+ttf-droid
+ttf-inconsolata
+ttf-liberation
+ttf-roboto
+ttf-roboto-mono
+
+# Common DE packages
+artix-gtk-presets
+artix-qt-presets
+xcursor-premium
+qt6gtk2
+mpv
+tumbler
+ffmpegthumbnailer
+ffmpegthumbs
+raw-thumbnailer
+webp-pixbuf-loader
+qt5-imageformats
+gvfs-mtp
+scrot
--- a/common/Packages-xorg
+++ b/common/Packages-xorg
@@ -0,0 +1 @@
+Packages-xlibre
--- a/common/Packages-xorg.orig
+++ b/common/Packages-xorg.orig
@@ -0,0 +1,59 @@
+# Xorg
+xorg-server
+xorg-xhost
+xorg-xinit
+xdg-user-dirs
+xdg-utils
+
+# Drivers, libraries and configs
+#nvidia-utils
+#nvidia
+xf86-input-vmmouse
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-intel
+xf86-video-nouveau
+xf86-video-sisusb
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo
+
+# Layers
+vkd3d
+vulkan-intel
+vulkan-radeon
+vulkan-swrast
+
+mesa-vdpau
+libva-mesa-driver
+libva-vdpau-driver
+libva-intel-driver
+gst-plugins-good
+gst-plugins-bad
+gst-plugins-ugly
+gst-libav
+
+# Fonts
+terminus-font
+ttf-droid
+ttf-inconsolata
+ttf-liberation
+ttf-roboto
+ttf-roboto-mono
+
+# Common DE packages
+artix-gtk-presets
+artix-qt-presets
+xcursor-premium
+qt6gtk2
+mpv
+tumbler
+ffmpegthumbnailer
+ffmpegthumbs
+raw-thumbnailer
+webp-pixbuf-loader
+qt5-imageformats
+gvfs-mtp
+scrot
--- a/common/live-overlay/etc/calamares/modules/bootloader.conf
+++ b/common/live-overlay/etc/calamares/modules/bootloader.conf
@@ -1,12 +1,15 @@
 ---
 efiBootLoader: "grub"
+
 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)"
+
 grubInstall: "grub-install"
 grubMkconfig: "grub-mkconfig"
 grubCfg: "/boot/grub/grub.cfg"
-#efiBootloaderId: "dirname"
+grubProbe: "grub-probe"
+efiBootMgr: "efibootmgr"
+
+installEFIFallback: true
--- a/common/live-overlay/etc/calamares/modules/displaymanager.conf
+++ b/common/live-overlay/etc/calamares/modules/displaymanager.conf
--- a/common/conf/calamares-offline/modules/finished.conf
+++ b/common/conf/calamares-offline/modules/finished.conf
@@ -0,0 +1,6 @@
+---
+restartNowMode: user-unchecked
+
+restartNowCommand: "loginctl reboot"
+
+notifyOnFinished: false
--- a/common/conf/calamares-offline/modules/initcpio.conf
+++ b/common/conf/calamares-offline/modules/initcpio.conf
@@ -0,0 +1,4 @@
+---
+kernel: all
+
+be_unsafe: false
--- a/common/live-overlay/etc/calamares/modules/locale.conf
+++ b/common/live-overlay/etc/calamares/modules/locale.conf
@@ -1,7 +1,4 @@
 ---
-# region:                     "America"
-# zone:                       "New_York"
-
 localeGenPath: /etc/locale.gen

 geoip:
--- a/common/conf/calamares-offline/modules/machineid.conf
+++ b/common/conf/calamares-offline/modules/machineid.conf
@@ -0,0 +1,5 @@
+---
+systemd: false
+dbus: true
+dbus-symlink: true
+entropy-copy: false
--- a/common/conf/calamares-offline/modules/partition.conf
+++ b/common/conf/calamares-offline/modules/partition.conf
@@ -0,0 +1,32 @@
+efi:
+    mountPoint:         "/boot/efi"
+    recommendedSize:    300MiB
+    minimumSize:        32MiB
+    label:              "EFI"
+
+userSwapChoices:
+    - none      # Create no swap, use no swap
+    - small     # Up to 4GB
+    - suspend   # At least main memory size
+    - file      # To swap file instead of partition
+
+swapPartitionName:      swap
+
+luksGeneration: luks1
+
+drawNestedPartitions:   true
+
+alwaysShowPartitionLabels: true
+
+initialPartitioningChoice: none
+
+initialSwapChoice: suspend
+
+defaultPartitionTableType: msdos
+
+requiredPartitionTableType:
+    - msdos
+    - gpt
+
+defaultFileSystemType:  "ext4"
+availableFileSystemTypes:  ["ext4","btrfs","f2fs","xfs"]
--- a/common/conf/calamares-offline/modules/postcfg.conf
+++ b/common/conf/calamares-offline/modules/postcfg.conf
@@ -0,0 +1,3 @@
+---
+keyrings:
+  - artix
--- a/common/conf/calamares-offline/modules/services-artix.conf
+++ b/common/conf/calamares-offline/modules/services-artix.conf
@@ -0,0 +1,4 @@
+---
+command: artix-service
+
+services: []
--- a/common/conf/calamares-offline/modules/umount.conf
+++ b/common/conf/calamares-offline/modules/umount.conf
@@ -0,0 +1,2 @@
+---
+emergency: false
--- a/common/conf/calamares-offline/modules/unpackfs.conf
+++ b/common/conf/calamares-offline/modules/unpackfs.conf
@@ -0,0 +1,6 @@
+---
+unpack: 
+  - source: "/run/artix/bootmnt/LiveOS/rootfs.img"
+    sourcefs: 'squashfs'
+    destination: ""
+ 
--- a/common/conf/calamares-offline/modules/users.conf
+++ b/common/conf/calamares-offline/modules/users.conf
@@ -0,0 +1,49 @@
+---
+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: 4  # Password at least this many characters
+    maxLength: -1  # Password at most this many characters
+    libpwquality:
+        - minlen=4
+        - minclass=0
+
+allowWeakPasswords: true
+allowWeakPasswordsDefault: true
+
+userShell: /bin/bash
+
+setHostname: EtcFile
+
+writeHostsFile: true
+
+user:
+  shell: /bin/bash
+  forbidden_names: [ root ]
--- a/common/conf/calamares-offline/modules/welcome.conf
+++ b/common/conf/calamares-offline/modules/welcome.conf
@@ -0,0 +1,19 @@
+---
+showSupportUrl:         true
+showKnownIssuesUrl:     true
+showReleaseNotesUrl:    true
+
+requirements:
+    requiredStorage:    5.5
+    requiredRam:        1.0
+    internetCheckUrl:   https://artixlinux.org
+    check:
+      - storage
+      - ram
+      - power
+#      - internet
+      - root
+    required:
+      - storage
+      - ram
+      - root
--- a/common/conf/calamares-offline/network-offline.svg
+++ b/common/conf/calamares-offline/network-offline.svg
--- a/common/live-overlay/etc/calamares/settings.conf
+++ b/common/live-overlay/etc/calamares/settings.conf
@@ -26,7 +26,7 @@ sequence:
        - displaymanager
        - networkcfg
        - hwclock
-        - services-openrc
+        - services-artix
        - grubcfg
        - bootloader
        - postcfg
@@ -40,6 +40,12 @@ prompt-install: false

 dont-chroot: false

+oem-setup: false
+
 disable-cancel: false

 disable-cancel-during-exec: false
+
+hide-back-and-next-during-exec: false
+
+quit-at-end: false
--- a/common/conf/calamares-online/modules/basestrap.conf
+++ b/common/conf/calamares-online/modules/basestrap.conf
@@ -0,0 +1,32 @@
+---
+backend: pacman
+
+pacman:
+    num_retries: 0
+    disable_download_timeout: false
+    needed_only: false
+    handle_keyrings: true
+    copy_pacconf: true
+    requirements:
+      - dest: /etc
+        mode: "0o755"
+      - dest: /var
+        mode: "0o755"
+      - dest: /var/cache
+        mode: "0o755"
+      - dest: /var/cache/pacman
+        mode: "0o755"
+      - dest: /var/cache/pacman/pkg
+        mode: "0o755"
+      - dest: /var/lib
+        mode: "0o755"
+      - dest: /var/lib/pacman
+        mode: "0o755"
+    keyrings:
+      - artix
+
+base_init: elogind
+
+operations:
+  - install:
+    - base
--- a/common/conf/calamares-online/modules/bootloader.conf
+++ b/common/conf/calamares-online/modules/bootloader.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/bootloader.conf
--- a/common/conf/calamares-online/modules/displaymanager.conf
+++ b/common/conf/calamares-online/modules/displaymanager.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/displaymanager.conf
--- a/common/conf/calamares-online/modules/finished.conf
+++ b/common/conf/calamares-online/modules/finished.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/finished.conf
--- a/common/conf/calamares-online/modules/initcpio.conf
+++ b/common/conf/calamares-online/modules/initcpio.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/initcpio.conf
--- a/common/conf/calamares-online/modules/locale.conf
+++ b/common/conf/calamares-online/modules/locale.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/locale.conf
--- a/common/conf/calamares-online/modules/machineid.conf
+++ b/common/conf/calamares-online/modules/machineid.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/machineid.conf
--- a/common/conf/calamares-online/modules/netinstall.conf
+++ b/common/conf/calamares-online/modules/netinstall.conf
@@ -0,0 +1,55 @@
+---
+groupsUrl:
+    - https://gitea.artixlinux.org/artix/netinstall-data/raw/branch/master/netinstall.yaml
+    - file:///etc/calamares/modules/netinstall.yaml
+
+required: false
+
+# To support multiple instances of this module,
+# some strings are configurable and translatable here.
+# Sub-keys under *label* are used for the user interface.
+#  - *sidebar* This is the name of the module in the progress-tree / sidebar
+#   in Calamares.
+#  - *title* This is displayed above the list of packages.
+# If no *sidebar* values are provided, defaults to "Package selection"
+# and existing translations. If no *title* values are provided, no string
+# is displayed.
+#
+# Translations are handled through `[ll]` notation, much like in
+# `.desktop` files. The string associated with `key[ll]` is used for
+# *key* when when the language *ll* (language-code, like *nl* or *en_GB*
+# or *ja*) is used.
+#
+# The following strings are **already** known to Calamares and can be
+# listed here in *untranslated* form (e.g. as value of *sidebar*)
+# without bothering with the translations: they are picked up from
+# the regular translation framework:
+#  - "Package selection"
+#  - "Office software"
+#  - "Office package"
+#  - "Browser software"
+#  - "Browser package"
+#  - "Web browser"
+#  - "Kernel"
+#  - "Services"
+#  - "Login"
+#  - "Desktop"
+#  - "Applications"
+#  - "Communication"
+#  - "Development"
+#  - "Office"
+#  - "Multimedia"
+#  - "Internet"
+#  - "Theming"
+#  - "Gaming"
+#  - "Utilities"
+# Other strings should follow the translations format.
+label:
+    sidebar: "Package selection"
+    # sidebar[nl]: "Pakketkeuze"
+    # sidebar[en_GB]: "Package choice"
+    # sidebar[ja]: "知りません"  # "I don't know"
+    # title: "Office Package"
+    # title[nl]: "Kantoorsoftware"
+
+
--- a/common/conf/calamares-online/modules/netinstall.yaml
+++ b/common/conf/calamares-online/modules/netinstall.yaml
@@ -0,0 +1,277 @@
+- name: "Default"
+  description: "Default packages"
+  hidden: false
+  selected: true
+  critical: true
+  immutable: true
+  packages:
+    - linux
+    - linux-headers
+    - grub
+    - sudo
+
+- name: "Kernel"
+  description: "Kernel and modules"
+  selected: false
+  packages:
+    - acpi_call
+    - bbswitch
+    - broadcom-wl
+    - r8168
+    - tp_smapi
+    - linux-lts
+    - linux-lts-headers
+
+- name: "Firmware"
+  description: "Firmware"
+  selected: false
+  packages:
+    - b43-fwcutter
+    - linux-firmware
+    - linux-firmware-bnx2x
+    - linux-firmware-liquidio
+    - linux-firmware-marvell
+    - linux-firmware-mellanox
+    - linux-firmware-nfp
+    - linux-firmware-qcom
+    - linux-firmware-qlogic
+    - linux-firmware-whence
+    - sof-firmware
+    - alsa-firmware
+
+- name: "Utilities"
+  description: "System Utilities"
+  selected: true
+  packages:
+    - lsb-release
+    - nano
+    - vi
+
+- name: "Style"
+  description: "Artix themes, icons, branding"
+  selected: false
+  packages:
+    - artix-icons
+    - artix-wallpapers
+    - artix-breeze-sddm
+    - artix-plasma-splash
+    - artix-netinstall-presets
+
+- name: "Desktop"
+  description: "Desktop"
+  selected: false
+  subgroups:
+    - name: "Input"
+      description: "Input drivers"
+      packages:
+        - xf86-input-evdev
+        - xf86-input-libinput
+        - xf86-input-synaptics
+        - xf86-input-vmmouse
+    - name: "Video"
+      description: "Video drivers"
+      packages:
+        - xf86-video-amdgpu
+        - xf86-video-ati
+        - xf86-video-dummy
+        - xf86-video-fbdev
+        - xf86-video-intel
+        - xf86-video-nouveau
+        - xf86-video-openchrome
+        - xf86-video-vesa
+        - xf86-video-vmware
+        - xf86-video-voodoo
+    - name: "Fonts"
+      description: "Xorg fonts"
+      packages:
+        - xorg-font-util
+        - xorg-fonts-encodings
+    - name: "Lxqt"
+      description: "Lxqt desktop"
+      selected: false
+      packages:
+        - lximage-qt
+        - lxqt-about
+        - lxqt-admin
+        - lxqt-archiver
+        - lxqt-config
+        - lxqt-globalkeys
+        - lxqt-notificationd
+        - lxqt-openssh-askpass
+        - lxqt-panel
+        - lxqt-policykit
+        - lxqt-powermanagement
+        - lxqt-qtplugin
+        - lxqt-runner
+        - lxqt-session
+        - lxqt-sudo
+        - lxqt-themes
+        - obconf-qt
+        - openbox
+        - pavucontrol-qt
+        - pcmanfm-qt
+        - qterminal
+        - screengrab
+        - xdg-desktop-portal-lxqt
+    - name: "Plasma"
+      description: "Plasma desktop"
+      selected: false
+      packages:
+        - bluedevil
+        - breeze
+        - breeze-gtk
+        - breeze-plymouth
+        - discover
+        - drkonqi
+        - flatpak-kcm
+        - kactivitymanagerd
+        - kde-cli-tools
+        - kde-gtk-config
+        - kdecoration
+        - kdeplasma-addons
+        - kgamma
+        - khotkeys
+        - kinfocenter
+        - kmenuedit
+        - kpipewire
+        - kscreen
+        - kscreenlocker
+        - ksshaskpass
+        - ksystemstats
+        - kwallet-pam
+        - kwayland-integration
+        - kwin
+        - kwrited
+        - layer-shell-qt
+        - libkscreen
+        - libksysguard
+        - milou
+        - oxygen
+        - oxygen-sounds
+        - plasma-browser-integration
+        - plasma-desktop
+        - plasma-disks
+        - plasma-firewall
+        - plasma-integration
+        - plasma-nm
+        - plasma-pa
+        - plasma-sdk
+        - plasma-systemmonitor
+        - plasma-thunderbolt
+        - plasma-vault
+        - plasma-welcome
+        - plasma-workspace
+        - plasma-workspace-wallpapers
+        - plymouth-kcm
+        - polkit-kde-agent
+        - powerdevil
+        - sddm-kcm
+        - systemsettings
+        - xdg-desktop-portal-kde
+
+    - name: "kde-applications"
+      description: "KDE applications"
+      selected: false
+      subgroups:
+    #     - name: "kde-accessibility"
+    #       description: "KDE accessibility"
+    #       packages:
+    #         - kmag
+    #         - kmousetool
+    #         - kmouth
+    #         - kontrast
+        - name: "kde-graphics"
+          description: "KDE graphics"
+          packages:
+            # - arianna
+            # - colord-kde
+            - gwenview
+            # - kamera
+            # - kcolorchooser
+            # - kdegraphics-thumbnailers
+            # - kimagemapeditor
+            # - koko
+            # - kolourpaint
+            # - kruler
+            - okular
+            # - skanlite
+            - spectacle
+            # - svgpart
+    #     - name: "kde-multimedia"
+    #       description: "KDE multimedia"
+    #       packages:
+    #         - audiocd-kio
+    #         - audiotube
+    #         - dragon
+    #         - elisa
+    #         - ffmpegthumbs
+    #         - juk
+    #         - k3b
+    #         - kamoso
+    #         - kasts
+    #         - kdenlive
+    #         - kmix
+    #         - kwave
+    #         - plasmatube
+        - name: "kde-network"
+          description: "KDE network"
+          packages:
+            # - alligator
+            # - angelfish
+            - falkon
+            - kdeconnect
+            - kdenetwork-filesharing
+            - kget
+            # - kio-extras
+            # - kio-gdrive
+            # - kio-zeroconf
+            # - konqueror
+            - konversation
+            # - kopete
+            - krdc
+            - krfb
+            # - ktorrent
+            # - neochat
+            # - signon-kwallet-extension
+            # - tokodon
+        - name: "kde-system"
+          description: "KDE system"
+          packages:
+            - dolphin
+            - kcron
+            # - kde-inotify-survey
+            - khelpcenter
+            - kio-admin
+            - ksystemlog
+            - partitionmanager
+        - name: "kde-utilities"
+          description: "KDE utilities"
+          packages:
+            - ark
+            # - filelight
+            # - kalk
+            - kate
+            # - kbackup
+            # - kcalc
+            - kcharselect
+            - kdebugsettings
+            # - kdf
+            - kdialog
+            - keditbookmarks
+            # - keysmith
+            - kfind
+            - kgpg
+            # - kongress
+            - konsole
+            # - krecorder
+            # - kteatime
+            # - ktimer
+            # - ktrip
+            - kwalletmanager
+            # - kweather
+            # - markdownpart
+            - print-manager
+            # - skanpage
+            # - sweeper
+            # - telly-skout
+            # - yakuake
--- a/common/conf/calamares-online/modules/packagechooser.conf
+++ b/common/conf/calamares-online/modules/packagechooser.conf
@@ -0,0 +1,310 @@
+---
+mode: required
+
+method: netinstall-add
+
+labels:
+    step: "Init selection"
+    step[de]: "Initauswahl"
+
+default: OpenRC
+
+items:
+    - id: OpenRC
+      name: openrc
+      description: "OpenRC init system"
+      screenshot: ":/images/if.png"
+      netinstall:
+        name: "openrc"
+        description: "OpenRC init system"
+        selected: false
+        critical: true
+        immutable: false
+        expanded: true
+        hidden: false
+        subgroups:
+            - name: "Default"
+              description: "Default services"
+              selected: true
+              hidden: true
+              packages:
+                - audit-openrc
+                - cryptsetup-openrc
+                - dbus-openrc
+                - dhcpcd-openrc
+                - lvm2-openrc
+                - mdadm-openrc
+            - name: "Login"
+              description: "Displaymanagers"
+              packages:
+                - sddm-openrc
+            - name: "Cron"
+              description: "Cron init"
+              selected: true
+              packages:
+                - cronie-openrc
+            - name: "Syslog"
+              description: "Syslog init"
+              packages:
+                - syslog-ng-openrc
+                - metalog-openrc
+            - name: "Internet"
+              description: "Network init"
+              packages:
+                - avahi-openrc
+                - bluez-openrc
+                - iptables-openrc
+                - krb5-openrc
+                - networkmanager-openrc
+                - nfs-utils-openrc
+                - ntp-openrc
+                - openldap-openrc
+                - openssh-openrc
+                - rpcbind-openrc
+                - xinetd-openrc
+                - wpa_supplicant-openrc
+            - name: "Office"
+              description: "Office init"
+              packages:
+                - cups-openrc
+                - sane-openrc
+            - name: "Services"
+              description: "Services init"
+              packages:
+                - acpid-openrc
+                - alsa-utils-openrc
+                - apparmor-openrc
+                - brltty-openrc
+                - fuse-openrc
+                - gpm-openrc
+                - hdparm-openrc
+                - haveged-openrc
+                - lm_sensors-openrc
+                - openrc-settingsd
+                - openvpn-openrc
+                - power-profiles-daemon-openrc
+                - rsync-openrc
+
+    - id: Dinit
+      name: dinit
+      description: "Dinit init system"
+      screenshot: ":/images/if.png"
+      netinstall:
+        name: "dinit"
+        description: "Dinit init system"
+        selected: false
+        critical: true
+        immutable: false
+        expanded: true
+        hidden: false
+        subgroups:
+            - name: "Default"
+              description: "Default services"
+              selected: true
+              hidden: true
+              packages:
+                - audit-dinit
+                - cryptsetup-dinit
+                - dbus-dinit
+                - dhcpcd-dinit
+                - lvm2-dinit
+                - mdadm-dinit
+            - name: "Login"
+              description: "Displaymanagers"
+              packages:
+                - sddm-dinit
+            - name: "Cron"
+              description: "Cron init"
+              selected: true
+              packages:
+                - cronie-dinit
+            - name: "Syslog"
+              description: "Syslog init"
+              packages:
+                - syslog-ng-dinit
+                - metalog-dinit
+            - name: "Internet"
+              description: "Network init"
+              packages:
+                - avahi-dinit
+                - bluez-dinit
+                - iptables-dinit
+                - krb5-dinit
+                - networkmanager-dinit
+                - nfs-utils-dinit
+                - ntp-dinit
+                - openldap-dinit
+                - openssh-dinit
+                - rpcbind-dinit
+                - xinetd-dinit
+                - wpa_supplicant-dinit
+            - name: "Office"
+              description: "Office init"
+              packages:
+                - cups-dinit
+                - sane-dinit
+            - name: "Services"
+              description: "Services init"
+              packages:
+                - acpid-dinit
+                - alsa-utils-dinit
+                - apparmor-dinit
+                - brltty-dinit
+                - fuse-dinit
+                - gpm-dinit
+                - hdparm-dinit
+                - haveged-dinit
+                - lm_sensors-dinit
+                - openvpn-dinit
+                - power-profiles-daemon-dinit
+                - rsync-dinit
+
+    - id: S6
+      name: s6
+      description: "S6 init system"
+      screenshot: ":/images/if.png"
+      netinstall:
+        name: "s6"
+        description: "S6 init system"
+        selected: false
+        critical: true
+        immutable: false
+        expanded: true
+        hidden: false
+        subgroups:
+            - name: "Default"
+              description: "Default services"
+              selected: true
+              hidden: true
+              packages:
+                - audit-s6
+                - cryptsetup-s6
+                - dbus-s6
+                - dhcpcd-s6
+                - lvm2-s6
+                - mdadm-s6
+                - s6-contrib
+            - name: "Login"
+              description: "Displaymanagers"
+              packages:
+                - sddm-s6
+            - name: "Cron"
+              description: "Cron init"
+              selected: true
+              packages:
+                - cronie-s6
+            - name: "Syslog"
+              description: "Syslog init"
+              packages:
+                - syslog-ng-s6
+                - metalog-s6
+            - name: "Internet"
+              description: "Network init"
+              packages:
+                - avahi-s6
+                - bluez-s6
+                - iptables-s6
+                - krb5-s6
+                - networkmanager-s6
+                - nfs-utils-s6
+                - ntp-s6
+                - openldap-s6
+                - openssh-s6
+                - rpcbind-s6
+                - xinetd-s6
+                - wpa_supplicant-s6
+            - name: "Office"
+              description: "Office init"
+              packages:
+                - cups-s6
+                - sane-s6
+            - name: "Services"
+              description: "Services init"
+              packages:
+                - acpid-s6
+                - alsa-utils-s6
+                - apparmor-s6
+                - brltty-s6
+                - fuse-s6
+                - gpm-s6
+                - hdparm-s6
+                - haveged-s6
+                - lm_sensors-s6
+                - openvpn-s6
+                - power-profiles-daemon-s6
+                - rsync-s6
+
+    - id: Runit
+      name: runit
+      description: "Runit init system"
+      screenshot: ":/images/if.png"
+      netinstall:
+        name: "runit"
+        description: "Runit init system"
+        selected: false
+        critical: true
+        immutable: false
+        expanded: true
+        hidden: false
+        subgroups:
+            - name: "Default"
+              description: "Default services"
+              selected: true
+              hidden: true
+              packages:
+                - audit-runit
+                - cryptsetup-runit
+                - dbus-runit
+                - dhcpcd-runit
+                - lvm2-runit
+                - mdadm-runit
+                - rsm
+            - name: "Login"
+              description: "Displaymanagers"
+              packages:
+                - sddm-runit
+            - name: "Cron"
+              description: "Cron init"
+              selected: true
+              packages:
+                - cronie-runit
+            - name: "Syslog"
+              description: "Syslog init"
+              packages:
+                - syslog-ng-runit
+                - metalog-runit
+            - name: "Internet"
+              description: "Network init"
+              packages:
+                - avahi-runit
+                - bluez-runit
+                - iptables-runit
+                - krb5-runit
+                - networkmanager-runit
+                - nfs-utils-runit
+                - ntp-runit
+                - openldap-runit
+                - openssh-runit
+                - rpcbind-runit
+                - xinetd-runit
+                - wpa_supplicant-runit
+            - name: "Office"
+              description: "Office init"
+              packages:
+                - cups-runit
+                - sane-runit
+            - name: "Services"
+              description: "Services init"
+              packages:
+                - acpid-runit
+                - alsa-utils-runit
+                - apparmor-runit
+                - brltty-runit
+                - fuse-runit
+                - gpm-runit
+                - hdparm-runit
+                - haveged-runit
+                - lm_sensors-runit
+                - openvpn-runit
+                - power-profiles-daemon-runit
+                - rsync-runit
--- a/common/conf/calamares-online/modules/packages.conf
+++ b/common/conf/calamares-online/modules/packages.conf
@@ -0,0 +1,11 @@
+---
+backend: pacman
+
+skip_if_no_internet: false
+update_db: true
+update_system: false
+
+pacman:
+    num_retries: 0
+    disable_download_timeout: false
+    needed_only: false
--- a/common/conf/calamares-online/modules/partition.conf
+++ b/common/conf/calamares-online/modules/partition.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/partition.conf
--- a/common/conf/calamares-online/modules/services-artix.conf
+++ b/common/conf/calamares-online/modules/services-artix.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/services-artix.conf
--- a/common/conf/calamares-online/modules/umount.conf
+++ b/common/conf/calamares-online/modules/umount.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/umount.conf
--- a/common/conf/calamares-online/modules/users.conf
+++ b/common/conf/calamares-online/modules/users.conf
@@ -0,0 +1 @@
+../../calamares-offline/modules/users.conf
--- a/common/live-overlay/etc/calamares/modules/welcome.conf
+++ b/common/live-overlay/etc/calamares/modules/welcome.conf
@@ -17,10 +17,4 @@ requirements:
      - 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
+      - internet
--- a/common/conf/calamares-online/network-online.svg
+++ b/common/conf/calamares-online/network-online.svg
--- a/common/conf/calamares-online/settings.conf
+++ b/common/conf/calamares-online/settings.conf
@@ -0,0 +1,54 @@
+---
+modules-search: [ local ]
+
+sequence:
+    - show:
+        - welcome
+        - locale
+        - keyboard
+        - packagechooser
+        - netinstall
+        - partition
+        - users
+        - summary
+    - exec:
+        - partition
+        - mount
+        - basestrap
+        - machineid
+        - packages
+        - fstab
+        - locale
+        - keyboard
+        - localecfg
+        - luksopenswaphookcfg
+        - luksbootkeyfile
+        - initcpiocfg
+        - initcpio
+        - users
+        - displaymanager
+        - networkcfg
+        - hwclock
+        - services-artix
+        - grubcfg
+        - bootloader
+        - postcfg
+        - umount
+    - show:
+        - finished
+
+branding: artix-next
+
+prompt-install: false
+
+dont-chroot: false
+
+oem-setup: false
+
+disable-cancel: false
+
+disable-cancel-during-exec: false
+
+hide-back-and-next-during-exec: false
+
+quit-at-end: false
--- a/common/live-overlay/etc/calamares-offline
+++ b/common/live-overlay/etc/calamares-offline
@@ -0,0 +1 @@
+../../../common/conf/calamares-offline
--- a/common/live-overlay/etc/calamares-online
+++ b/common/live-overlay/etc/calamares-online
@@ -0,0 +1 @@
+../../../common/conf/calamares-online
--- a/common/live-overlay/etc/calamares/modules/finished.conf
+++ b/common/live-overlay/etc/calamares/modules/finished.conf
@@ -1,4 +0,0 @@
---
-restartNowEnabled: true
-restartNowChecked: false
-restartNowCommand: "loginctl reboot"
--- a/common/live-overlay/etc/calamares/modules/initcpio.conf
+++ b/common/live-overlay/etc/calamares/modules/initcpio.conf
@@ -1,2 +0,0 @@
---
-kernel: linux
--- a/common/live-overlay/etc/calamares/modules/machineid.conf
+++ b/common/live-overlay/etc/calamares/modules/machineid.conf
@@ -1,4 +0,0 @@
---
-systemd: false
-dbus: true
-symlink: true
--- a/common/live-overlay/etc/calamares/modules/umount.conf
+++ b/common/live-overlay/etc/calamares/modules/umount.conf
@@ -1,3 +0,0 @@
---
-srcLog: "/root/.cache/Calamares/Calamares.log"
-destLog: "/var/log/Calamares.log"
--- a/common/live-overlay/etc/default
+++ b/common/live-overlay/etc/default
@@ -1 +0,0 @@
-../../../base/root-overlay/etc/default
--- a/common/live-overlay/etc/hostname
+++ b/common/live-overlay/etc/hostname
@@ -0,0 +1 @@
+../../../base/root-overlay/etc/hostname
--- a/common/live-overlay/etc/hosts
+++ b/common/live-overlay/etc/hosts
@@ -0,0 +1 @@
+../../../base/root-overlay/etc/hosts
--- a/common/live-overlay/etc/init.d/artix-live
+++ b/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 $?
-}
--- a/common/live-overlay/etc/local.d/1-dna_spiral.start
+++ b/common/live-overlay/etc/local.d/1-dna_spiral.start
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# Use the grayscale DNA helix in desktop ISOs
+ln -sf /usr/share/backgrounds/Artix_dna_spiral_dark_bw.jpg /usr/share/wallpapers/Artix/contents/images/1920x1080.jpg
+sed -i 's/GradientGlowBlue/Artix_dna_spiral_dark_bw/g' \
+    /etc/skel/.config/pcmanfm/LXDE/desktop-items-0.conf \
+    /etc/skel/.config/pcmanfm-qt/lxqt/settings.conf \
+    /etc/skel/.config/pcmanfm-qt/default/settings.conf \
+    /etc/skel/.config/kscreenlockerrc \
+    /etc/skel/.config/mate/backgrounds.xml \
+    /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml \
+    /etc/skel/.config/plasmarc \
+    /etc/skel/.config/plasma-org.kde.plasma.desktop-appletsrc \
+    /etc/dconf/db/mate.d/theme \
+    /usr/share/plasma/look-and-feel/artix.dark/contents/layouts/org.kde.plasma.desktop-layout.js \
+    /etc/schemas/99_gnome.gschema.override \
+    /etc/xdg/kscreenlockerrc \
+    /etc/xdg/plasmarc \
+    /usr/share/glib-2.0/schemas/99_cinnamon.gschema.override 2>/dev/null
+
+dconf update
+
+# Also in live
+for USER in /home/*; do
+  sed -i 's/GradientGlowBlue/Artix_dna_spiral_dark_bw/g' \
+    $USER/.config/pcmanfm/LXDE/desktop-items-0.conf \
+    $USER/.config/pcmanfm-qt/lxqt/settings.conf \
+    $USER/.config/pcmanfm-qt/default/settings.conf \
+    $USER/.config/kscreenlockerrc \
+    $USER/.config/plasma-org.kde.plasma.desktop-appletsrc \
+    $USER/.config/plasmarc 2>/dev/null
+done
+
+rm -f $0
--- a/common/live-overlay/etc/local.d/1-remove-sessions.start
+++ b/common/live-overlay/etc/local.d/1-remove-sessions.start
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Remove unconfigured sessions and waylannd in live
+rm -f /usr/share/xsessions/{openbox,kodi-gbm,kodi}.desktop 2>/dev/null
+[ $(hostname) == artix-live ] && rm -f /usr/share/wayland-sessions/* 2>/dev/null
+
+# Run once and disappear
+rm -f $0
--- a/common/live-overlay/etc/local.d/README
+++ b/common/live-overlay/etc/local.d/README
@@ -0,0 +1,14 @@
+This directory should contain programs or scripts which are to be run
+when the local service is started or stopped.
+
+If a file in this directory is executable and it has a .start extension,
+it will be run when the local service is started. If a file is
+executable and it has a .stop extension, it will be run when the local
+service is stopped.
+
+All files are processed in lexical order.
+
+Keep in mind that files in this directory are processed sequentially,
+and the local service is not considered started or stopped until
+everything is processed, so if you have a process which takes a long
+time to run, it can delay your boot or shutdown processing.
--- a/common/live-overlay/etc/local.d/artix-icons.start
+++ b/common/live-overlay/etc/local.d/artix-icons.start
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# Make all start-here icons Artix logos
+idir=/usr/share/icons
+cd $idir
+
+# Convert svg to png
+# Use graphicsmagick, because imagemagick segfaults with OpenCL
+for icon in $(find -not -path "*scalable*" -iname "start-here*.png"); do
+    sizeXY=$(sed -nE 's|.+/([0-9]+x[0-9]+)/.*|\1|p' <<< "$icon")
+    sizeX=$(sed -nE 's|.+/([0-9]+)/.*|\1|p' <<< "$icon")
+    if [ $sizeXY ]; then
+        gm convert -resize $sizeXY -background transparent artix/logo.svg "$icon" 2>/dev/null &
+    elif [ $sizeX ]; then
+        gm convert -resize $sizeX -background transparent artix/logo.svg "$icon" 2>/dev/null &
+    else
+        gm convert -resize 128 -background transparent artix/logo.svg "$icon" 2>/dev/null &
+    fi
+done
+
+# Copy over svg
+for icon in $(find -type f -iname "start-here*.svg" -o -type f -iname folder-activities.svg); do
+    cp -f artix/logo.svg $icon 2>/dev/null &
+done
+
+# Adwaita has some B/W icons
+for icon in $(find -not -path "*scalable*" -iname start-here-symbolic.symbolic.png); do
+    sizeXY=$(sed -nE 's|.+/([0-9]+x[0-9]+)/.*|\1|p' <<< "$icon")
+    sizeX=$(sed -nE 's|.+/([0-9]+)/.*|\1|p' <<< "$icon")
+    if [ $sizeXY ]; then
+        gm convert -resize $sizeXY -background transparent artix/logo-gray.svg "$icon" 2>/dev/null &
+    elif [ $sizeX ]; then
+        gm convert -resize $sizeX -background transparent artix/logo-gray.svg "$icon" 2>/dev/null &
+    else
+        gm convert -resize 128 -background transparent artix/logo-gray.svg "$icon" 2>/dev/null &
+    fi
+done
+
+# Comment out the chmod line below to run at every boot and catch new icons or updates
+chmod -x $0
--- a/common/live-overlay/etc/local.d/calamares-config.start
+++ b/common/live-overlay/etc/local.d/calamares-config.start
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Set default calamares configuration to allow root execution without errors
+cd /etc
+ln -s calamares-offline calamares 2>/dev/null
+
+# Delete stock calamares .desktop file
+rm -f /usr/share/applications/calamares.desktop
+
+rm -f $0
--- a/common/live-overlay/etc/local.d/change-machine-id.start
+++ b/common/live-overlay/etc/local.d/change-machine-id.start
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# machine-id can uniquely identify your machine, change it at every boot
+
+dbus-uuidgen >| /var/lib/dbus/machine-id &
+dbus-uuidgen >| /etc/machine-id &
--- a/common/live-overlay/etc/local.d/mkinitcpio.start
+++ b/common/live-overlay/etc/local.d/mkinitcpio.start
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# Force early boot consolefont at live session
+[ -f /etc/mkinitcpio.conf.mod ] && 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
+    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|cryptkey=rootfs:/crypto_keyfile.bin||' /etc/default/grub /boot/grub/grub.cfg 2>/dev/null
+fi
+
+# Run once and disappear
+rm -f $0
--- a/common/live-overlay/etc/local.d/networkmanagerfix.start
+++ b/common/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
--- a/common/live-overlay/etc/local.d/theme-root.start
+++ b/common/live-overlay/etc/local.d/theme-root.start
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+for setting in gtk-3.0 gtkrc gtkrc-2.0 kdeglobals qt5ct qt6ct mc; do
+    cp -a /etc/skel/.config/${setting} /root/.config/ 2>/dev/null &
+done
+
+rm -f $0
--- a/common/live-overlay/etc/polkit-1
+++ b/common/live-overlay/etc/polkit-1
@@ -1 +0,0 @@
-../../../base/root-overlay/etc/polkit-1
--- a/common/live-overlay/etc/skel/.config/autostart/make-installer-executable.desktop
+++ b/common/live-overlay/etc/skel/.config/autostart/make-installer-executable.desktop
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Exec=chmod +x "~/Desktop/calamares.desktop"
-Name=Make the installer on the desktop executable
-StartupNotify=false
-Terminal=false
-Type=Application
-Name[en_US]=make-installer-executable.desktop
--- a/common/live-overlay/etc/skel/.config/autostart/trust-calamares.desktop
+++ b/common/live-overlay/etc/skel/.config/autostart/trust-calamares.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Trust calamares
+Exec=sh -c "~/.config/autostart/trust-calamares.sh"
+Terminal=false
+Type=Application
+StartupNotify=false
--- a/common/live-overlay/etc/skel/.config/autostart/trust-calamares.sh
+++ b/common/live-overlay/etc/skel/.config/autostart/trust-calamares.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+calamares=~/Desktop/calamares-config-switcher.desktop
+while [ ! -f $calamares ]; do sleep 0.5; done
+gio set -t string $calamares metadata::xfce-exe-checksum "$(sha256sum $calamares | awk '{print $1}')"
--- a/common/live-overlay/etc/skel/.config/libfm/libfm.conf
+++ b/common/live-overlay/etc/skel/.config/libfm/libfm.conf
@@ -0,0 +1,43 @@
+# Configuration file for the libfm version 1.3.1.
+# Autogenerated file, don't edit, your changes will be overwritten.
+
+[config]
+single_click=0
+use_trash=1
+confirm_del=1
+confirm_trash=1
+advanced_mode=0
+si_unit=0
+force_startup_notify=1
+backup_as_hidden=1
+no_usb_trash=1
+no_child_non_expandable=0
+show_full_names=0
+only_user_templates=0
+template_run_app=0
+template_type_once=0
+auto_selection_delay=600
+drop_default_action=auto
+defer_content_test=0
+quick_exec=1
+thumbnail_local=1
+thumbnail_max=2048
+smart_desktop_autodrop=1
+
+[ui]
+big_icon_size=48
+small_icon_size=24
+pane_icon_size=24
+thumbnail_size=128
+show_thumbnail=1
+shadow_hidden=0
+
+[places]
+places_home=1
+places_desktop=1
+places_root=0
+places_computer=0
+places_trash=1
+places_applications=1
+places_network=0
+places_unmounted=1
--- a/common/live-overlay/etc/skel/Desktop/calamares.desktop
+++ b/common/live-overlay/etc/skel/Desktop/calamares.desktop
@@ -1,205 +0,0 @@
-#!/usr/bin/env xdg-open
-
-[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
--- a/common/live-overlay/usr/bin/calamares-config-switcher
+++ b/common/live-overlay/usr/bin/calamares-config-switcher
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+export QT_STYLE_OVERRIDE=qt6gtk2
+export XAUTHCOOKIE=$XAUTHORITY
+export XDISPLAY=$DISPLAY
+
+readonly conf=/etc/calamares-config-switcher.conf
+
+if [[ -f "${conf}" ]]; then
+    # shellcheck source=/etc/calamares-config-switcher.conf
+    . "${conf}"
+fi
+
+title=${title:-"Switcher"}
+text=${text:-"Select:"}
+if [[ -z "${configs[*]}" ]]; then
+    configs=(offline online)
+fi
+
+select=$(kdialog --title "${title}" --combobox "${text}" "${configs[@]}" --default "${configs[0]}") || exit 1
+
+pkexec ln -snf /etc/calamares-"$select" /etc/calamares
+
+pkexec env DISPLAY=$XDISPLAY XAUTHORITY=$XAUTHCOOKIE QT_QPA_PLATFORMTHEME=qt6gtk2 calamares "$@"
--- a/common/live-overlay/usr/share/applications/calamares.desktop
+++ b/common/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
--- a/common/live-overlay/usr/share/polkit-1/rules.d/90-live.rules
+++ b/common/live-overlay/usr/share/polkit-1/rules.d/90-live.rules
--- a/common/root-overlay/etc/elogind
+++ b/common/root-overlay/etc/elogind
@@ -0,0 +1 @@
+../../../base/root-overlay/etc/elogind
--- a/common/root-overlay/etc/environment
+++ b/common/root-overlay/etc/environment
@@ -1,2 +1,4 @@
+#GTK_THEME=Artix:dark
 QT_QPA_PLATFORMTHEME=gtk2
 QT_STYLE_OVERRIDE=gtk
+QTWEBENGINE_CHROMIUM_FLAGS="-blink-settings=darkModeEnabled=true -enable-features=OverlayScrollbar,OverlayScrollbarFlashAfterAnyScrollUpdate,OverlayScrollbarFlashWhenMouseEnter"
--- a/common/root-overlay/etc/fstab
+++ b/common/root-overlay/etc/fstab
@@ -0,0 +1 @@
+../../../base/root-overlay/etc/fstab
--- a/common/root-overlay/etc/hostname
+++ b/common/root-overlay/etc/hostname
@@ -0,0 +1 @@
+../../../base/root-overlay/etc/hostname
--- a/common/root-overlay/etc/hosts
+++ b/common/root-overlay/etc/hosts
@@ -1 +0,0 @@
-127.0.0.1	localhost artix
--- a/common/root-overlay/etc/hosts
+++ b/common/root-overlay/etc/hosts
@@ -0,0 +1 @@
+../../../base/root-overlay/etc/hosts
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`../../../common/root-overlay/etc/pacman.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/bootloader.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/displaymanager.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/finished.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/initcpio.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/locale.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/machineid.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/partition.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/services-artix.conf`
				`@@ -0,0 +1 @@`
				`../../calamares-offline/modules/umount.conf`