Merge pull request 'upd calamares conf files' (#16) from master into community

Reviewed-on: #16

.build/TODO

@@ -1,28 +1,8 @@
-25-04-21
-DONE Replace firefox with waterfox
-
-25-03-15
-FIXED Plasma login crash with Wayland
-
-24-08-05
-FIXED on root-overlay, needs to go to alpm-hooks - s6 installed won't start lightdm
-FIXED as above - runit lxqt won't start sddm and other services
-FIXED dinit error runnin local.d/pacman-init.start in plasma
-FIXED dinit not running local.d but rc.local
-
-24-07-22
-FIXED dinit starts lightdm/sddm before autologin is implemented
-FIXED lxqt isn't dark
-FIXED cinnamon calamares icon is shit
-
 TO-{DO,FIX} LIST
 
-24-02-05
-DONE Adjust profiles to new artitx-tools / calamares
-Test /etc/environment vars in lxqt and plasma
-
 22-01-29
-FIXED in 2024 - community editions don't use common/etc/hostname
+community editions don't use common/etc/hostname
+
 
 21-12-XX
 FIXED community-gtk: installed system user autologins
@@ -80,4 +60,5 @@ 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/.....)

.build/buildISOs-weekly-cron.sh

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

.build/buildISOs-weekly.sh

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

.build/yamlize.sh

@@ -0,0 +1,69 @@
+#!/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

@@ -1,27 +0,0 @@
-# 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

@@ -1,34 +0,0 @@
-# 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, minimal and community.
+The profiles are designated base, netinstall, minimal plasma.
 
 Base only offers a bare minimum system, installable from the CLI. For advanced 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.
+Minimal plasma profile comes with a basic DE, slightly preconfigured. The graphical installer of choice is Calamares. For knowledgeable users.
 
-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.
+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.
 
-Common settings among all minimal profiles are stored in ''common''.
+Common settings among all profiles are stored in ''common''.

RELEASE-NOTES.md

@@ -1,11 +0,0 @@
-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

base/Packages-Root

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

base/profile.conf

@@ -1,17 +0,0 @@
-################ 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

@@ -0,0 +1,43 @@
+---
+
+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

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

base/root-overlay/etc/fstab

@@ -1,5 +0,0 @@
-#
-# /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

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

base/root-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

base/root-overlay/etc/issue

@@ -1,21 +0,0 @@
-[?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

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

cinnamon/Packages-Live

@@ -1,20 +0,0 @@
-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

@@ -1,30 +0,0 @@
-# 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

@@ -1,17 +0,0 @@
-################ 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

@@ -0,0 +1,94 @@
+---
+
+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/root-overlay/usr
+../../common/gtk/root-overlay/usr

common/Packages-apps

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

common/Packages-base

@@ -1,70 +0,0 @@
-# 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

@@ -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

common/Packages-dinit

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

common/Packages-openrc

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

common/Packages-runit

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

common/Packages-s6

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

common/Packages-xlibre

@@ -1,58 +0,0 @@
-# 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

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

common/Packages-xorg.orig

@@ -1,59 +0,0 @@
-# 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

@@ -0,0 +1,188 @@
+---
+# 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