test-switch to xlibre

This reverts commit bdfc2c85ab.

.build/yamlize.sh

@@ -1,69 +0,0 @@
-#!/bin/bash
-
-yaml_array() {
-    local array
-
-    for entry in "$@"; do
-        array="${array:-}${array:+,} ${entry}"
-    done
-    printf "%s\n" "[${array}]"
-}
-
-read_from_list() {
-    local list="$1"
-    local _space="s| ||g"
-    local _clean='/^$/d'
-    local _com_rm="s|#.*||g"
-    mapfile -t pkgs < <(sed "$_com_rm" "$list" \
-            | sed "$_space" \
-            | sed "$_clean" | sort -u)
-}
-
-profiles=(
-    cinnamon
-    community-gtk
-    community-qt
-    lxde
-    lxqt
-    mate
-    xfce
-    moksha
-)
-
-cd ..
-
-for p in "${profiles[@]}"; do
-
-    if [[ -f "$p"/profile.conf ]]; then
-
-        cp -v common/profile.yaml.template "$p"/profile.yaml
-
-        . "$p"/profile.conf
-
-        sv="$(yaml_array ${SERVICES[@]})"
-        auto="$AUTOLOGIN" \
-        sv="$sv" \
-        yq -P '
-            with(
-            .live-session;
-                .services = env(sv) |
-                .autologin = env(auto))' -i "$p"/profile.yaml
-
-    fi
-
-    if [[ -e "$p"/Packages-Root ]]; then
-        read_from_list "$p"/Packages-Root
-        p="$(yaml_array ${pkgs[@]})" \
-        yq -P '.rootfs.packages = env(p)' -i "$p"/profile.yaml
-
-    fi
-
-    if [[ -e "$p"/Packages-Live ]]; then
-        read_from_list "$p"/Packages-Live
-        p="$(yaml_array ${pkgs[@]})" \
-        yq -P '.livefs.packages = env(p)' -i "$p"/profile.yaml
-    fi
-
-    # git add "$p"
-    # git commit -m "yamilize profiles"
-done

NOTES-community.md

@@ -0,0 +1,27 @@
+# Notes
+
+1. buildiso uses /usr/share/artools/pacman-default.conf for all pacman operations, and copies it into the ISO.
+2. ~/artools-workspace/iso-profiles overrides the system default ones
+3. livefs overlay isn't copied over to installed system
+4. having more than one kernel specified in base/Packages-Root fails (June 2019)
+5. buildiso seems to use both /etc/pacman.conf and /usr/share/artools/pacman-default.conf
+
+
+TODO
+1. DONE: /etc/default/grub append net.ifnames=0
+2. DONE: metalog-openrc instead of syslog-ng-openrc in ~/artools-workspace/iso-profiles/base/Packages-Root, because the latter seems to hang on some systems
+3. DONE: connman instead of nm in base/Packages-Live, because it's lighter and just as efficient
+4. DONE: gparted instead of partitionmanager
+5. DONE: Remove start menu arrow in MATE (~/.config/gtk-3.0/gtk.css)
+6. DONE: remove mate-backgrounds and add artix wallpapers instead
+7. DONE: Encrypted filesystem requires /crypto_keyfile.bin in mkinitcpio.conf/FILES and cryptkey=rootfs:/crypto_keyfile.bin in default/grub/GRUB_CMDLINE_LINUX, or kernel updates break
+8. DONE: For QT ISO: QT_QPA_PLATFORMTHEME must be unset, otherwise icons are invisible in Plasma desktop (nuoveXT2 set gets picked up by the gtk2 settings) and there are dark text on dark background issues in systemsettings5 and some widget settings. QT_STYLE_OVERRIDE=gtk perhaps should be set (e.g. in /etc/environment)
+9. DONE: GTK2 toolbar is a png, needs some darkening.
+
+More TODOs, Nov 2019
+1. DONE: Virtualbox is ugly with every QT_STYLE_OVERRIDE setting except kvantum-dark; use an alias in /etc/bash/ until fixed upstream
+2. DONE: GTK ISO: Use gschema overrides instead of the binary dconf blob <-- almost done, MATE doesn't honour some overrides and we use /etc/dconf instead
+3. DONE: Create a basic branding package to keep the profiles lighter.
+
+More TODOs, Jan 2020
+3. Create an extended/community branding package.

README-community.md

@@ -0,0 +1,34 @@
+# iso-profiles
+The Artix ISO profiles
+
+The *community* GTK and Qt profiles (MATE-LXDE-Cinnamon and KDE/Plasma-LXQt) are mostly symlinks to community. Only a few files/directories differ that accomodate settings specific to the flavour. Those files/directories are ***not*** symlinks.
+
+Compared to *base/minimal* profiles, the community profiles differ in:
+1. /etc/skel is a lot more populous, as it contains DE and application settings <-- WIP, to be replaced by a package
+2. A few scripts in /etc/local.d/ get executed at first boot:
+    *    theme-root creates in /root/.config some symlinks to /etc/skel/.config, for allowing sudo apps follow the overall theme, and gets deleted after execution
+    *    artix-icons converts all start-here.png icons in /usr/share/icons to the Artix logo
+    *    0-remove-openbox-sessions deletes openbox entries in /usr/share/xsessions; openbox sessions are unconfigured and can even hang if chosen. Also gets deleted after execution
+    *    change-machine-id replaces machine-id in /etc and /var/lib/dbus at every boot
+    *    mkinitcpio detects whether the installation is encrypted or not and modifies /etc/default/grub and /etc/mkinitcpio.conf accordingly
+3. The default evowise mirror in mirrorlist-arch is commented out for being very slow
+4. rc.local enables the magic sysrq key and replaces the boring /etc/issue with a neofetch dump
+5. A nice DIR_COLORS is present in /etc.
+6. /etc/environment sets QT_QPA_PLATFORMTHEME=gtk2 and QT_STYLE_OVERRIDE=gtk in the GTK ISO. The other way round in Qt.
+7. /etc/vconsole.conf is symlinked to conf.d/consolefont, which is a merge of both. This allows both OpenRC to set the console font and mkinitcpio run the hook early at boot.
+8. /etc/xdg/kcm-about-distrorc is branded for Artix (<-- Not needed anymore, Plasma uses lsb-release or something). There are a few more config files there, stolen from other distros.
+9. The mkinitcpio.conf in *desktop* profile is preconfigured for rootfs encryption, otherwise system becomes unbootable at first kernel upgrade. If encryption isn't enabled, the script in local.d removes the setting.
+10. There's a custom local.bashrc in bashrc/bashrc.d, with a better PS1 and a few useful aliases and customizations. <-- Have been split into 2 packages (2nd is WIP for community)
+11. default/grub is preconfigured with the artix-grub-theme and rootfs encryption; see no.9.
+12. elogind/logind.conf sets KillUserProcesses=no, which seems to be forgotten to incredibly stupid default 'yes'
+13. In profile.d/ libreoffice is themed with SAL_USE_VCLPLUGIN=gtk
+14. rc.conf sets *rc_parallel* and *rc_crashed_start* to YES
+15. /etc/hosts for live sets *artix* to loopback, some programs hung for a while resolving it
+16. The branding icons in /usr/share/icons/matefaenzadark are set to Artix
+17. 60-ioschedulers.rules in udev/rules.d sets I/O scheduler according to disk type (ssd/rotational) <-- part of our udev now
+18. /root/.config contains settings for Midnight Commander
+19. /usr/lib/firefox/distribution/distribution.ini is branded for Artix
+20. A little tested and possibly incomplete theme for LXDM lies in /usr/share
+21. A tweaked SDDM theme appears in /usr/share/sddm
+
+

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 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 profiles are stored in ''common''.
+Common settings among all minimal profiles are stored in ''common''.

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

TODO

@@ -1,8 +1,28 @@
+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
 
-22-01-29
-community editions don't use common/etc/hostname
+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
@@ -60,5 +80,4 @@ 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/.....)

base/Packages-Root

@@ -0,0 +1,8 @@
+# loads by default common/packages-{base,apps}
+
+mkinitcpio-nfs-utils
+squashfs-tools
+
+artix-grub-live
+
+artix-live-@initsys@

base/profile.conf

@@ -0,0 +1,17 @@
+################ install ################
+
+# start services
+# 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
+
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'metalog' 'connmand')
+
+################# live-session #################
+
+# default value
+# PASSWORD="artix"
+
+# Set to false to disable autologin in the live session
+AUTOLOGIN="false"

base/profile.yaml

@@ -1,43 +0,0 @@
----
-
-live-session:
-  user: artix
-  password: artix
-  autologin: true
-  use-xlibre: false
-  services:
-    - acpid
-    - bluetoothd
-    - cronie
-    - cupsd
-    - syslog-ng
-    - NetworkManager
-  user-services:
-    - dbus
-rootfs:
-  packages:
-    - mkinitcpio-nfs-utils
-    - squashfs-tools
-    - artix-grub-live
-  packages-init:
-    dinit:
-      - dinit-user-spawn
-      - syslog-ng-dinit
-      - networkmanager-dinit
-      - cups-dinit
-      - artix-live-dinit
-    openrc:
-      - syslog-ng-openrc
-      - networkmanager-openrc
-      - cups-openrc
-      - artix-live-openrc
-    runit:
-      - syslog-ng-runit
-      - networkmanager-runit
-      - cups-runit
-      - artix-live-runit
-    s6:
-      - syslog-ng-s6
-      - networkmanager-s6
-      - cups-s6
-      - artix-live-s6

base/root-overlay

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

base/root-overlay/etc/elogind/logind.conf

@@ -13,7 +13,7 @@
 # See logind.conf(5) for details.
 
 [Login]
-#KillUserProcesses=no
+KillUserProcesses=no
 #KillOnlyUsers=
 #KillExcludeUsers=root
 #InhibitDelayMaxSec=5

base/root-overlay/etc/fstab

@@ -0,0 +1,5 @@
+#
+# /etc/fstab: static file system information
+#
+# <file system>        <dir>         <type>    <options>          <dump> <pass>
+/dev/mapper/rootfs /             auto      defaults           0      0

base/root-overlay/etc/hostname

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

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

base/root-overlay/etc/issue

@@ -0,0 +1,21 @@
+[?25l[?7l                   '
+                  'o'
+                 'ooo'
+                'ooxoo'
+               'ooxxxoo'
+              'oookkxxoo'
+             'oiioxkkxxoo'
+            ':;:iiiioxxxoo'
+               `'.;::ioxxoo'
+          '-.      `':;jiooo'
+         'oooio-..     `'i:io'
+        'ooooxxxxoio:,.   `'-;'
+       'ooooxxxxxkkxoooIi:-.  `'
+      'ooooxxxxxkkkkxoiiiiiji'
+     'ooooxxxxxkxxoiiii:'`     .i'
+    'ooooxxxxxoi:::'`       .;ioxo'
+   'ooooxooi::'`         .:iiixkxxo'
+  'ooooi:'`                `'';ioxxo'
+ 'i:'`                          '':io'
+'`                                   `'
+[?25h[?7h

base/root-overlay/etc/issue.live

@@ -0,0 +1,9 @@
+
+[?25h[?7hArtix Live ISO (\l) - \s-\r \m
+
+         # Welcome to Artix #
+
+login for the live environment:
+    user     'artix' or 'root'
+    password 'artix'
+

buildISOs-weekly-cron.sh

@@ -2,7 +2,7 @@
 
 # Automated ISO build script
 # Builds all profiles, all inits and rsyncs to ISO download server
-# 2019-2021, nous
+# 2019-2024, nous
 
 export TERM=xterm-256color
 source /usr/share/makepkg/util/message.sh
@@ -14,6 +14,7 @@ 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
@@ -21,14 +22,14 @@ mkdir -p ${PROFILES}/logs
 cd $WORKSPACE
 if [[ -d $PROFILES ]]; then
     cd $PROFILES
-#    git checkout community
+#    git checkout wip
     git pull
 else
     git clone https://gitea.artixlinux.org/artix/iso-profiles.git
-#    git checkout community
+#    git checkout wip
 fi
 
-cd $PROFILES
+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')
 
@@ -65,7 +66,7 @@ echo -n "REMOVING EXISTING ISOs IN 10 SECONDS!   "; i=9; while [ $i -ne 0 ]; do
 echo
 rm -fr $REPO/* &
 
-cd $PROFILES && git checkout master
+cd $PROFILES
 for profile in ${profiles[@]}; do
     unset COPY_PACMAN_CONF
     [[ $profile =~ 'community' ]] && COPY_PACMAN_CONF='-w'
@@ -76,7 +77,7 @@ for profile in ${profiles[@]}; do
         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
+        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
@@ -110,5 +111,5 @@ done
 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"
+rsync $RSYNCARGS ${REPO}/ nous@download.artixlinux.org:/srv/iso/weekly-iso/ -e "ssh -p $port"

buildISOs-weekly.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # Automated ISO build script
-# Builds select profiles / inits
-# 2019-2021, nous
+# 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
@@ -12,6 +12,7 @@ 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
@@ -19,14 +20,15 @@ mkdir -p ${PROFILES}/logs
 cd $WORKSPACE
 if [[ -d $PROFILES ]]; then
     cd $PROFILES
-#    git checkout community
+#    git checkout wip
     git pull
 else
     git clone https://gitea.artixlinux.org/artix/iso-profiles.git
+#    git checkout wip
 fi
 
-cd $PROFILES
-all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|logs|lowmem|anon|gnome|i3|community$" | sort))
+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() {
@@ -86,19 +88,19 @@ echo "		profiles 	${GREEN}${profiles[@]}${ALL_OFF}"
 echo "		inits		${CYAN}${inits[@]}${ALL_OFF}"
 
 
-cd $PROFILES && git checkout master
+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
+        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 "$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

cinnamon/Packages-Live

@@ -0,0 +1,20 @@
+mkinitcpio-nfs-utils
+squashfs-tools
+nbd
+
+calamares-extensions
+gparted
+
+artix-grub-live
+#artix-grub-theme
+
+virtualbox-guest-utils
+
+broadcom-wl
+
+intel-ucode
+amd-ucode
+artix-docs
+hexchat
+
+artix-live-@initsys@

cinnamon/Packages-Root

@@ -0,0 +1,30 @@
+# loads by default common/packages-{base,apps,xorg}
+
+# 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
+
+lightdm-gtk-greeter
+#light-locker
+
+# GTK apps
+epiphany
+leafpad
+atril
+pavucontrol

cinnamon/profile.conf

@@ -0,0 +1,17 @@
+################ 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
+
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'NetworkManager' 'lightdm')
+
+################# live-session #################
+
+# unset defaults to given value
+# PASSWORD="artix"
+
+# Set to false to disable autologin in the live session
+AUTOLOGIN="true"

cinnamon/profile.yaml

@@ -1,94 +0,0 @@
----
-
-live-session:
-  user: artix
-  password: artix
-  autologin: true
-  use-xlibre: false
-  services:
-    - acpid
-    - bluetoothd
-    - cronie
-    - cupsd
-    - metalog
-    - NetworkManager
-    - lightdm
-  user-services:
-    - dbus
-    - pipewire
-    - pipewire-pulse
-    - wireplumber
-rootfs:
-  packages:
-    - atril
-    - blueberry
-    - cinnamon
-    - eog
-    - epiphany
-    - file-roller
-    - gnome-calculator
-    - gnome-disk-utility
-    - gnome-keyring
-    - gnome-online-accounts
-    - gnome-screenshot
-    - gnome-system-monitor
-    - gnome-terminal
-    - leafpad
-    - lightdm-gtk-greeter
-    - nemo-fileroller
-    - nemo-preview
-    - nemo-seahorse
-    - nemo-share
-    - pavucontrol
-    - xcursor-vanilla-dmz
-  packages-init:
-    dinit:
-      - pipewire-dinit
-      - pipewire-pulse-dinit
-      - wireplumber-dinit
-      - dinit-user-spawn
-      - lightdm-dinit
-      - metalog-dinit
-      - networkmanager-dinit
-      - cups-dinit
-    openrc:
-      - pipewire-openrc
-      - pipewire-pulse-openrc
-      - wireplumber-openrc
-      - lightdm-openrc
-      - metalog-openrc
-      - networkmanager-openrc
-      - cups-openrc
-    runit:
-      - lightdm-runit
-      - metalog-runit
-      - networkmanager-runit
-      - cups-runit
-    s6:
-      - lightdm-s6
-      - metalog-s6
-      - networkmanager-s6
-      - cups-s6
-livefs:
-  packages:
-    - amd-ucode
-    - artix-docs
-    - artix-grub-live
-    - broadcom-wl
-    - calamares-extensions
-    - gparted
-    - hexchat
-    - intel-ucode
-    - mkinitcpio-nfs-utils
-    - nbd
-    - squashfs-tools
-    - virtualbox-guest-utils
-  packages-init:
-    dinit:
-      - artix-live-dinit
-    openrc:
-      - artix-live-openrc
-    runit:
-      - artix-live-runit
-    s6:
-      - artix-live-s6

cinnamon/root-overlay/usr

@@ -1 +1 @@
-../../common/gtk/root-overlay/usr
+../../common/root-overlay/usr

common/Packages-apps

@@ -0,0 +1,3 @@
+powertop
+inxi
+fastfetch

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

common/Packages-boot

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

common/Packages-dinit

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

common/Packages-openrc

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

common/Packages-runit

@@ -0,0 +1,2 @@
+blocaled
+rsm

common/Packages-s6

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

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

common/Packages-xorg

@@ -0,0 +1 @@
+Packages-xlibre

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

common/common.yaml

@@ -1,188 +0,0 @@
----
-# Packages common in all profiles
-
-packages-base:
-  - base
-  - intel-ucode
-  - amd-ucode
-  - acpi
-  - alsa-firmware
-  - b43-fwcutter
-  - btrfs-progs
-  - crda
-  - dhclient
-  - diffutils
-  - dmraid
-  - dosfstools
-  - efibootmgr
-  - e2fsprogs
-  - ecryptfs-utils
-  - exfat-utils
-  - f2fs-tools
-  - grub
-  - artix-grub-theme
-  - inetutils
-  - iptables
-  - jfsutils
-  - linux
-  - linux-firmware
-  - linux-headers
-  - lsb-release
-  - logrotate
-  - lsb-release
-  - man-db
-  - man-pages
-  - memtest86+
-  - mkinitcpio
-  - mkinitcpio-openswap
-  - modemmanager
-  - nano
-  - nbd
-  - net-tools
-  - ntfs-3g
-  - os-prober
-  - s-nail
-  - sudo
-  - sysfsutils
-  - texinfo
-  - usbutils
-  - vi
-  - which
-  - xfsprogs
-  - zsh
-packages-apps:
-  - powertop
-  - inxi
-packages-xorg:
-  - xorg-server
-  - xf86-input-vmmouse
-  - xf86-input-wacom
-  - xf86-video-amdgpu
-  - xf86-video-ati
-  - xf86-video-dummy
-  - xf86-video-fbdev
-  - xf86-video-intel
-  - xf86-video-nouveau
-  - xf86-video-sisusb
-  - xf86-video-qxl
-  - xf86-video-vesa
-  - xf86-video-voodoo
-packages-xlibre:
-  - xlibre-xserver
-  - xlibre-xf86-input-vmmouse
-  - xlibre-xf86-input-wacom
-  - 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-qxl
-  - xlibre-xf86-video-vesa
-  - xlibre-xf86-video-voodoo
-packages-misc:
-  - xorg-xhost
-  - xorg-xinit
-  - xdg-user-dirs
-  - xdg-utils
-  - wayland
-  - xorg-xwayland
-  - terminus-font
-  - ttf-droid
-  - ttf-inconsolata
-  - ttf-liberation
-  - ttf-roboto
-  - ttf-roboto-mono
-  - ttf-droid
-  # - 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
-packages-init:
-  dinit:
-    - blocaled
-    - elogind-dinit
-    - dbus-dinit
-    - acpid-dinit
-    - avahi-dinit
-    - bluez-dinit
-    - cronie-dinit
-    - cryptsetup-dinit
-    - dhcpcd-dinit
-    - haveged-dinit
-    - lvm2-dinit
-    - mdadm-dinit
-    - nfs-utils-dinit
-    - ntp-dinit
-    - openssh-dinit
-    - power-profiles-daemon-dinit
-    - rsync-dinit
-    - wpa_supplicant-dinit
-  openrc:
-    - openrc-settingsd
-    - elogind-openrc
-    - dbus-openrc
-    - acpid-openrc
-    - avahi-openrc
-    - bluez-openrc
-    - cronie-openrc
-    - cryptsetup-openrc
-    - dhcpcd-openrc
-    - haveged-openrc
-    - lvm2-openrc
-    - mdadm-openrc
-    - nfs-utils-openrc
-    - ntp-openrc
-    - openssh-openrc
-    - power-profiles-daemon-openrc
-    - rsync-openrc
-    - wpa_supplicant-openrc
-  runit:
-    - blocaled
-    - rsm
-    - elogind-runit
-    - dbus-runit
-    - acpid-runit
-    - avahi-runit
-    - bluez-runit
-    - cronie-runit
-    - cryptsetup-runit
-    - dhcpcd-runit
-    - haveged-runit
-    - lvm2-runit
-    - mdadm-runit
-    - nfs-utils-runit
-    - ntp-runit
-    - openssh-runit
-    - power-profiles-daemon-runit
-    - rsync-runit
-    - wpa_supplicant-runit
-  s6:
-    - blocaled
-    - elogind-s6
-    - dbus-s6
-    - acpid-s6
-    - avahi-s6
-    - bluez-s6
-    - cronie-s6
-    - cryptsetup-s6
-    - dhcpcd-s6
-    - haveged-s6
-    - lvm2-s6
-    - mdadm-s6
-    - nfs-utils-s6
-    - ntp-s6
-    - openssh-s6
-    - power-profiles-daemon-s6
-    - rsync-s6
-    - wpa_supplicant-s6
-packages-boot:
-  - iso-initcpio

common/conf/calamares-offline/modules/bootloader.conf

@@ -13,9 +13,3 @@ grubProbe: "grub-probe"
 efiBootMgr: "efibootmgr"
 
 installEFIFallback: true
-
-efiBootloaderId: "Artix"
-
-# installHybridGRUB: false
-
-# efiBootLoaderVar: "packagechooser_bootloader"

common/conf/calamares-offline/modules/grubcfg.conf

@@ -1,51 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Create, overwrite or update /etc/default/grub in the target system.
-#
-# Write lines to /etc/default/grub (in the target system) based
-# on calculated values and the values set in the *defaults* key
-# in this configuration file.
-#
-# Calculated values are:
-#   - GRUB_DISTRIBUTOR,   branding module, *bootloaderEntryName* (this
-#     string is sanitized, and see also setting *keep_distributor*)
-#   - GRUB_ENABLE_CRYPTODISK, based on the presence of filesystems
-#     that use LUKS
-#   - GRUB_CMDLINE_LINUX_DEFAULT, adding LUKS setup and plymouth
-#     support to the kernel.
-
----
-# If set to true, always creates /etc/default/grub from scratch even if the file
-# already existed. If set to false, edits the existing file instead.
-overwrite: false
-
-# If set to true, prefer to write files in /etc/default/grub.d/
-# rather than the single file /etc/default/grub. If this is set,
-# Calamares will write /etc/default/grub.d/00Calamares instead.
-prefer_grub_d: false
-
-# If set to true, an **existing** setting for GRUB_DISTRIBUTOR is
-# kept, not updated to the *bootloaderEntryName* from the branding file.
-# Use this if the GRUB_DISTRIBUTOR setting in the file is "smart" in
-# some way (e.g. uses shell-command substitution).
-keep_distributor: false
-
-# The default kernel params that should always be applied.
-# This is an array of strings. If it is unset, the default is
-# `["quiet"]`. To avoid the default, explicitly set this key
-# to an empty list, `[]`.
-kernel_params: [ "quiet" ]
-
-# Default entries to write to /etc/default/grub if it does not exist yet or if
-# we are overwriting it.
-#
-defaults:
-    GRUB_TIMEOUT: 5
-    GRUB_DEFAULT: "saved"
-    GRUB_DISABLE_SUBMENU: true
-    GRUB_TERMINAL_OUTPUT: "console"
-    GRUB_DISABLE_RECOVERY: true
-
-# Set to true to force defaults to be used even when not overwriting
-always_use_defaults: false

common/conf/calamares-offline/modules/mount.conf

@@ -1,131 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Mount filesystems in the target (generally, before treating the
-# target as a usable chroot / "live" system). Filesystems are
-# automatically mounted from the partitioning module. Filesystems
-# listed here are **extra**. The filesystems listed in *extraMounts*
-# are mounted in all target systems.
----
-# Extra filesystems to mount. The key's value is a list of entries; each
-# entry has five keys:
-#   - device    The device node to mount
-#   - fs (optional) The filesystem type to use
-#   - mountPoint Where to mount the filesystem
-#   - options (optional) An array of options to pass to mount
-#   - efi (optional) A boolean that when true is only mounted for UEFI installs
-#
-# The device is not mounted if the mountPoint is unset or if the fs is
-# set to unformatted.
-#
-extraMounts:
-    - device: proc
-      fs: proc
-      mountPoint: /proc
-    - device: sys
-      fs: sysfs
-      mountPoint: /sys
-    - device: /dev
-      mountPoint: /dev
-      options: [ bind ]
-    - device: tmpfs
-      fs: tmpfs
-      mountPoint: /run
-    - device: /run/udev
-      mountPoint: /run/udev
-      options: [ bind ]
-    - device: efivarfs
-      fs: efivarfs
-      mountPoint: /sys/firmware/efi/efivars
-      efi: true
-
-# Btrfs subvolumes to create if root filesystem is on btrfs volume.
-# If *mountpoint* is mounted already to another partition, it is ignored.
-# Separate subvolume for swapfile is handled separately and automatically.
-#
-# It is possible to prevent subvolume creation -- this is likely only relevant
-# for the root (/) subvolume -- by giving an empty string as a subvolume
-# name. In this case no subvolume will be created.
-#
-btrfsSubvolumes:
-    - mountPoint: /
-      subvolume: /@
-      # As an alternative:
-      #
-      # subvolume: ""
-    - mountPoint: /home
-      subvolume: /@home
-    - mountPoint: /root
-      subvolume: /@root
-    - mountPoint: /srv
-      subvolume: /@srv
-    - mountPoint: /var/cache
-      subvolume: /@cache
-    - mountPoint: /var/log
-      subvolume: /@log
-    - mountPoint: /var/tmp
-      subvolume: /@tmp
-
-# The name of the btrfs subvolume holding the swapfile.  This only used when
-# a swapfile is selected and the root filesystem is btrfs
-#
-btrfsSwapSubvol: /@swap
-
-# The mount options used to mount each filesystem.
-#
-# filesystem contains the name of the filesystem or on of three special
-# values, "default", efi" and "btrfs_swap".  The logic is applied in this manner:
-#   - If the partition is the EFI partition, the "efi" entry will be used
-#   - If the fs is btrfs and the subvolume is for the swapfile,
-#     the "btrfs_swap" entry is used
-#   - If the  filesystem is an exact match for filesystem, that entry is used
-#   - If no match is found in the above, the default entry is used
-#   - If there is no match and no default entry, "defaults" is used
-#   - If the mountOptions key is not present, "defaults" is used
-#
-# Each filesystem entry contains 3 keys, all of which are optional
-#   options - An array of mount options that is used on all disk types
-#   ssdOptions - An array of mount options combined with options for ssds
-#   hddOptions - An array of mount options combined with options for hdds
-# If combining these options results in an empty array, "defaults" is used
-#
-# Example 1
-# In this example, there are specific options for ext4 and btrfs filesystems,
-# the EFI partition and the subvolume holding the btrfs swapfile.  All other
-# filesystems use the default entry.  For the btrfs filesystem, there are
-# additional options specific to hdds and ssds
-#
-mountOptions:
-   - filesystem: default
-     options: [ defaults ]
-   - filesystem: efi
-     options: [ defaults, umask=0077 ]
-   - filesystem: ext4
-     options: [ defaults ]
-   - filesystem: btrfs
-     options: [ defaults, noatime, compress=zstd:1 ]
-     ssdOptions: [ discard=async ]
-     hddOptions: [ autodefrag ]
-   - filesystem: btrfs_swap
-     options: [ defaults, noatime ]
-#
-# Example 2
-# In this example there is a single default used by all filesystems
-#
-# mountOptions:
-#    - filesystem: default
-#      options: [ defaults ]
-#
-# mountOptions:
-#     - filesystem: default
-#       options: [ defaults ]
-#     - filesystem: efi
-#       options: [ defaults, umask=0077 ]
-#     - filesystem: btrfs
-#       options: [ defaults, compress=zstd:1 ]
-#     - filesystem: btrfs_swap
-#       options: [ defaults, noatime ]
-
-
-
-

common/conf/calamares-offline/modules/partition.conf

@@ -1,7 +1,7 @@
 efi:
     mountPoint:         "/boot/efi"
-    recommendedSize:    512MiB
-    minimumSize:        256MiB
+    recommendedSize:    300MiB
+    minimumSize:        32MiB
     label:              "EFI"
 
 userSwapChoices:

common/conf/calamares-offline/modules/postcfg.conf

@@ -1,13 +1,3 @@
 ---
-# set at iso build time
-initsys: none
-
-user-services:
-  - name: dbus
-    action: enable
-  - name: pipewire
-    action: enable
-  - name: pipewire-pulse
-    action: enable
-  - name: wireplumber
-    action: enable
+keyrings:
+  - artix

common/conf/calamares-offline/modules/unpackfs.conf

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

common/conf/calamares-offline/modules/welcome.conf

@@ -6,12 +6,12 @@ showReleaseNotesUrl:    true
 requirements:
     requiredStorage:    5.5
     requiredRam:        1.0
-    internetCheckUrl:   https://www.artixlinux.org
+    internetCheckUrl:   https://artixlinux.org
     check:
       - storage
       - ram
       - power
-      - internet
+#      - internet
       - root
     required:
       - storage

common/conf/calamares-online/modules/bootloader.conf

@@ -1,21 +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
-
-efiBootloaderId: "Artix"
-
-# installHybridGRUB: false
-
-# efiBootLoaderVar: "packagechooser_bootloader"

common/conf/calamares-online/modules/bootloader.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/bootloader.conf

common/conf/calamares-online/modules/displaymanager.conf

@@ -1,10 +0,0 @@
----
-displaymanagers:
-  - lightdm
-  - gdm
-  - mdm
-  - sddm
-  - lxdm
-  - slim
-
-basicSetup: false

common/conf/calamares-online/modules/displaymanager.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/displaymanager.conf

common/conf/calamares-online/modules/finished.conf

@@ -1,6 +0,0 @@
----
-restartNowMode: user-unchecked
-
-restartNowCommand: "loginctl reboot"
-
-notifyOnFinished: false

common/conf/calamares-online/modules/finished.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/finished.conf

common/conf/calamares-online/modules/initcpio.conf

@@ -1,4 +0,0 @@
----
-kernel: all
-
-be_unsafe: false

common/conf/calamares-online/modules/initcpio.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/initcpio.conf

common/conf/calamares-online/modules/locale.conf

@@ -1,7 +0,0 @@
----
-localeGenPath: /etc/locale.gen
-
-geoip:
-    style:    "json"
-    url:      "https://geoip.kde.org/v1/calamares"
-    selector: ""

common/conf/calamares-online/modules/locale.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/locale.conf

common/conf/calamares-online/modules/machineid.conf

@@ -1,5 +0,0 @@
----
-systemd: false
-dbus: true
-dbus-symlink: true
-entropy-copy: false

common/conf/calamares-online/modules/machineid.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/machineid.conf

common/conf/calamares-online/modules/mount.conf

@@ -1,131 +0,0 @@
-# SPDX-FileCopyrightText: no
-# SPDX-License-Identifier: CC0-1.0
-#
-# Mount filesystems in the target (generally, before treating the
-# target as a usable chroot / "live" system). Filesystems are
-# automatically mounted from the partitioning module. Filesystems
-# listed here are **extra**. The filesystems listed in *extraMounts*
-# are mounted in all target systems.
----
-# Extra filesystems to mount. The key's value is a list of entries; each
-# entry has five keys:
-#   - device    The device node to mount
-#   - fs (optional) The filesystem type to use
-#   - mountPoint Where to mount the filesystem
-#   - options (optional) An array of options to pass to mount
-#   - efi (optional) A boolean that when true is only mounted for UEFI installs
-#
-# The device is not mounted if the mountPoint is unset or if the fs is
-# set to unformatted.
-#
-extraMounts:
-    - device: proc
-      fs: proc
-      mountPoint: /proc
-    - device: sys
-      fs: sysfs
-      mountPoint: /sys
-    - device: /dev
-      mountPoint: /dev
-      options: [ bind ]
-    - device: tmpfs
-      fs: tmpfs
-      mountPoint: /run
-    - device: /run/udev
-      mountPoint: /run/udev
-      options: [ bind ]
-    - device: efivarfs
-      fs: efivarfs
-      mountPoint: /sys/firmware/efi/efivars
-      efi: true
-
-# Btrfs subvolumes to create if root filesystem is on btrfs volume.
-# If *mountpoint* is mounted already to another partition, it is ignored.
-# Separate subvolume for swapfile is handled separately and automatically.
-#
-# It is possible to prevent subvolume creation -- this is likely only relevant
-# for the root (/) subvolume -- by giving an empty string as a subvolume
-# name. In this case no subvolume will be created.
-#
-btrfsSubvolumes:
-    - mountPoint: /
-      subvolume: /@
-      # As an alternative:
-      #
-      # subvolume: ""
-    - mountPoint: /home
-      subvolume: /@home
-    - mountPoint: /root
-      subvolume: /@root
-    - mountPoint: /srv
-      subvolume: /@srv
-    - mountPoint: /var/cache
-      subvolume: /@cache
-    - mountPoint: /var/log
-      subvolume: /@log
-    - mountPoint: /var/tmp
-      subvolume: /@tmp
-
-# The name of the btrfs subvolume holding the swapfile.  This only used when
-# a swapfile is selected and the root filesystem is btrfs
-#
-btrfsSwapSubvol: /@swap
-
-# The mount options used to mount each filesystem.
-#
-# filesystem contains the name of the filesystem or on of three special
-# values, "default", efi" and "btrfs_swap".  The logic is applied in this manner:
-#   - If the partition is the EFI partition, the "efi" entry will be used
-#   - If the fs is btrfs and the subvolume is for the swapfile,
-#     the "btrfs_swap" entry is used
-#   - If the  filesystem is an exact match for filesystem, that entry is used
-#   - If no match is found in the above, the default entry is used
-#   - If there is no match and no default entry, "defaults" is used
-#   - If the mountOptions key is not present, "defaults" is used
-#
-# Each filesystem entry contains 3 keys, all of which are optional
-#   options - An array of mount options that is used on all disk types
-#   ssdOptions - An array of mount options combined with options for ssds
-#   hddOptions - An array of mount options combined with options for hdds
-# If combining these options results in an empty array, "defaults" is used
-#
-# Example 1
-# In this example, there are specific options for ext4 and btrfs filesystems,
-# the EFI partition and the subvolume holding the btrfs swapfile.  All other
-# filesystems use the default entry.  For the btrfs filesystem, there are
-# additional options specific to hdds and ssds
-#
-mountOptions:
-   - filesystem: default
-     options: [ defaults ]
-   - filesystem: efi
-     options: [ defaults, umask=0077 ]
-   - filesystem: ext4
-     options: [ defaults ]
-   - filesystem: btrfs
-     options: [ defaults, noatime, compress=zstd:1 ]
-     ssdOptions: [ discard=async ]
-     hddOptions: [ autodefrag ]
-   - filesystem: btrfs_swap
-     options: [ defaults, noatime ]
-#
-# Example 2
-# In this example there is a single default used by all filesystems
-#
-# mountOptions:
-#    - filesystem: default
-#      options: [ defaults ]
-#
-# mountOptions:
-#     - filesystem: default
-#       options: [ defaults ]
-#     - filesystem: efi
-#       options: [ defaults, umask=0077 ]
-#     - filesystem: btrfs
-#       options: [ defaults, compress=zstd:1 ]
-#     - filesystem: btrfs_swap
-#       options: [ defaults, noatime ]
-
-
-
-

common/conf/calamares-online/modules/netinstall.yaml

@@ -8,7 +8,6 @@
     - linux
     - linux-headers
     - grub
-    - efibootmgr
     - sudo
 
 - name: "Kernel"
@@ -18,6 +17,7 @@
     - acpi_call
     - bbswitch
     - broadcom-wl
+    - r8168
     - tp_smapi
     - linux-lts
     - linux-lts-headers
@@ -38,8 +38,6 @@
     - linux-firmware-whence
     - sof-firmware
     - alsa-firmware
-    - intel-ucode
-    - amd-ucode
 
 - name: "Utilities"
   description: "System Utilities"
@@ -49,20 +47,231 @@
     - 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-icons
+    - artix-wallpapers
+    - artix-breeze-sddm
+    - artix-plasma-splash
     - artix-netinstall-presets
-    - artix-grub-theme
+
+- 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

common/conf/calamares-online/modules/packagechooser.conf

@@ -34,6 +34,10 @@ items:
                 - dhcpcd-openrc
                 - lvm2-openrc
                 - mdadm-openrc
+            - name: "Login"
+              description: "Displaymanagers"
+              packages:
+                - sddm-openrc
             - name: "Cron"
               description: "Cron init"
               selected: true
@@ -105,6 +109,10 @@ items:
                 - dhcpcd-dinit
                 - lvm2-dinit
                 - mdadm-dinit
+            - name: "Login"
+              description: "Displaymanagers"
+              packages:
+                - sddm-dinit
             - name: "Cron"
               description: "Cron init"
               selected: true
@@ -176,6 +184,10 @@ items:
                 - lvm2-s6
                 - mdadm-s6
                 - s6-contrib
+            - name: "Login"
+              description: "Displaymanagers"
+              packages:
+                - sddm-s6
             - name: "Cron"
               description: "Cron init"
               selected: true
@@ -247,6 +259,10 @@ items:
                 - lvm2-runit
                 - mdadm-runit
                 - rsm
+            - name: "Login"
+              description: "Displaymanagers"
+              packages:
+                - sddm-runit
             - name: "Cron"
               description: "Cron init"
               selected: true

common/conf/calamares-online/modules/partition.conf

@@ -1,32 +0,0 @@
-efi:
-    mountPoint:         "/boot/efi"
-    recommendedSize:    512MiB
-    minimumSize:        256MiB
-    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"]

common/conf/calamares-online/modules/partition.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/partition.conf

common/conf/calamares-online/modules/postcfg.conf

@@ -1,13 +0,0 @@
----
-# set at iso build time
-initsys: none
-
-user-services:
-  - name: dbus
-    action: enable
-  - name: pipewire
-    action: enable
-  - name: pipewire-pulse
-    action: enable
-  - name: wireplumber
-    action: enable

common/conf/calamares-online/modules/services-artix.conf

@@ -1,4 +0,0 @@
----
-command: artix-service
-
-services: []

common/conf/calamares-online/modules/services-artix.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/services-artix.conf

common/conf/calamares-online/modules/umount.conf

@@ -1,2 +0,0 @@
----
-emergency: false

common/conf/calamares-online/modules/umount.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/umount.conf

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 ]

common/conf/calamares-online/modules/users.conf

@@ -0,0 +1 @@
+../../calamares-offline/modules/users.conf

common/conf/calamares-online/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

common/gtk/root-overlay/etc/default

@@ -1 +0,0 @@
-../../../../base/root-overlay/etc/default

common/gtk/root-overlay/etc/hosts

@@ -1,2 +0,0 @@
-127.0.0.1	localhost
-::1		localhost

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

@@ -1,12 +0,0 @@
-[greeter]
-clock-format = %a %d %B %Y, %H:%M:%S
-position = 30%,center
-font-name = Roboto Regular 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

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

common/live-overlay/etc/fstab

@@ -1 +1 @@
-../../../common/root-overlay/etc/fstab
+../../../base/root-overlay/etc/fstab

common/live-overlay/etc/hostname

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

common/live-overlay/etc/hostname

@@ -0,0 +1 @@
+../../../base/root-overlay/etc/hostname

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

common/live-overlay/etc/hosts

@@ -0,0 +1 @@
+../../../base/root-overlay/etc/hosts

common/live-overlay/etc/issue

@@ -1 +1 @@
-../../../common/root-overlay/etc/issue
+../../../base/root-overlay/etc/issue

common/live-overlay/etc/issue.live

@@ -1 +1 @@
-../../../common/root-overlay/etc/issue.live
+../../../base/root-overlay/etc/issue.live

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

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

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.

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

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

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 &

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

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

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

common/live-overlay/etc/pam.d

@@ -1 +1 @@
-../../../common/root-overlay/etc/pam.d
+../../../base/root-overlay/etc/pam.d

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

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

common/live-overlay/etc/sudoers.d

@@ -1 +1 @@
-../../../common/root-overlay/etc/sudoers.d
+../../../base/root-overlay/etc/sudoers.d

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);
-};