resurrect i3

2020-01-14 20:42:51 +01:00
142 changed files with 2949 additions and 1813 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 to_package/
-**/rc.conf
--- a/README.md
+++ b/README.md
@@ -3,12 +3,12 @@
 The Artix ISO profiles.


-The profiles are designated base, netinstall, minimal plasma.
+The profiles are designated base, minimal and community.

 Base only offers a bare minimum system, installable from the CLI. For advanced users.

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

-Netinstall profile has the same minimal plasma live DE, but the calamares installer is configured in pure online netinstall mode and has almost every package selectable, including the init system to install. Everything is downloaded instead of the offline unpack mode, including the init system to install. Full customization of the target system.
+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.

-Common settings among all profiles are stored in ''common''.
+Common settings among all minimal profiles are stored in ''common''.
--- a/62
+++ b/62
@@ -1,64 +1,8 @@
-TO-{DO,FIX} LIST
+TO-DO 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
-DONE  |_ Application settings -> app-presets
+PENDING  |_ Application settings -> app-presets

-FIXED /etc/rc.local from artix-branding-base overwrites /etc/issue with artix:artix info
-
-DONE Change prompt from $ to % in community profiles
-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
-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/.....)
+DONE /etc/rc.local from artix-branding-base overwrites /etc/issue with artix:artix info
--- a/base/Packages-Root
+++ b/base/Packages-Root
@@ -1,8 +1,108 @@
-# loads by default common/packages-{base,apps}
+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

 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-live-@initsys@
+artix-grub-theme
+artix-branding-base
--- a/base/profile.conf
+++ b/base/profile.conf
@@ -1,17 +1,25 @@
 ################ install ################

-# start services
-# 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 displaymanager: none
+# supported: lightdm, sddm, gdm, lxdm, mdm
+# DISPLAYMANAGER="none"

-SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'connmand')
+# Set to false to disable autologin in the livecd
+AUTOLOGIN="false"
+
+# start services
+SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'metalog' 'connmand')
+
+# default group membership
+# ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"

 ################# live-session #################

 # default value
-# PASSWORD="artix"
+# HOST_NANE="artix"

-# Set to false to disable autologin in the live session
-AUTOLOGIN="false"
+# default value
+# USER_NAME="artix"
+
+# default value
+# PASSWORD="artix"
--- a/base/root-overlay
+++ b/base/root-overlay
@@ -1 +0,0 @@
-../common/root-overlay
--- a/base/root-overlay/etc/default/grub
+++ b/base/root-overlay/etc/default/grub
@@ -0,0 +1,50 @@
+GRUB_DEFAULT="0"
+GRUB_TIMEOUT="3"
+GRUB_DISTRIBUTOR="Artix"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
+GRUB_CMDLINE_LINUX="net.ifnames=0"
+
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
+# Uncomment to enable Hidden Menu, and optionally hide the timeout count
+#GRUB_HIDDEN_TIMEOUT="5"
+#GRUB_HIDDEN_TIMEOUT_QUIET="true"
+
+# Uncomment to use basic console
+GRUB_TERMINAL_INPUT="console"
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL_OUTPUT="console"
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE="1680x1050x8"
+GRUB_GFXMODE=auto
+
+# Uncomment to allow the kernel use the same resolution used by grub
+GRUB_GFXPAYLOAD_LINUX="keep"
+
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
+GRUB_DISABLE_LINUX_UUID="true"
+
+# Uncomment to disable generation of recovery mode menu entries
+GRUB_DISABLE_RECOVERY="true"
+
+# Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
+# modes only.  Entries specified as foreground/background.
+export GRUB_COLOR_NORMAL="light-blue/black"
+export GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+#GRUB_BACKGROUND="/path/to/wallpaper"
+GRUB_THEME="/usr/share/grub/themes/artix/theme.txt"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"
+
+GRUB_SAVEDEFAULT="true"
+
+GRUB_DISABLE_LINUX_RECOVERY="true"
--- a/common/root-overlay/etc/fstab
+++ b/common/root-overlay/etc/fstab
--- a/common/root-overlay/etc/issue
+++ b/common/root-overlay/etc/issue
--- a/common/root-overlay/etc/issue.live
+++ b/common/root-overlay/etc/issue.live
--- a/common/root-overlay/etc/pam.d/su
+++ b/common/root-overlay/etc/pam.d/su
--- a/common/live-overlay/etc/polkit-1/rules.d/90-live.rules
+++ b/common/live-overlay/etc/polkit-1/rules.d/90-live.rules
--- a/common/root-overlay/etc/sudoers.d/g_wheel
+++ b/common/root-overlay/etc/sudoers.d/g_wheel
--- a/common/root-overlay/etc/sudoers.d/u_root
+++ b/common/root-overlay/etc/sudoers.d/u_root
--- a/buildISOs-weekly-cron.sh
+++ b/buildISOs-weekly-cron.sh
@@ -1,114 +0,0 @@
-#!/bin/bash
-
-# Automated ISO build script
-# Builds all profiles, all inits and rsyncs to ISO download server
-# 2019-2021, 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
-DATE=$(date +"%Y%m%d")
-
-mkdir -p ${PROFILES}/logs
-
-cd $WORKSPACE
-if [[ -d $PROFILES ]]; then
-    cd $PROFILES
-#    git checkout community
-    git pull
-else
-    git clone https://gitea.artixlinux.org/artix/iso-profiles.git
-#    git checkout community
-fi
-
-cd $PROFILES
-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 && git checkout master
-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@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"
--- a/buildISOs-weekly.sh
+++ b/buildISOs-weekly.sh
@@ -1,130 +0,0 @@
-#!/bin/bash
-
-# Automated ISO build script
-# Builds select profiles / inits
-# 2019-2021, 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
-DATE=$(date +"%Y%m%d")
-
-mkdir -p ${PROFILES}/logs
-
-cd $WORKSPACE
-if [[ -d $PROFILES ]]; then
-    cd $PROFILES
-#    git checkout community
-    git pull
-else
-    git clone https://gitea.artixlinux.org/artix/iso-profiles.git
-fi
-
-cd $PROFILES
-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' '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 && git checkout master
-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}-${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/
-        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/weekly-iso
+REPO=/srv/iso/testing-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' 'dinit')
+all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git" | sort))
+all_inits=('openrc' 'runit' 's6')

 usage() {
    echo
@@ -48,15 +48,15 @@ while getopts "b:p:i:" option; do
        p)
            _profile=$OPTARG
            for p in ${all_profiles[@]}; do
-                [[ ${_profile} =~ $p ]] && profiles+=($p)
-            done
+				[[ ${_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} =~ $i ]] && inits+=($i)
+			done
            [[ ${_init} == all ]]    && inits=(${all_inits[@]})
            ;;
    esac
@@ -64,12 +64,12 @@ 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; }
+[[ ${#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}"
+echo "		branch		${BOLD}${_branch}${ALL_OFF}"
+echo "		profiles 	${GREEN}${profiles[@]}${ALL_OFF}"
+echo "		inits		${CYAN}${inits[@]}${ALL_OFF}"

 mkdir -p ${PROFILES}

@@ -81,7 +81,7 @@ else
    git clone https://gitea.artixlinux.org/artix/iso-profiles.git
 fi

-cd $PROFILES && git checkout master
+cd $PROFILES && git checkout refactor
 echo "#################################" >>$CWD/ISO_build.log
 for profile in ${profiles[@]}; do
    for init in ${inits[@]}; do
@@ -90,12 +90,11 @@ for profile in ${profiles[@]}; do
        echo "$stamp == Begin building    ${_branch} $profile ISO with $init" >> $CWD/ISO_build.log
        nice -n 20 buildiso${branch} -p $profile -i $init
        res=$?
-        rm -f ${PROFILES}/$profile/root-overlay/etc/rc.conf
        stamp=$(timestamp)
-        sudo rm -fr /var/lib/artools/buildiso/$profile &
-        [[ $res == 0 ]] && { echo "$stamp == ${GREEN}Finished building ${_branch} $profile ISO with $init${ALL_OFF}" >> $CWD/ISO_build.log; } \
-                        || { echo "$stamp == ${RED}Failed building   ${_branch} $profile ISO with $init${ALL_OFF}" >> $CWD/ISO_build.log; continue; }
+        [[ $res ]] &&	echo "$stamp == ${GREEN}Finished building ${_branch} $profile ISO with $init${ALL_OFF}" >> $CWD/ISO_build.log || \
+						echo "$stamp == ${RED}Failed building   ${_branch} $profile ISO with $init${ALL_OFF}" >> $CWD/ISO_build.log
+        rm -f ${PROFILES}/$profile/root-overlay/etc/rc.conf
        mv -v ${WORKSPACE}/iso/$profile/artix-$profile-$init-*.iso ${REPO}/
-        cd $REPO && { sha256sum artix-*.iso > ${REPO}/sha256sums & }
+        cd $REPO && sha256sum artix-*.iso > ${REPO}/sha256sums &
    done
 done
--- a/cinnamon/Packages-Live
+++ b/cinnamon/Packages-Live
@@ -0,0 +1,23 @@
+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
--- a/cinnamon/Packages-Root
+++ b/cinnamon/Packages-Root
@@ -0,0 +1,176 @@
+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 displaymanager-openrc
+@openrc networkmanager-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
+
+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-gtk-presets
+artix-grub-theme
+artix-dark-theme
+xcursor-premium
+artix-branding-base
+
+# Basic usability apps
+gvfs-mtp
+leafpad
+lightdm-gtk-greeter
+light-locker
+midori
+mpv
+xreader
+
+# Cinnamon
+cinnamon
+# Cinnamon extra
+blueberry
+eog
+file-roller
+gnome-calculator
+gnome-disk-utility
+gnome-keyring
+gnome-online-accounts
+gnome-screenshot
+gnome-system-log
+gnome-system-monitor
+gnome-terminal
+nemo-fileroller
+nemo-preview
+nemo-seahorse
+nemo-share
+xcursor-vanilla-dmz
--- a/cinnamon/live-overlay
+++ b/cinnamon/live-overlay
@@ -0,0 +1 @@
+../common/live-overlay
--- a/cinnamon/profile.conf
+++ b/cinnamon/profile.conf
@@ -0,0 +1,25 @@
+################ 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' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
+
+# default group membership
+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"
--- a/cinnamon/root-overlay/etc/default
+++ b/cinnamon/root-overlay/etc/default
@@ -0,0 +1 @@
+../../../common/root-overlay/etc/default
--- a/cinnamon/root-overlay/etc/environment
+++ b/cinnamon/root-overlay/etc/environment
@@ -0,0 +1 @@
+../../../common/root-overlay/etc/environment
--- a/cinnamon/root-overlay/etc/hosts
+++ b/cinnamon/root-overlay/etc/hosts
@@ -0,0 +1 @@
+../../../common/root-overlay/etc/hosts
--- a/cinnamon/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/cinnamon/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
@@ -0,0 +1 @@
+../../../../common/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
--- a/cinnamon/root-overlay/etc/lightdm/lightdm.conf
+++ b/cinnamon/root-overlay/etc/lightdm/lightdm.conf
@@ -0,0 +1,169 @@
+#
+# General configuration
+#
+# start-default-seat = True to always start one seat if none are defined in the configuration
+# greeter-user = User to run greeter as
+# minimum-display-number = Minimum display number to use for X servers
+# minimum-vt = First VT to run displays on
+# lock-memory = True to prevent memory from being paged to disk
+# user-authority-in-system-dir = True if session authority should be in the system location
+# guest-account-script = Script to be run to setup guest account
+# logind-check-graphical = True to on start seats that are marked as graphical by logind
+# log-directory = Directory to log information to
+# run-directory = Directory to put running state in
+# cache-directory = Directory to cache to
+# sessions-directory = Directory to find sessions
+# remote-sessions-directory = Directory to find remote sessions
+# greeters-directory = Directory to find greeters
+# backup-logs = True to move add a .old suffix to old log files when opening new ones
+# dbus-service = True if LightDM provides a D-Bus service to control it
+#
+[LightDM]
+#start-default-seat=true
+#greeter-user=lightdm
+#minimum-display-number=0
+#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799
+#lock-memory=true
+#user-authority-in-system-dir=false
+#guest-account-script=guest-account
+#logind-check-graphical=false
+#log-directory=/var/log/lightdm
+run-directory=/run/lightdm
+#cache-directory=/var/cache/lightdm
+#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
+#remote-sessions-directory=/usr/share/lightdm/remote-sessions
+#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
+#backup-logs=true
+#dbus-service=true
+
+#
+# Seat configuration
+#
+# Seat configuration is matched against the seat name glob in the section, for example:
+# [Seat:*] matches all seats and is applied first.
+# [Seat:seat0] matches the seat named "seat0".
+# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
+#
+# type = Seat type (local, xremote, unity)
+# pam-service = PAM service to use for login
+# pam-autologin-service = PAM service to use for autologin
+# pam-greeter-service = PAM service to use for greeters
+# xserver-backend = X backend to use (mir)
+# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
+# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
+# xserver-config = Config file to pass to X server
+# xserver-layout = Layout to pass to X server
+# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
+# xserver-share = True if the X server is shared for both greeter and session
+# xserver-hostname = Hostname of X server (only for type=xremote)
+# xserver-display-number = Display number of X server (only for type=xremote)
+# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
+# xdmcp-port = XDMCP UDP/IP port to communicate on
+# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
+# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
+# unity-compositor-timeout = Number of seconds to wait for compositor to start
+# greeter-session = Session to load for greeter
+# greeter-hide-users = True to hide the user list
+# greeter-allow-guest = True if the greeter should show a guest login option
+# greeter-show-manual-login = True if the greeter should offer a manual login option
+# greeter-show-remote-login = True if the greeter should offer a remote login option
+# user-session = Session to load for users
+# allow-user-switching = True if allowed to switch users
+# allow-guest = True if guest login is allowed
+# guest-session = Session to load for guests (overrides user-session)
+# session-wrapper = Wrapper script to run session with
+# greeter-wrapper = Wrapper script to run greeter with
+# guest-wrapper = Wrapper script to run guest sessions with
+# display-setup-script = Script to run when starting a greeter session (runs as root)
+# display-stopped-script = Script to run after stopping the display server (runs as root)
+# greeter-setup-script = Script to run when starting a greeter (runs as root)
+# session-setup-script = Script to run when starting a user session (runs as root)
+# session-cleanup-script = Script to run when quitting a user session (runs as root)
+# autologin-guest = True to log in as guest by default
+# autologin-user = User to log in with by default (overrides autologin-guest)
+# autologin-user-timeout = Number of seconds to wait before loading default user
+# autologin-session = Session to load for automatic login (overrides user-session)
+# autologin-in-background = True if autologin session should not be immediately activated
+# exit-on-failure = True if the daemon should exit if this seat fails
+#
+[Seat:*]
+#type=local
+#pam-service=lightdm
+#pam-autologin-service=lightdm-autologin
+#pam-greeter-service=lightdm-greeter
+#xserver-backend=
+#xserver-command=X
+#xmir-command=Xmir
+#xserver-config=
+#xserver-layout=
+#xserver-allow-tcp=false
+#xserver-share=true
+#xserver-hostname=
+#xserver-display-number=
+#xdmcp-manager=
+#xdmcp-port=177
+#xdmcp-key=
+#unity-compositor-command=unity-system-compositor
+#unity-compositor-timeout=60
+greeter-session=lightdm-gtk-greeter
+#greeter-hide-users=false
+#greeter-allow-guest=true
+#greeter-show-manual-login=false
+#greeter-show-remote-login=true
+#user-session=default
+#allow-user-switching=true
+#allow-guest=true
+#guest-session=
+session-wrapper=/etc/lightdm/Xsession
+#greeter-wrapper=
+#guest-wrapper=
+#display-setup-script=
+#display-stopped-script=
+#greeter-setup-script=
+#session-setup-script=
+#session-cleanup-script=
+#autologin-guest=false
+autologin-user=artix
+#autologin-user-timeout=0
+#autologin-in-background=false
+autologin-session=cinnamon
+#exit-on-failure=false
+
+#
+# XDMCP Server configuration
+#
+# enabled = True if XDMCP connections should be allowed
+# port = UDP/IP port to listen for connections on
+# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
+# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
+# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
+#
+# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
+# it can be a word and the first 7 characters are used as the key.
+#
+[XDMCPServer]
+#enabled=false
+#port=177
+#listen-address=
+#key=
+#hostname=
+
+#
+# VNC Server configuration
+#
+# enabled = True if VNC connections should be allowed
+# command = Command to run Xvnc server with
+# port = TCP/IP port to listen for connections on
+# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
+# width = Width of display to use
+# height = Height of display to use
+# depth = Color depth of display to use
+#
+[VNCServer]
+#enabled=false
+#command=Xvnc
+#port=5900
+#listen-address=
+#width=1024
+#height=768
+#depth=8
--- a/common/Packages-apps
+++ b/common/Packages-apps
@@ -1,2 +0,0 @@
-powertop
-inxi
--- a/common/Packages-base
+++ b/common/Packages-base
@@ -1,71 +0,0 @@
-# Packages common in all profiles
-base
-intel-ucode
-amd-ucode
-
-elogind-@initsys@
-acpi
-acpid-@initsys@
-alsa-firmware
-# alsa-utils-@initsys@
-avahi-@initsys@
-b43-fwcutter
-bluez-@initsys@
-btrfs-progs
-crda
-cronie-@initsys@
-cryptsetup-@initsys@
-dbus-@initsys@
-dhclient
-dhcpcd-@initsys@
-diffutils
-dmraid
-dosfstools
-efibootmgr
-e2fsprogs
-ecryptfs-utils
-exfat-utils
-f2fs-tools
-grub
-artix-grub-theme
-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
-power-profiles-daemon-@initsys@
-# 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
@@ -1,5 +0,0 @@
-# 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
@@ -1 +0,0 @@
-blocaled
--- a/common/Packages-openrc
+++ b/common/Packages-openrc
@@ -1 +0,0 @@
-openrc-settingsd
--- a/common/Packages-runit
+++ b/common/Packages-runit
@@ -1,2 +0,0 @@
-blocaled
-rsm
--- a/common/Packages-s6
+++ b/common/Packages-s6
@@ -1 +0,0 @@
-blocaled
--- a/common/Packages-xorg
+++ b/common/Packages-xorg
@@ -1,47 +0,0 @@
-# Xorg
-xorg-server
-xorg-xhost
-xorg-xinit
-xdg-user-dirs
-xdg-utils
-wayland
-xorg-xwayland
-
-# 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
-ttf-droid
--- a/common/conf/calamares-offline/modules/finished.conf
+++ b/common/conf/calamares-offline/modules/finished.conf
@@ -1,6 +0,0 @@
---
-restartNowMode: user-unchecked
-
-restartNowCommand: "loginctl reboot"
-
-notifyOnFinished: false
--- a/common/conf/calamares-offline/modules/initcpio.conf
+++ b/common/conf/calamares-offline/modules/initcpio.conf
@@ -1,4 +0,0 @@
---
-kernel: all
-
-be_unsafe: false
--- a/common/conf/calamares-offline/modules/locale.conf
+++ b/common/conf/calamares-offline/modules/locale.conf
@@ -1,7 +0,0 @@
---
-localeGenPath: /etc/locale.gen
-
-geoip:
-    style:    "json"
-    url:      "https://geoip.kde.org/v1/calamares"
-    selector: ""
--- a/common/conf/calamares-offline/modules/machineid.conf
+++ b/common/conf/calamares-offline/modules/machineid.conf
@@ -1,5 +0,0 @@
---
-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
@@ -1,32 +0,0 @@
-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
@@ -1,3 +0,0 @@
---
-keyrings:
-  - artix
--- a/common/conf/calamares-offline/modules/services-artix.conf
+++ b/common/conf/calamares-offline/modules/services-artix.conf
@@ -1,4 +0,0 @@
---
-command: artix-service
-
-services: []
--- a/common/conf/calamares-offline/modules/umount.conf
+++ b/common/conf/calamares-offline/modules/umount.conf
@@ -1,2 +0,0 @@
---
-emergency: false
--- a/common/conf/calamares-offline/modules/unpackfs.conf
+++ b/common/conf/calamares-offline/modules/unpackfs.conf
@@ -1,6 +0,0 @@
---
-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
@@ -1,49 +0,0 @@
---
-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
@@ -1,19 +0,0 @@
---
-showSupportUrl:         true
-showKnownIssuesUrl:     true
-showReleaseNotesUrl:    true
-
-requirements:
-    requiredStorage:    5.5
-    requiredRam:        1.0
-    internetCheckUrl:   https://www.artixlinux.org
-    check:
-      - storage
-      - ram
-      - power
-      - internet
-      - root
-    required:
-      - storage
-      - ram
-      - root
--- a/common/conf/calamares-online/modules/basestrap.conf
+++ b/common/conf/calamares-online/modules/basestrap.conf
@@ -1,32 +0,0 @@
---
-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
@@ -1,15 +0,0 @@
---
-efiBootLoader: "grub"
-
-kernel: "/vmlinuz-linux-x86_64"
-img: "/initramfs-linux-x86_64.img"
-fallback: "/initramfs-linux-x86_64-fallback.img"
-timeout: "10"
-
-grubInstall: "grub-install"
-grubMkconfig: "grub-mkconfig"
-grubCfg: "/boot/grub/grub.cfg"
-grubProbe: "grub-probe"
-efiBootMgr: "efibootmgr"
-
-installEFIFallback: true
--- a/common/conf/calamares-online/modules/displaymanager.conf
+++ b/common/conf/calamares-online/modules/displaymanager.conf
@@ -1,10 +0,0 @@
---
-displaymanagers:
-  - lightdm
-  - gdm
-  - mdm
-  - sddm
-  - lxdm
-  - slim
-
-basicSetup: false
--- a/common/conf/calamares-online/modules/finished.conf
+++ b/common/conf/calamares-online/modules/finished.conf
@@ -1,6 +0,0 @@
---
-restartNowMode: user-unchecked
-
-restartNowCommand: "loginctl reboot"
-
-notifyOnFinished: false
--- a/common/conf/calamares-online/modules/initcpio.conf
+++ b/common/conf/calamares-online/modules/initcpio.conf
@@ -1,4 +0,0 @@
---
-kernel: all
-
-be_unsafe: false
--- a/common/conf/calamares-online/modules/machineid.conf
+++ b/common/conf/calamares-online/modules/machineid.conf
@@ -1,5 +0,0 @@
---
-systemd: false
-dbus: true
-dbus-symlink: true
-entropy-copy: false
--- a/common/conf/calamares-online/modules/netinstall.conf
+++ b/common/conf/calamares-online/modules/netinstall.conf
@@ -1,55 +0,0 @@
---
-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
@@ -1,68 +0,0 @@
- name: "Default"
-  description: "Default packages"
-  hidden: false
-  selected: true
-  critical: true
-  immutable: true
-  packages:
-    - linux
-    - linux-headers
-    - grub
-    - efibootmgr
-    - sudo
-
- name: "Kernel"
-  description: "Kernel and modules"
-  selected: false
-  packages:
-    - acpi_call
-    - bbswitch
-    - broadcom-wl
-    - 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
-    - intel-ucode
-    - amd-ucode
-
- name: "Utilities"
-  description: "System Utilities"
-  selected: true
-  packages:
-    - lsb-release
-    - nano
-    - vi
-
- name: "Devel"
-  description: "Artix development"
-  selected: false
-  packages:
-    - base-devel
-    - artix-checkupdates
-    - artix-rebuild-order
-    - artools-base
-    - artools-iso
-    - artools-pkg
-
- name: "Style"
-  description: "Artix themes, icons, branding"
-  selected: false
-  packages:
-    - artix-netinstall-presets
-    - artix-grub-theme
--- a/common/conf/calamares-online/modules/packagechooser.conf
+++ b/common/conf/calamares-online/modules/packagechooser.conf
@@ -1,294 +0,0 @@
---
-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: "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: "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: "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: "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
@@ -1,11 +0,0 @@
---
-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
@@ -1,32 +0,0 @@
-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-online/modules/services-artix.conf
+++ b/common/conf/calamares-online/modules/services-artix.conf
@@ -1,4 +0,0 @@
---
-command: artix-service
-
-services: []
--- a/common/conf/calamares-online/modules/umount.conf
+++ b/common/conf/calamares-online/modules/umount.conf
@@ -1,2 +0,0 @@
---
-emergency: false
--- a/common/conf/calamares-online/modules/users.conf
+++ b/common/conf/calamares-online/modules/users.conf
@@ -1,49 +0,0 @@
---
-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-online/settings.conf
+++ b/common/conf/calamares-online/settings.conf
@@ -1,54 +0,0 @@
---
-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/kde/root-overlay/etc/default
+++ b/common/kde/root-overlay/etc/default
@@ -1 +0,0 @@
-../../../../common/root-overlay/etc/default
--- a/common/kde/root-overlay/etc/sddm.conf
+++ b/common/kde/root-overlay/etc/sddm.conf
@@ -1,37 +0,0 @@
-[General]
-InputMethod=qtvirtualkeyboard
-Numlock=none
-
-[Theme]
-DisableAvatarsThreshold=7
-EnableAvatars=true
-FacesDir=/usr/share/sddm/faces
-ThemeDir=/usr/share/sddm/themes
-
-[Users]
-DefaultPath=/usr/local/bin:/usr/bin:/bin
-HideShells=
-HideUsers=
-RememberLastSession=true
-RememberLastUser=true
-ReuseSession=false
-
-[Wayland]
-EnableHiDPI=false
-SessionCommand=/usr/share/sddm/scripts/wayland-session
-SessionDir=/usr/share/wayland-sessions
-SessionLogFile=.local/share/sddm/wayland-session.log
-
-[X11]
-DisplayCommand=/usr/share/sddm/scripts/Xsetup
-DisplayStopCommand=/usr/share/sddm/scripts/Xstop
-EnableHiDPI=false
-MinimumVT=7
-ServerArguments=-nolisten tcp
-ServerPath=/usr/bin/X
-SessionCommand=/usr/share/sddm/scripts/Xsession
-SessionDir=/usr/share/xsessions
-SessionLogFile=.local/share/sddm/xorg-session.log
-UserAuthFile=.Xauthority
-XauthPath=/usr/bin/xauth
-XephyrPath=/usr/bin/Xephyr
--- a/common/kde/root-overlay/etc/sddm.conf.d/kde_settings.conf
+++ b/common/kde/root-overlay/etc/sddm.conf.d/kde_settings.conf
@@ -1,17 +0,0 @@
-[Autologin]
-Relogin=false
-Session=plasma.desktop
-User=artix
-
-[General]
-HaltCommand=/usr/bin/loginctl poweroff
-RebootCommand=/usr/bin/loginctl reboot
-
-[Theme]
-Current=breeze
-CursorTheme=breeze_cursors
-Font=Noto Sans,10,-1,0,50,0,0,0,0,0
-
-[Users]
-MaximumUid=60000
-MinimumUid=1000
--- a/common/live-overlay/etc/calamares-offline
+++ b/common/live-overlay/etc/calamares-offline
@@ -1 +0,0 @@
-../../../common/conf/calamares-offline
--- a/common/live-overlay/etc/calamares-online
+++ b/common/live-overlay/etc/calamares-online
@@ -1 +0,0 @@
-../../../common/conf/calamares-online
--- a/common/live-overlay/etc/calamares/modules/bootloader.conf
+++ b/common/live-overlay/etc/calamares/modules/bootloader.conf
@@ -1,15 +1,12 @@
 ---
 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"
-grubProbe: "grub-probe"
-efiBootMgr: "efibootmgr"
-
-installEFIFallback: true
+#efiBootloaderId: "dirname"
--- a/common/live-overlay/etc/calamares/modules/displaymanager.conf
+++ b/common/live-overlay/etc/calamares/modules/displaymanager.conf
--- a/common/live-overlay/etc/calamares/modules/finished.conf
+++ b/common/live-overlay/etc/calamares/modules/finished.conf
@@ -0,0 +1,4 @@
+---
+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
@@ -0,0 +1,2 @@
+---
+kernel: linux
--- a/common/live-overlay/etc/calamares/modules/locale.conf
+++ b/common/live-overlay/etc/calamares/modules/locale.conf
@@ -1,4 +1,7 @@
 ---
+# region:                     "America"
+# zone:                       "New_York"
+
 localeGenPath: /etc/locale.gen

 geoip:
--- a/common/live-overlay/etc/calamares/modules/machineid.conf
+++ b/common/live-overlay/etc/calamares/modules/machineid.conf
@@ -0,0 +1,4 @@
+---
+systemd: false
+dbus: true
+symlink: true
--- a/common/live-overlay/etc/calamares/modules/umount.conf
+++ b/common/live-overlay/etc/calamares/modules/umount.conf
@@ -0,0 +1,3 @@
+---
+srcLog: "/root/.cache/Calamares/Calamares.log"
+destLog: "/var/log/Calamares.log"
--- a/common/live-overlay/etc/calamares/modules/welcome.conf
+++ b/common/live-overlay/etc/calamares/modules/welcome.conf
@@ -6,7 +6,7 @@ showReleaseNotesUrl:    true
 requirements:
    requiredStorage:    5.5
    requiredRam:        1.0
-    internetCheckUrl:   https://www.artixlinux.org
+    internetCheckUrl:   https://artixlinux.org
    check:
      - storage
      - ram
@@ -17,4 +17,10 @@ requirements:
      - storage
      - ram
      - root
-      - internet
+
+# geoip:
+#     style:    "none"
+#     url:      "https://geoip.kde.org/v1/ubiquity"  # extended XML format
+#     selector: "CountryCode"  # blank uses default, which is wrong
+
+# languageIcon: set-language
--- 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-artix
+        - services-openrc
        - grubcfg
        - bootloader
        - postcfg
@@ -40,12 +40,6 @@ 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/default
+++ b/common/live-overlay/etc/default
@@ -0,0 +1 @@
+../../../base/root-overlay/etc/default
--- a/common/live-overlay/etc/elogind/logind.conf
+++ b/common/live-overlay/etc/elogind/logind.conf
@@ -1,45 +0,0 @@
-#  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/common/live-overlay/etc/elogind/sleep.conf
+++ b/common/live-overlay/etc/elogind/sleep.conf
@@ -1,36 +0,0 @@
-#  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 sleep.conf.d/ subdirectory. The latter is generally recommended.
-# Defaults can be restored by simply deleting this file and all drop-ins.
-#
-# See sleep.conf(5) for details.
-
-[Sleep]
-#AllowSuspend=yes
-#AllowHibernation=yes
-#AllowSuspendThenHibernate=yes
-#AllowHybridSleep=yes
-#SuspendMode=
-#SuspendState=mem standby freeze
-#HibernateMode=platform shutdown
-#HibernateState=disk
-#HybridSleepMode=suspend platform shutdown
-#HybridSleepState=disk
-#HibernateDelaySec=
-#SuspendEstimationSec=60min
-
-# elogind additions
-#AllowPowerOffInterrupts=no
-#BroadcastPowerOffInterrupts=yes
-#AllowSuspendInterrupts=no
-#BroadcastSuspendInterrupts=yes
-#SuspendByUsing=
-#HibernateByUsing=
-#HandleNvidiaSleep=no
--- a/common/live-overlay/etc/fstab
+++ b/common/live-overlay/etc/fstab
@@ -1 +1 @@
-../../../common/root-overlay/etc/fstab
+../../../base/root-overlay/etc/fstab
--- a/common/live-overlay/etc/hostname
+++ b/common/live-overlay/etc/hostname
@@ -1 +0,0 @@
-artix-live
--- a/common/live-overlay/etc/hosts
+++ b/common/live-overlay/etc/hosts
@@ -1,9 +0,0 @@
-# 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/common/live-overlay/etc/init.d/artix-live
+++ b/common/live-overlay/etc/init.d/artix-live
@@ -0,0 +1,16 @@
+#!/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/issue
+++ b/common/live-overlay/etc/issue
@@ -1 +1 @@
-../../../common/root-overlay/etc/issue
+../../../base/root-overlay/etc/issue
--- a/common/live-overlay/etc/issue.live
+++ b/common/live-overlay/etc/issue.live
@@ -1 +1 @@
-../../../common/root-overlay/etc/issue.live
+../../../base/root-overlay/etc/issue.live
--- a/common/live-overlay/etc/pam.d
+++ b/common/live-overlay/etc/pam.d
@@ -1 +1 @@
-../../../common/root-overlay/etc/pam.d
+../../../base/root-overlay/etc/pam.d
--- a/common/live-overlay/etc/polkit-1
+++ b/common/live-overlay/etc/polkit-1
@@ -0,0 +1 @@
+../../../base/root-overlay/etc/polkit-1
--- a/common/live-overlay/etc/sddm.conf.d/kde_settings.conf
+++ b/common/live-overlay/etc/sddm.conf.d/kde_settings.conf
@@ -1,17 +0,0 @@
-[Autologin]
-Relogin=false
-Session=plasmax11.desktop
-User=artix
-
-[General]
-HaltCommand=/usr/bin/loginctl poweroff
-RebootCommand=/usr/bin/loginctl reboot
-
-[Theme]
-Current=breeze
-CursorTheme=breeze_cursors
-Font=Noto Sans,10,-1,0,50,0,0,0,0,0
-
-[Users]
-MaximumUid=60000
-MinimumUid=1000
--- a/common/live-overlay/etc/skel/.config/autostart/make-installer-executable.desktop
+++ b/common/live-overlay/etc/skel/.config/autostart/make-installer-executable.desktop
@@ -0,0 +1,7 @@
+[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/Desktop/calamares.desktop
+++ b/common/live-overlay/etc/skel/Desktop/calamares.desktop
@@ -0,0 +1,203 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Install System
+GenericName=System Installer
+Keywords=calamares;system;installer;
+TryExec=calamares
+Exec=pkexec /usr/bin/calamares
+Comment=Calamares — System Installer
+Icon=calamares
+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/etc/sudoers.d
+++ b/common/live-overlay/etc/sudoers.d
@@ -1 +1 @@
-../../../common/root-overlay/etc/sudoers.d
+../../../base/root-overlay/etc/sudoers.d
--- a/common/live-overlay/etc/syslog-ng/syslog-ng.conf
+++ b/common/live-overlay/etc/syslog-ng/syslog-ng.conf
@@ -1,276 +0,0 @@
-#############################################################################
-# Default syslog-ng.conf file which collects all local logs into a
-# single file called /var/log/messages.
-#
-
-@version: 4.8
-@include "scl.conf"
-
-source s_local {
-	system();
-	internal();
-};
-
-source s_network {
-	default-network-drivers(
-		# NOTE: TLS support
-		#
-		# the default-network-drivers() source driver opens the TLS
-		# enabled ports as well, however without an actual key/cert
-		# pair they will not operate and syslog-ng would display a
-		# warning at startup.
-		#
-		#tls(key-file("/path/to/ssl-private-key") cert-file("/path/to/ssl-cert"))
-	);
-};
-
-destination d_local {
-	file("/var/log/messages");
-	file("/var/log/messages-kv.log" template("$ISODATE $HOST $(format-welf --scope all-nv-pairs)\n") frac-digits(3));
-};
-destination d_acpid {
-	file("/var/log/acpid.log");
-};
-destination d_authlog {
-	file("/var/log/auth.log");
-};
-destination d_console {
-	usertty("root");
-};
-destination d_cron {
-	file("/var/log/crond.log");
-};
-destination d_daemon {
-	file("/var/log/daemon.log");
-};
-destination d_debug {
-	file("/var/log/debug.log");
-};
-destination d_errors {
-	file("/var/log/errors.log");
-};
-destination d_everything {
-	file("/var/log/everything.log");
-};
-destination d_iptables {
-	file("/var/log/iptables.log");
-};
-destination d_kernel {
-	file("/var/log/kernel.log");
-};
-destination d_lpr {
-	file("/var/log/lpr.log");
-};
-destination d_mail {
-	file("/var/log/mail.log");
-};
-destination d_messages {
-	file("/var/log/messages.log");
-};
-destination d_news {
-	file("/var/log/news.log");
-};
-destination d_ppp {
-	file("/var/log/ppp.log");
-};
-destination d_syslog {
-	file("/var/log/syslog.log");
-};
-# Log everything to tty12
-destination d_tty12 {
-	file("/dev/tty12");
-};
-destination d_user {
-	file("/var/log/user.log");
-};
-destination d_uucp {
-	file("/var/log/uucp.log");
-};
-
-filter f_acpid {
-	program("acpid");
-};
-filter f_auth {
-	facility(auth);
-};
-filter f_authpriv {
-	facility(auth, authpriv);
-};
-filter f_crit {
-	level(crit);
-};
-filter f_cron {
-	facility(cron);
-};
-filter f_daemon {
-	facility(daemon);
-};
-filter f_debug {
-	not facility(auth, authpriv, news, mail);
-};
-filter f_emergency {
-	level(emerg);
-};
-filter f_err {
-	level(err);
-};
-filter f_everything {
-	level(debug..emerg) and not facility(auth, authpriv);
-};
-filter f_info {
-	level(info);
-};
-filter f_iptables {
-	match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE"));
-};
-filter f_kernel {
-	facility(kern) and not filter(f_iptables);
-};
-filter f_lpr {
-	facility(lpr);
-};
-filter f_mail {
-	facility(mail);
-};
-filter f_messages {
-	level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables);
-};
-filter f_news {
-	facility(news);
-};
-filter f_notice {
-	level(notice);
-};
-filter f_ppp {
-	facility(local2);
-};
-filter f_syslog {
-	program(syslog-ng);
-};
-filter f_user {
-	facility(user);
-};
-filter f_uucp {
-	facility(uucp);
-};
-filter f_warn {
-	level(warn);
-};
-
-log {
-	source(s_local);
-
-	# uncomment this line to open port 514 to receive messages
-	#source(s_network);
-	# destination(d_local);
-};
-log {
-	source(s_local);
-	filter(f_acpid);
-	destination(d_acpid);
-};
-log {
-	source(s_local);
-	filter(f_authpriv);
-	destination(d_authlog);
-};
-log {
-	source(s_local);
-	filter(f_cron);
-	destination(d_cron);
-};
-log {
-	source(s_local);
-	filter(f_daemon);
-	destination(d_daemon);
-};
-log {
-	source(s_local);
-# 	filter(f_debug);
-# 	destination(d_debug);
-};
-log {
-	source(s_local);
-	# filter(f_emergency);
-	# destination(d_console);
-};
-log {
-	source(s_local);
-	filter(f_err);
-	destination(d_errors);
-};
-log {
-	source(s_local);
-	filter(f_everything);
-	destination(d_everything);
-};
-log {
-	source(s_local);
-	# filter(f_iptables);
-	# destination(d_iptables);
-};
-log {
-	source(s_local);
-	filter(f_kernel);
-	destination(d_kernel);
-};
-log {
-	source(s_local);
-	# filter(f_lpr);
-	# destination(d_lpr);
-};
-log {
-	source(s_local);
-	# filter(f_mail);
-	# destination(d_mail);
-};
-log {
-	source(s_local);
-	# filter(f_messages);
-	# destination(d_messages);
-};
-log {
-	source(s_local);
-	# filter(f_news);
-	# destination(d_news);
-};
-log {
-	source(s_local);
-	# filter(f_ppp);
-	# destination(d_ppp);
-};
-log {
-	source(s_local);
-	filter(f_user);
-	destination(d_user);
-};
-log {
-	source(s_local);
-	filter(f_uucp);
-	destination(d_uucp);
-};
-log {
-	source(s_local);
-	# filter(f_syslog);
-	# destination(d_syslog);
-};
-# Log everything to tty12
-log {
-	source(s_local);
-	# destination(d_tty12);
-};
-
-options {
-	chain_hostnames(off);
-	create_dirs(no);
-	dns_cache(no);
-	flush_lines(0);
-	group("log");
-	keep_hostname(yes);
-	log_fifo_size(10000);
-	perm(0640);
-	stats(freq(0));
-	time_reopen(10);
-	use_dns(no);
-	use_fqdn(no);
-};
--- a/common/root-overlay/etc/default/grub
+++ b/common/root-overlay/etc/default/grub
@@ -2,7 +2,7 @@ GRUB_DEFAULT="0"
 GRUB_TIMEOUT="3"
 GRUB_DISTRIBUTOR="Artix"
 GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
-GRUB_CMDLINE_LINUX="net.ifnames=0"
+GRUB_CMDLINE_LINUX=""

 # Preload both GPT and MBR modules so that they are not missed
 GRUB_PRELOAD_MODULES="part_gpt part_msdos"
@@ -21,14 +21,14 @@ GRUB_TERMINAL_INPUT="console"
 # note that you can use only modes which your graphic card supports via VBE
 # you can see them in real GRUB with the command `vbeinfo'
 #GRUB_GFXMODE="1680x1050x8"
-GRUB_GFXMODE="1024x768,800x600"
+GRUB_GFXMODE=auto

 # Uncomment to allow the kernel use the same resolution used by grub
 GRUB_GFXPAYLOAD_LINUX="keep"

 # Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
 # format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
-#GRUB_DISABLE_LINUX_UUID="true"
+GRUB_DISABLE_LINUX_UUID="true"

 # Uncomment to disable generation of recovery mode menu entries
 GRUB_DISABLE_RECOVERY="true"
@@ -48,6 +48,3 @@ 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/common/root-overlay/etc/environment
+++ b/common/root-overlay/etc/environment
@@ -0,0 +1,2 @@
+QT_QPA_PLATFORMTHEME=gtk2
+QT_STYLE_OVERRIDE=gtk
--- a/common/root-overlay/etc/hostname
+++ b/common/root-overlay/etc/hostname
@@ -1 +0,0 @@
-artix-live
--- a/common/root-overlay/etc/hosts
+++ b/common/root-overlay/etc/hosts
@@ -1,9 +1 @@
-# 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
+127.0.0.1	localhost artix
--- a/common/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/common/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
@@ -0,0 +1,12 @@
+[greeter]
+clock-format = %a %d %B %Y, %H:%M:%S
+position = 30%,center
+font-name = Roboto Sans 12
+theme-name = Artix-dark
+icon-theme-name = Adwaita
+xft-antialias = true
+#xft-dpi = 115
+xft-rgba = rgb
+xft-hintstyle = hintfull
+background = /usr/share/backgrounds/GradientGlowBlue.jpg
+default-user-image = /usr/share/icons/artix/logo.svg
--- a/i3/Packages-Live
+++ b/i3/Packages-Live
@@ -0,0 +1,23 @@
+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
--- a/i3/Packages-Root
+++ b/i3/Packages-Root
@@ -0,0 +1,181 @@
+base
+@openrc elogind-openrc
+@runit elogind-runit
+@s6 elogind-s6
+acpi
+b43-fwcutter
+btrfs-progs
+crda
+dhclient
+diffutils
+dmenu
+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
+vim
+which
+efibootmgr
+xfsprogs
+zsh
+
+alsa-firmware
+powertop
+inxi
+
+@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
+
+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
+xcursor-premium
+artix-branding-base
+
+# Basic usability apps
+atril
+light-locker
+lightdm-gtk-greeter
+connman-gtk
+geany
+mpv
+neofetch
+gvfs-mtp
+
+arandr
+# i3
+dmenu
+i3-wm
+i3lock
+i3status
+j4-dmenu-desktop
+
+# LXDE
+artix-gtk-presets
+viewnior
+lxappearance
+#lxappearance-obconf
+lxde-icon-theme
+#lxhotkey
+#lxinput
+#lxlauncher
+#lxmusic
+#lxsession
+lxterminal
+#openbox
+pcmanfm
--- a/i3/live-overlay
+++ b/i3/live-overlay
@@ -0,0 +1 @@
+../common/live-overlay
--- a/i3/profile.conf
+++ b/i3/profile.conf
@@ -0,0 +1,25 @@
+################ 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' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
+
+# default group membership
+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"
--- a/i3/root-overlay/etc/default
+++ b/i3/root-overlay/etc/default
@@ -0,0 +1 @@
+../../../common/root-overlay/etc/default
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`../../../common/root-overlay/etc/environment`
				`@@ -0,0 +1 @@`
				`../../../../common/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf`
				`@@ -1 +0,0 @@`
				`../../../../common/root-overlay/etc/default`