remove [community]

This reverts commit bdfc2c85ab.

TODO

@@ -1,8 +1,22 @@
+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 +74,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/profile.conf

@@ -1,12 +1,12 @@
 ################ install ################
 
 # start services
-# bluetoothd, cupsd, DM are added to the pkglist dynamicly
+# 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' 'cupsd' 'metalog' 'connmand')
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'metalog' 'connmand')
 
 ################# live-session #################
 

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/hosts

@@ -2,8 +2,8 @@
 # See hosts(5) for details.
 
 127.0.0.1	localhost.localdomain artix-live localhost
-::1	localhost
+::1		localhost
 
-#::1	localhost ip6-localhost ip6-loopback
-#ff02::1 ip6-allnodes
-#ff02::2 ip6-allrouters
+#::1		localhost ip6-localhost ip6-loopback
+#ff02::1	ip6-allnodes
+#ff02::2	ip6-allrouters

base/root-overlay/etc/issue

@@ -18,3 +18,4 @@
   'ooooi:'`                `'';ioxxo'
  'i:'`                          '':io'
 '`                                   `'
+[?25h[?7h

base/root-overlay/etc/issue.live

@@ -4,6 +4,6 @@
          # Welcome to Artix #
 
 login for the live environment:
-    user     'artix'
+    user     'artix' or 'root'
     password 'artix'
 

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,15 @@ mkdir -p ${PROFILES}/logs
 cd $WORKSPACE
 if [[ -d $PROFILES ]]; then
     cd $PROFILES
+#    git checkout wip
     git pull
 else
     git clone https://gitea.artixlinux.org/artix/iso-profiles.git
+#    git checkout wip
 fi
 
-cd $PROFILES
-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' 'suite66' 'dinit')
+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() {
@@ -64,8 +66,10 @@ 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'
     for init in ${inits[@]}; do
         logfile=$PROFILES/logs/buildiso-$DATE
         logfile_debug=$logfile-$profile-$init
@@ -73,11 +77,11 @@ 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
-        [[ $init == 'openrc' ]] && cp -f ${PROFILES}/rc.conf ${PROFILES}/$profile/root-overlay/etc/
+        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 -R universe 2>&1 >> ${logfile_debug}.log
+        nice -n 20 buildiso${branch} -p $profile -i $init $COPY_PACMAN_CONF 2>&1 >> ${logfile_debug}.log
         res=$?
         stamp=$(timestamp)
         if [ $res == 0 ]; then
@@ -86,7 +90,7 @@ for profile in ${profiles[@]}; do
             echo "$stamp == ${RED}Failed building   ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
             echo "$stamp == ${RED}Retrying once     ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
             echo "$stamp == Re-building       ${_branch} ${profile}-${init}" >> $logfile.log
-            nice -n 20 buildiso${branch} -p $profile -i $init -R universe 2>&1 >> ${logfile_debug}.log
+            nice -n 20 buildiso${branch} -p $profile -i $init $COPY_PACMAN_CONF 2>&1 >> ${logfile_debug}.log
             res=$?
             stamp=$(timestamp)
             if [ $res == 0 ]; then
@@ -107,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 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))
-all_inits=('openrc' 'runit' 's6' 'suite66' 'dinit')
+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,20 +88,22 @@ 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 -R universe 2>&1 >> ${logfile_debug}.log
+        nice -n 20 buildiso${branch} -p $profile -i $init $COPY_PACMAN_CONF 2>&1 >> ${logfile_debug}.log
         res=$?
         stamp=$(timestamp)
         if [ $res == 0 ]; then
@@ -108,7 +112,7 @@ for profile in ${profiles[@]}; do
             echo "$stamp == ${RED}Failed building   ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
             echo "$stamp == ${RED}Retrying once     ${_branch} ${profile}-${init}${ALL_OFF}" >> $logfile.log
             echo "$stamp == Re-building       ${_branch} ${profile}-${init}" >> $logfile.log
-            nice -n 20 buildiso${branch} -p $profile -i $init -R universe 2>&1 >> ${logfile_debug}.log
+            nice -n 20 buildiso${branch} -p $profile -i $init $COPY_PACMAN_CONF 2>&1 >> ${logfile_debug}.log
             res=$?
             stamp=$(timestamp)
             if [ $res == 0 ]; then

buildISOs.sh

@@ -13,7 +13,7 @@ CWD=`pwd`
 
 cd $PROFILES
 all_profiles=($(find -maxdepth 1 -type d | sed 's|.*/||'| egrep -v "\.|common|linexa|git|community$" | sort))
-all_inits=('openrc' 'runit' 's6' 'suite66')
+all_inits=('openrc' 'runit' 's6' 'dinit')
 
 usage() {
     echo
@@ -88,7 +88,7 @@ for profile in ${profiles[@]}; do
         [[ $init == 'openrc' ]] && cp ${WORKSPACE}/rc.conf ${PROFILES}/$profile/root-overlay/etc/
         stamp=$(timestamp)
         echo "$stamp == Begin building    ${_branch} $profile ISO with $init" >> $CWD/ISO_build.log
-        nice -n 20 buildiso${branch} -p $profile -i $init -R universe
+        nice -n 20 buildiso${branch} -p $profile -i $init
         res=$?
         rm -f ${PROFILES}/$profile/root-overlay/etc/rc.conf
         stamp=$(timestamp)

cinnamon/Packages-Live

@@ -6,7 +6,7 @@ calamares-extensions
 gparted
 
 artix-grub-live
-artix-grub-theme
+#artix-grub-theme
 
 virtualbox-guest-utils
 

cinnamon/Packages-Root

@@ -21,28 +21,10 @@ nemo-share
 xcursor-vanilla-dmz
 
 lightdm-gtk-greeter
-light-locker
+#light-locker
 
-# GTK
+# GTK apps
 epiphany
 leafpad
 atril
 pavucontrol
-
-artix-grub-theme
-artix-branding-base
-
-# DE branding
-artix-gtk-presets
-artix-qt-presets
-xcursor-premium
-
-# Common DE packages
-mpv
-tumbler
-ffmpegthumbs
-raw-thumbnailer
-webp-pixbuf-loader
-# qt5-imageformats
-gvfs-mtp
-scrot

cinnamon/profile.conf

@@ -6,7 +6,7 @@
 # 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' 'syslog-ng' 'NetworkManager' 'lightdm')
+SERVICES=('acpid' 'bluetoothd' 'cronie' 'cupsd' 'metalog' 'NetworkManager' 'lightdm')
 
 ################# live-session #################
 

cinnamon/root-overlay/etc/issue

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

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

@@ -1 +1 @@
-../../../../common/root-overlay/etc/lightdm/lightdm-gtk-greeter.conf
+../../../../community/live-overlay/etc/lightdm/lightdm-gtk-greeter.conf

cinnamon/root-overlay/etc/local.d

@@ -0,0 +1 @@
+../../../common/root-overlay/etc/local.d

cinnamon/root-overlay/etc/pacman.conf

@@ -0,0 +1 @@
+../../../common/root-overlay/etc/pacman.conf

common/Packages-apps

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

common/Packages-base

@@ -2,12 +2,14 @@
 base
 intel-ucode
 amd-ucode
+artix-grub-theme
+artix-branding-base
 
 elogind-@initsys@
 acpi
 acpid-@initsys@
 alsa-firmware
-alsa-utils-@initsys@
+#alsa-utils-@initsys@
 avahi-@initsys@
 b43-fwcutter
 bluez-@initsys@
@@ -23,7 +25,7 @@ dosfstools
 e2fsprogs
 ecryptfs-utils
 efibootmgr
-exfat-utils
+exfatprogs
 f2fs-tools
 grub
 haveged-@initsys@
@@ -49,13 +51,12 @@ nbd
 net-tools
 nfs-utils-@initsys@
 ntfs-3g
-ntp-@initsys@
+openntpd-@initsys@
 openssh-@initsys@
 os-prober
 pulseaudio-alsa
 pulseaudio-bluetooth
 pulseaudio-zeroconf
-reiserfsprogs
 rsync-@initsys@
 s-nail
 sudo

common/Packages-xorg

@@ -6,8 +6,8 @@ xdg-user-dirs
 xdg-utils
 
 # Drivers, libraries and configs
-nvidia-utils
-nvidia
+#nvidia-utils
+#nvidia
 xf86-input-vmmouse
 xf86-video-amdgpu
 xf86-video-ati
@@ -15,7 +15,6 @@ xf86-video-dummy
 xf86-video-fbdev
 xf86-video-intel
 xf86-video-nouveau
-xf86-video-openchrome
 xf86-video-sisusb
 xf86-video-vesa
 xf86-video-vmware
@@ -44,3 +43,17 @@ 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/conf/calamares-offline/modules/services-artix.conf

@@ -1,10 +1,4 @@
 ---
-manager: openrc
-
-commands:
-    openrc: rc-update
-    dinit: artix-service
-    s6: s6-service
-    runit: rsm
+command: artix-service
 
 services: []

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-offline/settings.conf

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

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

@@ -8,19 +8,19 @@ pacman:
     handle_keyrings: true
     copy_pacconf: true
     requirements:
-      - name: /etc
+      - dest: /etc
         mode: "0o755"
-      - name: /var
+      - dest: /var
         mode: "0o755"
-      - name: /var/cache
+      - dest: /var/cache
         mode: "0o755"
-      - name: /var/cache/pacman
+      - dest: /var/cache/pacman
         mode: "0o755"
-      - name: /var/cache/pacman/pkg
+      - dest: /var/cache/pacman/pkg
         mode: "0o755"
-      - name: /var/lib
+      - dest: /var/lib
         mode: "0o755"
-      - name: /var/lib/pacman
+      - dest: /var/lib/pacman
         mode: "0o755"
     keyrings:
       - artix

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

@@ -1,15 +0,0 @@
----
-efiBootLoader: "grub"
-
-kernel: "/vmlinuz-linux-x86_64"
-img: "/initramfs-linux-x86_64.img"
-fallback: "/initramfs-linux-x86_64-fallback.img"
-timeout: "10"
-
-grubInstall: "grub-install"
-grubMkconfig: "grub-mkconfig"
-grubCfg: "/boot/grub/grub.cfg"
-grubProbe: "grub-probe"
-efiBootMgr: "efibootmgr"
-
-installEFIFallback: true

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/partition.conf

@@ -1,32 +0,0 @@
-efi:
-    mountPoint:         "/boot/efi"
-    recommendedSize:    300MiB
-    minimumSize:        32MiB
-    label:              "EFI"
-
-userSwapChoices:
-    - none      # Create no swap, use no swap
-    - small     # Up to 4GB
-    - suspend   # At least main memory size
-    - file      # To swap file instead of partition
-
-swapPartitionName:      swap
-
-luksGeneration: luks1
-
-drawNestedPartitions:   true
-
-alwaysShowPartitionLabels: true
-
-initialPartitioningChoice: none
-
-initialSwapChoice: suspend
-
-defaultPartitionTableType: msdos
-
-requiredPartitionTableType:
-    - msdos
-    - gpt
-
-defaultFileSystemType:  "ext4"
-availableFileSystemTypes:  ["ext4","btrfs","f2fs","xfs"]

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

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

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

@@ -1,10 +0,0 @@
----
-manager: openrc
-
-commands:
-    openrc: rc-update
-    dinit: artix-service
-    s6: s6-service
-    runit: rsm
-
-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/conf/calamares-online/settings.conf

@@ -37,7 +37,7 @@ sequence:
     - show:
         - finished
 
-branding: artix
+branding: artix-next
 
 prompt-install: false
 

common/live-overlay/etc/calamares

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

common/live-overlay/etc/default

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

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/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/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/skel/.config/autostart/trust-calamares.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Name=Trust calamares
+Exec=sh -c "~/.config/autostart/trust-calamares.sh"
+Terminal=false
+Type=Application
+StartupNotify=false

common/live-overlay/etc/skel/.config/autostart/trust-calamares.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+calamares=~/Desktop/calamares-config-switcher.desktop
+while [ ! -f $calamares ]; do sleep 0.5; done
+gio set -t string $calamares metadata::xfce-exe-checksum "$(sha256sum $calamares | awk '{print $1}')"

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/usr/bin/calamares-config-switcher

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+export QT_STYLE_OVERRIDE=qt6gtk2
+export XAUTHCOOKIE=$XAUTHORITY
+export XDISPLAY=$DISPLAY
+
+readonly conf=/etc/calamares-config-switcher.conf
+
+if [[ -f "${conf}" ]]; then
+    # shellcheck source=/etc/calamares-config-switcher.conf
+    . "${conf}"
+fi
+
+title=${title:-"Switcher"}
+text=${text:-"Select:"}
+if [[ -z "${configs[*]}" ]]; then
+    configs=(offline online)
+fi
+
+select=$(kdialog --title "${title}" --combobox "${text}" "${configs[@]}" --default "${configs[0]}") || exit 1
+
+pkexec ln -snf /etc/calamares-"$select" /etc/calamares
+
+pkexec env DISPLAY=$XDISPLAY XAUTHORITY=$XAUTHCOOKIE QT_QPA_PLATFORMTHEME=qt6gtk2 calamares "$@"

common/root-overlay/etc/elogind

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

common/root-overlay/etc/environment

@@ -1,3 +1,4 @@
+#GTK_THEME=Artix:dark
 QT_QPA_PLATFORMTHEME=gtk2
 QT_STYLE_OVERRIDE=gtk
 QTWEBENGINE_CHROMIUM_FLAGS="-blink-settings=darkModeEnabled=true -enable-features=OverlayScrollbar,OverlayScrollbarFlashAfterAnyScrollUpdate,OverlayScrollbarFlashWhenMouseEnter"

common/root-overlay/etc/hostname

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

common/root-overlay/etc/hosts

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

common/root-overlay/etc/hosts

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

common/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/root-overlay/etc/local.d/0-remove-sessions.start

@@ -0,0 +1 @@
+../../../live-overlay/etc/local.d/1-remove-sessions.start

common/root-overlay/etc/local.d/make-user-icons-readable.start

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# accountsservice creates rw------- files
+chmod 644 /var/lib/AccountsService/users/* 2>/dev/null
+
+# Run once and disappear
+rm -f $0

common/root-overlay/etc/local.d/networkmanagerfix.start

@@ -0,0 +1 @@
+../../../live-overlay/etc/local.d/networkmanagerfix.start

common/root-overlay/etc/local.d/pacman-keyrings.start

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Convenience service
+{
+    pacman-key --init 2>&1 >/dev/null
+    pacman-key --populate 2>&1 >/dev/null
+} &
+
+# Run once and disappear
+rm -f $0

common/root-overlay/etc/pacman.conf

@@ -0,0 +1,104 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+#NoProgressBar
+CheckSpace
+VerbosePkgLists
+ParallelDownloads = 7
+ILoveCandy
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Artix Linux
+# packagers with `pacman-key --populate artix`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The gremlins repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[system-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+[system]
+Include = /etc/pacman.d/mirrorlist
+
+#[world-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+[world]
+Include = /etc/pacman.d/mirrorlist
+
+#[galaxy-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+[galaxy]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the lib32 repositories as required here.
+
+#[lib32-gremlins]
+#Include = /etc/pacman.d/mirrorlist
+
+#[lib32]
+#Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs

common/root-overlay/usr/bin/artix-service

@@ -0,0 +1,90 @@
+#!/bin/bash
+
+cmds_openrc() {
+    COMMANDS[enable]="rc-update add ${SV} default"
+    COMMANDS[disable]="rc-update del ${SV} default"
+    COMMANDS[start]="rc-service ${SV} start"
+    COMMANDS[stop]="rc-service ${SV} stop"
+}
+
+cmds_s6() {
+    COMMANDS[start]="s6-rc -u change ${SV}"
+    COMMANDS[stop]="s6-rc -d change ${SV}"
+    COMMANDS[enable]="s6-service add default ${SV}"
+    COMMANDS[disable]="s6-service del default ${SV}"
+}
+
+cmds_dinit() {
+    COMMANDS[start]="dinitctl start ${SV}"
+    COMMANDS[stop]="dinitctl stop ${SV}"
+    COMMANDS[enable]="dinitctl -o enable ${SV}"
+    COMMANDS[disable]="dinitctl -o disable ${SV}"
+}
+
+cmds_runit() {
+    mkdir -p /run/runit
+    ln -s /etc/runit/runsvdir/current /run/runit/service 2>/dev/null
+    COMMANDS[start]="runsv /etc/runit/sv/${SV}"
+    COMMANDS[stop]="sv stop /etc/runit/sv/${SV}"
+    COMMANDS[enable]="ln -s /etc/runit/sv/${SV} /run/runit/service/"
+    COMMANDS[disable]="rm /run/runit/service/${SV}"
+}
+
+is_live() {
+    if [[ ! -d /run/openrc && "${INIT}" == "openrc" ]]; then
+        echo >&2 "  Skipped: ${INIT} is not running."
+        exit 0
+    elif [[ ! -d /run/s6-rc && "${INIT}" == "s6" ]]; then
+        echo >&2 "  Skipped: ${INIT} is not running."
+        exit 0
+    elif [[ ! -S /run/dinitctl && "${INIT}" == "dinit" ]]; then
+        echo >&2 "  Skipped: ${INIT} is not running."
+        exit 0
+    elif [[ ! -d /run/runit && "${INIT}" == "runit" ]]; then
+        echo >&2 "  Skipped: ${INIT} is not running."
+        exit 0
+    fi
+}
+
+detect() {
+    for i in "${SUPPORTED[@]}"; do
+        if [[ -f /usr/bin/"$i"-init ]]; then
+            INIT="$i"
+            cmds_"${INIT}"
+        fi
+    done
+}
+
+usage() {
+    cat <<EOF
+usage: ${0##*/} [action] [service]
+
+  actions:
+    enable
+    disable
+    start
+    stop
+EOF
+}
+
+readonly SUPPORTED=(openrc s6 dinit runit)
+declare -A COMMANDS
+
+INIT=
+ACTION="$1"
+SV="$2"
+
+if [[ -z "${SV}" ]]; then
+    usage; exit 1
+fi
+
+detect
+
+case "${ACTION}" in
+    start|stop)   is_live; ${COMMANDS["${ACTION}"]} ;;
+    enable|disable) ${COMMANDS["${ACTION}"]} ;;
+    help) usage; exit 0 ;;
+    *) usage; exit 1 ;;
+esac
+
+[ ${INIT} == s6 ] && s6-db-reload

community-gtk/Packages-Live

@@ -6,7 +6,7 @@ calamares-extensions
 gparted
 
 artix-grub-live
-artix-grub-theme
+#artix-grub-theme
 
 virtualbox-guest-utils
 

community-gtk/Packages-Root

@@ -1,7 +1,13 @@
 # loads by default common/packages-{base,apps,xorg}
 
 # Branding
+artix-branding-base
+#artix-grub-theme
+
+# DE branding
 artix-community-presets
+xcursor-premium
+#sddm-theme-artix
 
 # Community goodies
 artix-archlinux-support
@@ -42,22 +48,26 @@ mate-utils
 mozo
 
 # LXDE
-gpicview
-lxappearance
-lxappearance-obconf
-lxde-common
-lxde-icon-theme
-lxhotkey
-lxinput
-lxlauncher
-lxmusic
-lxpanel
-lxrandr
-lxsession
-lxtask
-lxterminal
-openbox
-pcmanfm
+#gpicview
+#lxappearance
+#lxappearance-obconf
+#lxde-common
+#lxde-icon-theme
+#lxhotkey
+#lxinput
+#lxlauncher
+#lxmusic
+#lxpanel
+#lxrandr
+#lxsession
+#lxtask
+#lxterminal
+#openbox
+#pcmanfm
+
+# XFCE
+xfce4
+xfce4-goodies
 
 # Applications and helpers
 scribus
@@ -68,7 +78,6 @@ firefox-adblock-plus
 firefox-noscript
 firefox-ublock-origin
 libreoffice-fresh
-youtube-dl
 pulseaudio-alsa
 p7zip
 unrar
@@ -79,9 +88,9 @@ torsocks
 pulseaudio-bluetooth
 frei0r-plugins
 movit
-nvidia-utils
-lib32-nvidia-utils
-nvidia-settings
+#nvidia-utils
+#lib32-nvidia-utils
+#nvidia-settings
 vulkan-tools
 libunrar
 vdpauinfo
@@ -94,7 +103,6 @@ lsof
 # pacman frontend
 pamac
 
-
 # Network management
 modem-manager-gui
 connman-gtk
@@ -103,10 +111,9 @@ connman-gtk
 geany-plugins
 #syncthing-gtk-python3
 handbrake
-audacity
+sneedacity
 gimp
 inkscape
-hexchat
 gufw
 meld
 mcomix
@@ -115,7 +122,6 @@ transmission-gtk
 lightdm-gtk-greeter
 light-locker
 atril
-brasero
 pluma
 thunderbird
 claws-mail
@@ -123,6 +129,9 @@ epiphany
 leafpad
 pavucontrol
 
+# IRC
+hexchat
+
 # Multimedia
 yt-dlp
 kodi
@@ -131,9 +140,11 @@ aegisub
 subtitleeditor
 guvcview
 songrec
-mp3splt-gtk
+#mp3splt-gtk
 osdlyrics
 glyr
+brasero
+exaile
 
 # Misc stuff
 accountsservice
@@ -142,22 +153,20 @@ trizen
 yaourtix
 hunspell-en_US
 picom
+xdg-desktop-portal
+xdg-desktop-portal-gtk
 
 # Qt pkgs
 kdenlive
 digikam
 smb4k
-exaile
 projectm-pulseaudio
 projectm-sdl
 telegram-desktop
-xdg-desktop-portal
-xdg-desktop-portal-gtk
 
 # Uniform QT/GTK look
 #kvantum-qt5
 qt5-styleplugins
-#qt5ct
 qt6ct
 breeze-gtk
 vertex-themes
@@ -212,20 +221,8 @@ virtualbox-guest-utils
 jre-openjdk
 plymouth
 
-artix-grub-theme
-artix-branding-base
-
-# DE branding
-artix-gtk-presets
-artix-qt-presets
-xcursor-premium
-
 # Common DE packages
-mpv
-tumbler
 ffmpegthumbs
 raw-thumbnailer
 webp-pixbuf-loader
-# qt5-imageformats
 gvfs-mtp
-scrot

community-gtk/live-overlay/etc/calamares-offline

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

community-gtk/live-overlay/etc/calamares-online

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

community-gtk/live-overlay/etc/elogind

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

community-gtk/live-overlay/etc/lightdm

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

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

@@ -1,169 +0,0 @@
-#
-# General configuration
-#
-# start-default-seat = True to always start one seat if none are defined in the configuration
-# greeter-user = User to run greeter as
-# minimum-display-number = Minimum display number to use for X servers
-# minimum-vt = First VT to run displays on
-# lock-memory = True to prevent memory from being paged to disk
-# user-authority-in-system-dir = True if session authority should be in the system location
-# guest-account-script = Script to be run to setup guest account
-# logind-check-graphical = True to on start seats that are marked as graphical by logind
-# log-directory = Directory to log information to
-# run-directory = Directory to put running state in
-# cache-directory = Directory to cache to
-# sessions-directory = Directory to find sessions
-# remote-sessions-directory = Directory to find remote sessions
-# greeters-directory = Directory to find greeters
-# backup-logs = True to move add a .old suffix to old log files when opening new ones
-# dbus-service = True if LightDM provides a D-Bus service to control it
-#
-[LightDM]
-#start-default-seat=true
-#greeter-user=lightdm
-#minimum-display-number=0
-#minimum-vt=7 # Setting this to a value < 7 implies security issues, see FS#46799
-#lock-memory=true
-#user-authority-in-system-dir=false
-#guest-account-script=guest-account
-#logind-check-graphical=false
-#log-directory=/var/log/lightdm
-run-directory=/run/lightdm
-#cache-directory=/var/cache/lightdm
-#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
-#remote-sessions-directory=/usr/share/lightdm/remote-sessions
-#greeters-directory=$XDG_DATA_DIRS/lightdm/greeters:$XDG_DATA_DIRS/xgreeters
-#backup-logs=true
-#dbus-service=true
-
-#
-# Seat configuration
-#
-# Seat configuration is matched against the seat name glob in the section, for example:
-# [Seat:*] matches all seats and is applied first.
-# [Seat:seat0] matches the seat named "seat0".
-# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
-#
-# type = Seat type (local, xremote, unity)
-# pam-service = PAM service to use for login
-# pam-autologin-service = PAM service to use for autologin
-# pam-greeter-service = PAM service to use for greeters
-# xserver-backend = X backend to use (mir)
-# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
-# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
-# xserver-config = Config file to pass to X server
-# xserver-layout = Layout to pass to X server
-# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
-# xserver-share = True if the X server is shared for both greeter and session
-# xserver-hostname = Hostname of X server (only for type=xremote)
-# xserver-display-number = Display number of X server (only for type=xremote)
-# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
-# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
-# unity-compositor-timeout = Number of seconds to wait for compositor to start
-# greeter-session = Session to load for greeter
-# greeter-hide-users = True to hide the user list
-# greeter-allow-guest = True if the greeter should show a guest login option
-# greeter-show-manual-login = True if the greeter should offer a manual login option
-# greeter-show-remote-login = True if the greeter should offer a remote login option
-# user-session = Session to load for users
-# allow-user-switching = True if allowed to switch users
-# allow-guest = True if guest login is allowed
-# guest-session = Session to load for guests (overrides user-session)
-# session-wrapper = Wrapper script to run session with
-# greeter-wrapper = Wrapper script to run greeter with
-# guest-wrapper = Wrapper script to run guest sessions with
-# display-setup-script = Script to run when starting a greeter session (runs as root)
-# display-stopped-script = Script to run after stopping the display server (runs as root)
-# greeter-setup-script = Script to run when starting a greeter (runs as root)
-# session-setup-script = Script to run when starting a user session (runs as root)
-# session-cleanup-script = Script to run when quitting a user session (runs as root)
-# autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
-# autologin-user-timeout = Number of seconds to wait before loading default user
-# autologin-session = Session to load for automatic login (overrides user-session)
-# autologin-in-background = True if autologin session should not be immediately activated
-# exit-on-failure = True if the daemon should exit if this seat fails
-#
-[Seat:*]
-#type=local
-#pam-service=lightdm
-#pam-autologin-service=lightdm-autologin
-#pam-greeter-service=lightdm-greeter
-#xserver-backend=
-#xserver-command=X
-#xmir-command=Xmir
-#xserver-config=
-#xserver-layout=
-#xserver-allow-tcp=false
-#xserver-share=true
-#xserver-hostname=
-#xserver-display-number=
-#xdmcp-manager=
-#xdmcp-port=177
-#xdmcp-key=
-#unity-compositor-command=unity-system-compositor
-#unity-compositor-timeout=60
-greeter-session=lightdm-gtk-greeter
-#greeter-hide-users=false
-#greeter-allow-guest=true
-#greeter-show-manual-login=false
-#greeter-show-remote-login=true
-#user-session=default
-#allow-user-switching=true
-#allow-guest=true
-#guest-session=
-session-wrapper=/etc/lightdm/Xsession
-#greeter-wrapper=
-#guest-wrapper=
-#display-setup-script=
-#display-stopped-script=
-#greeter-setup-script=
-#session-setup-script=
-#session-cleanup-script=
-#autologin-guest=false
-autologin-user=artix
-#autologin-user-timeout=0
-#autologin-in-background=false
-autologin-session=mate
-#exit-on-failure=false
-
-#
-# XDMCP Server configuration
-#
-# enabled = True if XDMCP connections should be allowed
-# port = UDP/IP port to listen for connections on
-# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
-# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
-# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
-#
-# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn.  Alternatively
-# it can be a word and the first 7 characters are used as the key.
-#
-[XDMCPServer]
-#enabled=false
-#port=177
-#listen-address=
-#key=
-#hostname=
-
-#
-# VNC Server configuration
-#
-# enabled = True if VNC connections should be allowed
-# command = Command to run Xvnc server with
-# port = TCP/IP port to listen for connections on
-# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
-# width = Width of display to use
-# height = Height of display to use
-# depth = Color depth of display to use
-#
-[VNCServer]
-#enabled=false
-#command=Xvnc
-#port=5900
-#listen-address=
-#width=1024
-#height=768
-#depth=8