fix connmand service typo

base/Packages-Root

@@ -1,7 +1,4 @@
 base
-@openrc openrc
-@runit runit
-@s6 s6
 @openrc elogind-openrc
 @runit elogind-runit
 @s6 elogind-s6
@@ -33,7 +30,7 @@ lsb-release
 man-db
 man-pages
 memtest86+
-mkinitcpio-openswap
+mkinitcpio
 nano
 net-tools
 ntfs-3g
@@ -61,17 +58,17 @@ ntfs-3g
 @runit openssh-runit
 @runit wpa_supplicant-runit
 @runit syslog-ng-runit
-# @s6 acpid-s6
-# @s6 cronie-s6
-# @s6 cryptsetup-s6
+@s6 acpid-s6
+@s6 cronie-s6
+@s6 cryptsetup-s6
 @s6 dhcpcd-s6
-# @s6 haveged-s6
-# @s6 lvm2-s6
-# @s6 mdadm-s6
-# @s6 nfs-utils-s6
-# @s6 rsync-s6
-# @s6 openssh-s6
-# @s6 wpa_supplicant-s6
+@s6 haveged-s6
+@s6 lvm2-s6
+@s6 mdadm-s6
+@s6 nfs-utils-s6
+@s6 rsync-s6
+@s6 openssh-s6
+@s6 wpa_supplicant-s6
 @s6 syslog-ng-s6
 os-prober
 reiserfsprogs
@@ -91,8 +88,9 @@ nbd
 
 @openrc artix-live-openrc
 @runit artix-live-runit
-# @s6 artix-live-s6
-artix-live-portable-efi
+@s6 artix-live-s6
+
+artix-grub-theme
 
 @openrc connman-openrc
 @openrc ntp-openrc
@@ -100,9 +98,9 @@ artix-live-portable-efi
 @runit connman-runit
 @runit ntp-runit
 @runit bluez-runit
-# @s6 connman-s6
-# @s6 ntp-s6
-# @s6 bluez-s6
+@s6 connman-s6
+@s6 ntp-s6
+@s6 bluez-s6
 
 intel-ucode
 amd-ucode

base/profile.conf

@@ -8,7 +8,7 @@
 AUTOLOGIN="false"
 
 # start services
-SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connman')
+SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
 
 # default group membership
 # ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"

base/root-overlay/etc/default/grub

@@ -2,7 +2,7 @@ GRUB_DEFAULT=saved
 GRUB_TIMEOUT=5
 GRUB_DISTRIBUTOR="Artix"
 GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
-GRUB_CMDLINE_LINUX=""
+GRUB_CMDLINE_LINUX="net.ifnames=0"
 
 # If you want to enable the save default function, uncomment the following
 # line, and set GRUB_DEFAULT to saved.

linexa/Packages-Live

@@ -6,7 +6,10 @@ nbd
 
 @openrc artix-live-openrc
 @runit artix-live-runit
-artix-live-portable-efi
+@s6 artix-live-s6
+
+artix-grub-theme
+
 artix-sddm-theme
 artix-lxqt-presets
 artix-docs
@@ -19,11 +22,16 @@ artix-docs
 @runit ntp-runit
 @runit bluez-runit
 
+@s6 connman-s6
+@s6 ntp-s6
+@s6 bluez-s6
+
 intel-ucode
 amd-ucode
 sddm
 @openrc displaymanager-openrc
 @runit sddm-runit
+@s6 sddm-s6
 cmst
 
 calamares-branding

linexa/Packages-Root

@@ -1,14 +1,10 @@
-### packages added here will be installed on the target system
 base
-@openrc openrc
-@runit runit
-@s6 s6
+@openrc elogind-openrc
+@runit elogind-runit
+@s6 elogind-s6
 acpi
 b43-fwcutter
-bash
 btrfs-progs
-bzip2
-coreutils
 crda
 dhclient
 diffutils
@@ -19,33 +15,22 @@ e2fsprogs
 ecryptfs-utils
 exfat-utils
 f2fs-tools
-file
-filesystem
-findutils
-gawk
-gcc-libs
-gettext
-glibc
-grep
 grub
-gzip
 htop
 inetutils
-iproute2
 iptables
-iputils
 ipw2100-fw
 ipw2200-fw
 jfsutils
 linux
-less
-licenses
+linux-headers
 linux-firmware
 logrotate
 lsb-release
 man-db
 man-pages
 memtest86+
+mkinitcpio
 mkinitcpio-openswap
 nano
 net-tools
@@ -54,7 +39,6 @@ ntfs-3g
 @openrc cronie-openrc
 @openrc cryptsetup-openrc
 @openrc dhcpcd-openrc
-@openrc elogind-openrc
 @openrc haveged-openrc
 @openrc lvm2-openrc
 @openrc mdadm-openrc
@@ -67,7 +51,6 @@ ntfs-3g
 @runit cronie-runit
 @runit cryptsetup-runit
 @runit dhcpcd-runit
-@runit elogind-runit
 @runit haveged-runit
 @runit lvm2-runit
 @runit mdadm-runit
@@ -76,25 +59,25 @@ ntfs-3g
 @runit openssh-runit
 @runit wpa_supplicant-runit
 @runit syslog-ng-runit
+@s6 acpid-s6
+@s6 cronie-s6
+@s6 cryptsetup-s6
 @s6 dhcpcd-s6
-@s6 elogind-s6
+@s6 haveged-s6
+@s6 lvm2-s6
+@s6 mdadm-s6
+@s6 nfs-utils-s6
+@s6 rsync-s6
+@s6 openssh-s6
+@s6 wpa_supplicant-s6
 @s6 syslog-ng-s6
 os-prober
-pacman
-pciutils
-perl
-procps-ng
-psmisc
 reiserfsprogs
-sed
-shadow
 s-nail
 sudo
 sysfsutils
-tar
 texinfo
 usbutils
-util-linux
 which
 efibootmgr
 xfsprogs

linexa/live-overlay

@@ -0,0 +1 @@
+..//lxqt/live-overlay

linexa/live-overlay/etc/sddm.conf

@@ -1,129 +0,0 @@
-[Autologin]
-# Whether sddm should automatically log back into sessions when they exit
-Relogin=false
-
-# Name of session file for autologin session (if empty try last logged in)
-Session=
-
-# Username for autologin session
-User=
-
-
-[General]
-# Halt command
-HaltCommand=/usr/bin/loginctl poweroff
-
-# Input method module
-InputMethod=qtvirtualkeyboard
-
-# Initial NumLock state. Can be on, off or none.
-# If property is set to none, numlock won't be changed
-# NOTE: Currently ignored if autologin is enabled.
-Numlock=none
-
-# Reboot command
-RebootCommand=/usr/bin/loginctl reboot
-
-
-[Theme]
-# Current theme name
-Current=artix
-
-# Cursor theme used in the greeter
-CursorTheme=
-
-# Number of users to use as threshold
-# above which avatars are disabled
-# unless explicitly enabled with EnableAvatars
-DisableAvatarsThreshold=7
-
-# Enable display of custom user avatars
-EnableAvatars=true
-
-# Global directory for user avatars
-# The files should be named <username>.face.icon
-FacesDir=/usr/share/sddm/faces
-
-# Theme directory path
-ThemeDir=/usr/share/sddm/themes
-
-
-[Users]
-# Default $PATH for logged in users
-DefaultPath=/usr/local/bin:/usr/bin:/bin
-
-# Comma-separated list of shells.
-# Users with these shells as their default won't be listed
-HideShells=
-
-# Comma-separated list of users that should not be listed
-HideUsers=
-
-# Maximum user id for displayed users
-MaximumUid=60000
-
-# Minimum user id for displayed users
-MinimumUid=1000
-
-# Remember the session of the last successfully logged in user
-RememberLastSession=true
-
-# Remember the last successfully logged in user
-RememberLastUser=true
-
-# When logging in as the same user twice, restore the original session, rather than create a new one
-ReuseSession=false
-
-
-[Wayland]
-# Enable Qt's automatic high-DPI scaling
-EnableHiDPI=false
-
-# Path to a script to execute when starting the desktop session
-SessionCommand=/usr/share/sddm/scripts/wayland-session
-
-# Directory containing available Wayland sessions
-SessionDir=/usr/share/wayland-sessions
-
-# Path to the user session log file
-SessionLogFile=.local/share/sddm/wayland-session.log
-
-
-[X11]
-# Path to a script to execute when starting the display server
-DisplayCommand=/usr/share/sddm/scripts/Xsetup
-
-# Path to a script to execute when stopping the display server
-DisplayStopCommand=/usr/share/sddm/scripts/Xstop
-
-# Enable Qt's automatic high-DPI scaling
-EnableHiDPI=false
-
-# The lowest virtual terminal number that will be used.
-MinimumVT=7
-
-# Arguments passed to the X server invocation
-ServerArguments=-nolisten tcp
-
-# Path to X server binary
-ServerPath=/usr/bin/X
-
-# Path to a script to execute when starting the desktop session
-SessionCommand=/usr/share/sddm/scripts/Xsession
-
-# Directory containing available X sessions
-SessionDir=/usr/share/xsessions
-
-# Path to the user session log file
-SessionLogFile=.local/share/sddm/xorg-session.log
-
-# Path to the Xauthority file
-UserAuthFile=.Xauthority
-
-# Path to xauth binary
-XauthPath=/usr/bin/xauth
-
-# Path to Xephyr binary
-XephyrPath=/usr/bin/Xephyr
-
-

lxde/Packages-Live

@@ -0,0 +1,21 @@
+mkinitcpio-nfs-utils
+squashfs-tools
+nbd
+
+@openrc artix-live-openrc
+@runit artix-live-runit
+@s6 artix-live-s6
+
+artix-grub-theme
+
+calamares-branding
+gparted
+
+virtualbox-guest-modules-artix
+virtualbox-guest-utils
+#open-vm-tools
+broadcom-wl
+
+intel-ucode
+amd-ucode
+artix-docs

lxde/Packages-Root

@@ -0,0 +1,156 @@
+base
+@openrc elogind-openrc
+@runit elogind-runit
+@s6 elogind-s6
+acpi
+b43-fwcutter
+btrfs-progs
+crda
+dhclient
+diffutils
+dmraid
+dnsmasq
+dosfstools
+e2fsprogs
+ecryptfs-utils
+exfat-utils
+f2fs-tools
+grub
+htop
+inetutils
+iptables
+ipw2100-fw
+ipw2200-fw
+jfsutils
+linux
+linux-headers
+linux-firmware
+logrotate
+lsb-release
+man-db
+man-pages
+memtest86+
+mkinitcpio
+mkinitcpio-openswap
+nano
+net-tools
+ntfs-3g
+@openrc acpid-openrc
+@openrc cronie-openrc
+@openrc cryptsetup-openrc
+@openrc dhcpcd-openrc
+@openrc haveged-openrc
+@openrc lvm2-openrc
+@openrc mdadm-openrc
+@openrc nfs-utils-openrc
+@openrc rsync-openrc
+@openrc openssh-openrc
+@openrc wpa_supplicant-openrc
+@openrc syslog-ng-openrc
+@runit acpid-runit
+@runit cronie-runit
+@runit cryptsetup-runit
+@runit dhcpcd-runit
+@runit haveged-runit
+@runit lvm2-runit
+@runit mdadm-runit
+@runit nfs-utils-runit
+@runit rsync-runit
+@runit openssh-runit
+@runit wpa_supplicant-runit
+@runit syslog-ng-runit
+@s6 acpid-s6
+@s6 cronie-s6
+@s6 cryptsetup-s6
+@s6 dhcpcd-s6
+@s6 haveged-s6
+@s6 lvm2-s6
+@s6 mdadm-s6
+@s6 nfs-utils-s6
+@s6 rsync-s6
+@s6 openssh-s6
+@s6 wpa_supplicant-s6
+@s6 syslog-ng-s6
+os-prober
+reiserfsprogs
+s-nail
+sudo
+sysfsutils
+texinfo
+usbutils
+which
+efibootmgr
+xfsprogs
+zsh
+
+alsa-firmware
+powertop
+inxi
+
+@openrc alsa-utils-openrc
+@openrc avahi-openrc
+@openrc connman-openrc
+@openrc displaymanager-openrc
+@openrc ntp-openrc
+@openrc openrc-settingsd
+@openrc bluez-openrc
+@runit alsa-utils-runit
+@runit avahi-runit
+@runit bluez-runit
+@runit connman-runit
+@runit ntp-runit
+@runit lightdm-runit
+@s6 alsa-utils-s6
+@s6 avahi-s6
+@s6 bluez-s6
+@s6 connman-s6
+@s6 ntp-s6
+@s6 lightdm-s6
+
+librabbitmq-c
+libmongoc
+
+terminus-font
+ttf-droid
+ttf-roboto
+ttf-roboto-mono
+ttf-inconsolata
+ttf-liberation
+
+xdg-user-dirs
+xdg-utils
+
+xorg-server
+xorg-xinit
+
+xf86-input-vmmouse
+xf86-video-amdgpu
+xf86-video-ati
+xf86-video-dummy
+xf86-video-fbdev
+xf86-video-intel
+xf86-video-nouveau
+xf86-video-openchrome
+xf86-video-sisusb
+xf86-video-vesa
+xf86-video-vmware
+xf86-video-voodoo
+
+artix-lxde-presets
+artix-grub-theme
+
+xcursor-premium
+
+# LXDE
+lxde
+
+# Basic usability apps
+atril
+light-locker
+lightdm-gtk-greeter
+connman-gtk
+midori
+hexchat
+mpv
+neofetch
+leafpad

lxde/live-overlay

@@ -0,0 +1 @@
+..//lxqt/live-overlay

lxde/profile.conf

@@ -0,0 +1,25 @@
+################ install ################
+
+# default displaymanager: none
+# supported: lightdm, sddm, gdm, lxdm, mdm
+DISPLAYMANAGER="lightdm"
+
+# Set to false to disable autologin in the livecd
+AUTOLOGIN="true"
+
+# start services
+SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
+
+# default group membership
+ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"
+
+################# live-session #################
+
+# unset defaults to given value
+# HOST_NAME="artix"
+
+# unset defaults to given value
+# USER_NAME="artix"
+
+# unset defaults to given value
+# PASSWORD="artix"

lxde/root-overlay/etc/bash/bashrc.d/local.bashrc

@@ -0,0 +1,38 @@
+# Artix bash customization
+# Most by nous, a couple kanged from the internets
+
+# are we an interactive shell?
+if [ "$PS1" ]; then
+    shopt -s cdspell checkwinsize histappend no_empty_cmd_completion dotglob
+    shopt -u huponexit
+fi
+
+# Show effective user in prompts and terminal titles
+USER=`id -un`
+
+alias psa='ps a'
+# handy Perl one-liner for calculations: calc 5*12+5/8^2
+alias calc='perl -e '\''$_="@ARGV";s/\^/**/g;y/x/*/;print eval $_, "\n"'\'''
+# Replace all spaces in current directory's filenames with underscores
+alias nospaces='i=0; for f in *\ *; do mv ./"$f" `echo "$f" | sed s/\ /_/g` ; let i++ ; done ; echo $i file\(s\) renamed'
+# Same with parentheses
+alias noparentheses='i=0; for f in *\(*; do mv ./"$f" `echo "$f" | sed s/\(//g | sed s/\)//g` ; let i++; done; echo $i file\(s\) renamed'
+alias rot13='tr A-Za-z N-ZA-Mn-za-m'
+alias rot47='tr !-~ P-~!-O'
+
+# Virtualbox in dark themes is ugly with every QT_STYLE_OVERRIDE setting except kvantum-dark
+alias VirtualBox='QT_STYLE_OVERRIDE=kvantum-dark virtualbox'
+alias virtualbox='QT_STYLE_OVERRIDE=kvantum-dark virtualbox'
+
+# No clobber, use >| instead of >
+set -C
+
+# Users generally won't see annoyng core files
+ulimit -c 0
+[ "${EUID}" = "0" ] && ulimit -S -c 1000000 > /dev/null 2>&1
+
+# Make a nice prompt
+[ "${EUID}" = "0" ] && export PS1="\[\033[1;32;40m\]\h\[\033[0;37;40m\]:\[\033[34;40m\][\[\033[1;31;40m\]\u\[\033[0;34;40m\]]\[\033[0;37;40m\]:\[\033[35;40m\]\w\[\033[1;33;40m\]#\[\033[0m\] " \
+                    || export PS1="\[\033[1;32;40m\]\h\[\033[0;37;40m\]:\[\033[31;40m\][\[\033[1;34;40m\]\u\[\033[0;31;40m\]]\[\033[0;37;40m\]:\[\033[35;40m\]\w\[\033[1;33;40m\]%\[\033[0m\] "
+
+echo

lxde/root-overlay/etc/default/grub

@@ -0,0 +1,50 @@
+GRUB_DEFAULT="0"
+GRUB_TIMEOUT="3"
+GRUB_DISTRIBUTOR="Artix"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
+GRUB_CMDLINE_LINUX="net.ifnames=0 cryptkey=rootfs:/crypto_keyfile.bin"
+
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
+# Uncomment to enable Hidden Menu, and optionally hide the timeout count
+#GRUB_HIDDEN_TIMEOUT="5"
+#GRUB_HIDDEN_TIMEOUT_QUIET="true"
+
+# Uncomment to use basic console
+GRUB_TERMINAL_INPUT="console"
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL_OUTPUT="console"
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE="1680x1050x8"
+GRUB_GFXMODE=auto
+
+# Uncomment to allow the kernel use the same resolution used by grub
+GRUB_GFXPAYLOAD_LINUX="keep"
+
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
+GRUB_DISABLE_LINUX_UUID="true"
+
+# Uncomment to disable generation of recovery mode menu entries
+GRUB_DISABLE_RECOVERY="true"
+
+# Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
+# modes only.  Entries specified as foreground/background.
+export GRUB_COLOR_NORMAL="light-blue/black"
+export GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+#GRUB_BACKGROUND="/path/to/wallpaper"
+GRUB_THEME="/usr/share/grub/themes/artix/theme.txt"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"
+
+GRUB_SAVEDEFAULT="true"
+
+GRUB_DISABLE_LINUX_RECOVERY="true"

lxde/root-overlay/etc/hosts

@@ -0,0 +1 @@
+127.0.0.1	localhost artix

lxde/root-overlay/etc/lightdm/Xsession

@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# LightDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+    if [ -f "$file" ]; then
+        echo "Loading profile from $file";
+        . "$file"
+    fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+    if [ -f "$file" ]; then
+        echo "Loading resource: $file"
+        xrdb -merge "$file"
+    fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+    if [ -f "$file" ]; then
+        echo "Loading keymap: $file"
+        setxkbmap `cat "$file"`
+        XKB_IN_USE=yes
+    fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+    for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+        if [ -f "$file" ]; then
+           echo "Loading modmap: $file"
+           xmodmap "$file"
+        fi
+    done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+    for script in $xinitdir/*; do
+        echo "Loading xinit script $script"
+        if [ -x "$script" -a ! -d "$script" ]; then
+            . "$script"
+        fi
+    done
+fi
+
+# Run user xsession shell script
+script="$HOME/.xsession"
+if [ -x "$script" -a ! -d "$script" ]; then
+    echo "Loading xsession script $script"
+    . "$script"
+fi
+
+echo "X session wrapper complete, running session $@"
+
+exec $@

lxde/root-overlay/etc/lightdm/keys.conf

@@ -0,0 +1,3 @@
+[keyring]
+#a=0x0123456789ABCD
+#b=secret

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

@@ -0,0 +1,12 @@
+[greeter]
+clock-format = %a %d %B %Y, %H:%M:%S
+position = 30%,center
+font-name = Fira Sans 12
+theme-name = Artix-dark
+icon-theme-name = matefaenzadark
+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

lxde/root-overlay/etc/lightdm/lightdm.conf

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

lxde/root-overlay/etc/lightdm/users.conf

@@ -0,0 +1,14 @@
+#
+# User accounts configuration
+#
+# NOTE: If you have AccountsService installed on your system, then LightDM will
+# use this instead and these settings will be ignored
+#
+# minimum-uid = Minimum UID required to be shown in greeter
+# hidden-users = Users that are not shown to the user
+# hidden-shells = Shells that indicate a user cannot login
+#
+[UserList]
+minimum-uid=1000
+hidden-users=nobody nobody4 noaccess
+hidden-shells=/bin/false /usr/bin/nologin

lxde/root-overlay/etc/local.d/mkinitcpio.start

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# 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*
+    sed -i 's|encrypt||' /etc/mkinitcpio.conf*
+    sed -i 's|cryptkey=rootfs:/crypto_keyfile.bin||' /etc/default/grub /boot/grub/grub.cfg
+fi
+
+rm -f /etc/local.d/mkinitcpio.start

lxde/root-overlay/etc/rc.local

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+neofetch >| /etc/issue
+
+# Enable kernel's Magic SysRq
+sysctl -q kernel.sysrq=1 &
+
+# Remove possible stale lockfile
+rm -f /var/lib/pacman/db.lck &

lxqt/Packages-Live

@@ -4,13 +4,12 @@ nbd
 
 @openrc artix-live-openrc
 @runit artix-live-runit
-# @s6 artix-live-s6
+@s6 artix-live-s6
 
-artix-live-portable-efi
+artix-grub-theme
 
 calamares-branding
 partitionmanager
-#orca
 
 virtualbox-guest-modules-artix
 virtualbox-guest-utils

lxqt/Packages-Root

@@ -1,7 +1,4 @@
 base
-@openrc openrc
-@runit runit
-@s6 s6
 @openrc elogind-openrc
 @runit elogind-runit
 @s6 elogind-s6
@@ -33,6 +30,7 @@ lsb-release
 man-db
 man-pages
 memtest86+
+mkinitcpio
 mkinitcpio-openswap
 nano
 net-tools
@@ -61,17 +59,17 @@ ntfs-3g
 @runit openssh-runit
 @runit wpa_supplicant-runit
 @runit syslog-ng-runit
-# @s6 acpid-s6
-# @s6 cronie-s6
-# @s6 cryptsetup-s6
+@s6 acpid-s6
+@s6 cronie-s6
+@s6 cryptsetup-s6
 @s6 dhcpcd-s6
-# @s6 haveged-s6
-# @s6 lvm2-s6
-# @s6 mdadm-s6
-# @s6 nfs-utils-s6
-# @s6 rsync-s6
-# @s6 openssh-s6
-# @s6 wpa_supplicant-s6
+@s6 haveged-s6
+@s6 lvm2-s6
+@s6 mdadm-s6
+@s6 nfs-utils-s6
+@s6 rsync-s6
+@s6 openssh-s6
+@s6 wpa_supplicant-s6
 @s6 syslog-ng-s6
 os-prober
 reiserfsprogs
@@ -102,19 +100,17 @@ inxi
 @runit connman-runit
 @runit ntp-runit
 @runit sddm-runit
-# @s6 alsa-utils-s6
-# @s6 avahi-s6
-# @s6 bluez-s6
-# @s6 connman-s6
-# @s6 ntp-s6
-# @s6 sddm-s6
+@s6 alsa-utils-s6
+@s6 avahi-s6
+@s6 bluez-s6
+@s6 connman-s6
+@s6 ntp-s6
+@s6 sddm-s6
 
 librabbitmq-c
 libmongoc
 
 terminus-font
-ttf-bitstream-vera
-ttf-dejavu
 ttf-droid
 ttf-inconsolata
 ttf-indic-otf
@@ -148,3 +144,5 @@ kwrite
 falkon
 xarchiver
 vlc
+breeze-icons
+neofetch

lxqt/live-overlay

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

lxqt/live-overlay/etc/calamares/modules/bootloader.conf

@@ -0,0 +1,12 @@
+---
+efiBootLoader: "grub"
+kernel: "/vmlinuz-linux-x86_64"
+img: "/initramfs-linux-x86_64.img"
+fallback: "/initramfs-linux-x86_64-fallback.img"
+timeout: "10"
+kernelLine: ", with linux"
+fallbackKernelLine: ", with linux (fallback initramfs)"
+grubInstall: "grub-install"
+grubMkconfig: "grub-mkconfig"
+grubCfg: "/boot/grub/grub.cfg"
+#efiBootloaderId: "dirname"

lxqt/live-overlay/etc/calamares/modules/displaymanager.conf

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

lxqt/live-overlay/etc/calamares/modules/finished.conf

@@ -0,0 +1,4 @@
+---
+restartNowEnabled: true
+restartNowChecked: false
+restartNowCommand: "loginctl reboot"

lxqt/live-overlay/etc/calamares/modules/initcpio.conf

@@ -0,0 +1,2 @@
+---
+kernel: linux

lxqt/live-overlay/etc/calamares/modules/locale.conf

@@ -0,0 +1,10 @@
+---
+# region:                     "America"
+# zone:                       "New_York"
+
+localeGenPath: /etc/locale.gen
+
+geoip:
+    style:    "json"
+    url:      "https://geoip.kde.org/v1/calamares"
+    selector: ""

lxqt/live-overlay/etc/calamares/modules/machineid.conf

@@ -0,0 +1,4 @@
+---
+systemd: false
+dbus: true
+symlink: true

lxqt/live-overlay/etc/calamares/modules/umount.conf

@@ -0,0 +1,3 @@
+---
+srcLog: "/root/.cache/Calamares/Calamares.log"
+destLog: "/var/log/Calamares.log"

lxqt/live-overlay/etc/calamares/modules/welcome.conf

@@ -0,0 +1,26 @@
+---
+showSupportUrl:         true
+showKnownIssuesUrl:     true
+showReleaseNotesUrl:    true
+
+requirements:
+    requiredStorage:    5.5
+    requiredRam:        1.0
+    internetCheckUrl:   https://artixlinux.org
+    check:
+      - storage
+      - ram
+      - power
+      - internet
+      - root
+    required:
+      - storage
+      - ram
+      - root
+
+# geoip:
+#     style:    "none"
+#     url:      "https://geoip.kde.org/v1/ubiquity"  # extended XML format
+#     selector: "CountryCode"  # blank uses default, which is wrong
+
+# languageIcon: set-language

lxqt/live-overlay/etc/calamares/settings.conf

@@ -0,0 +1,45 @@
+---
+modules-search: [ local ]
+
+sequence:
+    - show:
+        - welcome
+        - locale
+        - keyboard
+        - partition
+        - users
+        - summary
+    - exec:
+        - partition
+        - mount
+        - unpackfs
+        - machineid
+        - fstab
+        - locale
+        - keyboard
+        - localecfg
+        - luksopenswaphookcfg
+        - luksbootkeyfile
+        - initcpiocfg
+        - initcpio
+        - users
+        - displaymanager
+        - networkcfg
+        - hwclock
+        - services-openrc
+        - grubcfg
+        - bootloader
+        - postcfg
+        - umount
+    - show:
+        - finished
+
+branding: artix
+
+prompt-install: false
+
+dont-chroot: false
+
+disable-cancel: false
+
+disable-cancel-during-exec: false

lxqt/profile.conf

@@ -5,10 +5,10 @@
 DISPLAYMANAGER="sddm"
 
 # Set to false to disable autologin in the livecd
-# AUTOLOGIN="true"
+AUTOLOGIN="true"
 
 # start services
-SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connman')
+SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
 
 # default group membership
 ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"

mate/Packages-Live

@@ -4,12 +4,11 @@ nbd
 
 @openrc artix-live-openrc
 @runit artix-live-runit
-# @s6 artix-live-s6
+@s6 artix-live-s6
 
-artix-live-portable-efi
+artix-grub-theme
 
 calamares-branding
-#orca
 gparted
 
 virtualbox-guest-modules-artix

mate/Packages-Root

@@ -1,7 +1,4 @@
 base
-@openrc openrc
-@runit runit
-@s6 s6
 @openrc elogind-openrc
 @runit elogind-runit
 @s6 elogind-s6
@@ -33,6 +30,7 @@ lsb-release
 man-db
 man-pages
 memtest86+
+mkinitcpio
 mkinitcpio-openswap
 nano
 net-tools
@@ -61,17 +59,17 @@ ntfs-3g
 @runit openssh-runit
 @runit wpa_supplicant-runit
 @runit syslog-ng-runit
-# @s6 acpid-s6
-# @s6 cronie-s6
-# @s6 cryptsetup-s6
+@s6 acpid-s6
+@s6 cronie-s6
+@s6 cryptsetup-s6
 @s6 dhcpcd-s6
-# @s6 haveged-s6
-# @s6 lvm2-s6
-# @s6 mdadm-s6
-# @s6 nfs-utils-s6
-# @s6 rsync-s6
-# @s6 openssh-s6
-# @s6 wpa_supplicant-s6
+@s6 haveged-s6
+@s6 lvm2-s6
+@s6 mdadm-s6
+@s6 nfs-utils-s6
+@s6 rsync-s6
+@s6 openssh-s6
+@s6 wpa_supplicant-s6
 @s6 syslog-ng-s6
 os-prober
 reiserfsprogs
@@ -101,23 +99,22 @@ inxi
 @runit bluez-runit
 @runit connman-runit
 @runit ntp-runit
-@runit sddm-runit
-# @s6 alsa-utils-s6
-# @s6 avahi-s6
-# @s6 bluez-s6
-# @s6 connman-s6
-# @s6 ntp-s6
-# @s6 sddm-s6
+@runit lightdm-runit
+@s6 alsa-utils-s6
+@s6 avahi-s6
+@s6 bluez-s6
+@s6 connman-s6
+@s6 ntp-s6
+@s6 lightdm-s6
 
 librabbitmq-c
 libmongoc
 
 terminus-font
-ttf-bitstream-vera
-ttf-dejavu
 ttf-droid
+ttf-roboto
+ttf-roboto-mono
 ttf-inconsolata
-ttf-indic-otf
 ttf-liberation
 
 xdg-user-dirs
@@ -140,7 +137,39 @@ xf86-video-vmware
 xf86-video-voodoo
 
 artix-mate-presets
+artix-grub-theme
 
+xcursor-premium
+
+# MATE main
+mate
+# MATE extra
+atril
+caja-image-converter
+caja-open-terminal
+caja-sendto
+caja-wallpaper
+caja-xattr-tags
+engrampa
+eom
+mate-applets
+mate-icon-theme-faenza
+mate-media
+mate-netbook
+mate-power-manager
+mate-screensaver
+mate-sensors-applet
+mate-system-monitor
+mate-terminal
+mate-utils
+mozo
+
+# Basic usability apps
 light-locker
 lightdm-gtk-greeter
 connman-gtk
+midori
+hexchat
+mpv
+neofetch
+leafpad

mate/live-overlay

@@ -1 +1 @@
-../base/root-overlay
+..//lxqt/live-overlay

mate/profile.conf

@@ -5,10 +5,10 @@
 DISPLAYMANAGER="lightdm"
 
 # Set to false to disable autologin in the livecd
-# AUTOLOGIN="true"
+AUTOLOGIN="true"
 
 # start services
-SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connman')
+SERVICES=('acpid' 'bluetooth' 'cronie' 'cupsd' 'syslog-ng' 'connmand')
 
 # default group membership
 ADDGROUPS="video,power,storage,optical,network,lp,scanner,wheel,users,log"

mate/root-overlay/etc/bash/bashrc.d/local.bashrc

@@ -0,0 +1,38 @@
+# Artix bash customization
+# Most by nous, a couple kanged from the internets
+
+# are we an interactive shell?
+if [ "$PS1" ]; then
+    shopt -s cdspell checkwinsize histappend no_empty_cmd_completion dotglob
+    shopt -u huponexit
+fi
+
+# Show effective user in prompts and terminal titles
+USER=`id -un`
+
+alias psa='ps a'
+# handy Perl one-liner for calculations: calc 5*12+5/8^2
+alias calc='perl -e '\''$_="@ARGV";s/\^/**/g;y/x/*/;print eval $_, "\n"'\'''
+# Replace all spaces in current directory's filenames with underscores
+alias nospaces='i=0; for f in *\ *; do mv ./"$f" `echo "$f" | sed s/\ /_/g` ; let i++ ; done ; echo $i file\(s\) renamed'
+# Same with parentheses
+alias noparentheses='i=0; for f in *\(*; do mv ./"$f" `echo "$f" | sed s/\(//g | sed s/\)//g` ; let i++; done; echo $i file\(s\) renamed'
+alias rot13='tr A-Za-z N-ZA-Mn-za-m'
+alias rot47='tr !-~ P-~!-O'
+
+# Virtualbox in dark themes is ugly with every QT_STYLE_OVERRIDE setting except kvantum-dark
+alias VirtualBox='QT_STYLE_OVERRIDE=kvantum-dark virtualbox'
+alias virtualbox='QT_STYLE_OVERRIDE=kvantum-dark virtualbox'
+
+# No clobber, use >| instead of >
+set -C
+
+# Users generally won't see annoyng core files
+ulimit -c 0
+[ "${EUID}" = "0" ] && ulimit -S -c 1000000 > /dev/null 2>&1
+
+# Make a nice prompt
+[ "${EUID}" = "0" ] && export PS1="\[\033[1;32;40m\]\h\[\033[0;37;40m\]:\[\033[34;40m\][\[\033[1;31;40m\]\u\[\033[0;34;40m\]]\[\033[0;37;40m\]:\[\033[35;40m\]\w\[\033[1;33;40m\]#\[\033[0m\] " \
+                    || export PS1="\[\033[1;32;40m\]\h\[\033[0;37;40m\]:\[\033[31;40m\][\[\033[1;34;40m\]\u\[\033[0;31;40m\]]\[\033[0;37;40m\]:\[\033[35;40m\]\w\[\033[1;33;40m\]%\[\033[0m\] "
+
+echo

mate/root-overlay/etc/default/grub

@@ -0,0 +1,50 @@
+GRUB_DEFAULT="0"
+GRUB_TIMEOUT="3"
+GRUB_DISTRIBUTOR="Artix"
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
+GRUB_CMDLINE_LINUX="net.ifnames=0 cryptkey=rootfs:/crypto_keyfile.bin"
+
+# Preload both GPT and MBR modules so that they are not missed
+GRUB_PRELOAD_MODULES="part_gpt part_msdos"
+
+# Uncomment to enable Hidden Menu, and optionally hide the timeout count
+#GRUB_HIDDEN_TIMEOUT="5"
+#GRUB_HIDDEN_TIMEOUT_QUIET="true"
+
+# Uncomment to use basic console
+GRUB_TERMINAL_INPUT="console"
+
+# Uncomment to disable graphical terminal
+#GRUB_TERMINAL_OUTPUT="console"
+
+# The resolution used on graphical terminal
+# note that you can use only modes which your graphic card supports via VBE
+# you can see them in real GRUB with the command `vbeinfo'
+#GRUB_GFXMODE="1680x1050x8"
+GRUB_GFXMODE=auto
+
+# Uncomment to allow the kernel use the same resolution used by grub
+GRUB_GFXPAYLOAD_LINUX="keep"
+
+# Uncomment if you want GRUB to pass to the Linux kernel the old parameter 
+# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx" 
+GRUB_DISABLE_LINUX_UUID="true"
+
+# Uncomment to disable generation of recovery mode menu entries
+GRUB_DISABLE_RECOVERY="true"
+
+# Uncomment and set to the desired menu colors.  Used by normal and wallpaper 
+# modes only.  Entries specified as foreground/background.
+export GRUB_COLOR_NORMAL="light-blue/black"
+export GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
+
+# Uncomment one of them for the gfx desired, a image background or a gfxtheme
+#GRUB_BACKGROUND="/path/to/wallpaper"
+GRUB_THEME="/usr/share/grub/themes/artix/theme.txt"
+
+# Uncomment to get a beep at GRUB start
+#GRUB_INIT_TUNE="480 440 1"
+
+GRUB_SAVEDEFAULT="true"
+
+GRUB_DISABLE_LINUX_RECOVERY="true"

mate/root-overlay/etc/hosts

@@ -0,0 +1 @@
+127.0.0.1	localhost artix

mate/root-overlay/etc/lightdm/lightdm.conf

@@ -126,7 +126,7 @@ session-wrapper=/etc/lightdm/Xsession
 autologin-user=artix
 #autologin-user-timeout=0
 #autologin-in-background=false
-autologin-session=LXDE
+autologin-session=mate
 #exit-on-failure=false
 
 #

mate/root-overlay/etc/local.d/mkinitcpio.start

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# 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*
+    sed -i 's|encrypt||' /etc/mkinitcpio.conf*
+    sed -i 's|cryptkey=rootfs:/crypto_keyfile.bin||' /etc/default/grub /boot/grub/grub.cfg
+fi
+
+rm -f /etc/local.d/mkinitcpio.start

mate/root-overlay/etc/rc.local

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+neofetch >| /etc/issue
+
+# Enable kernel's Magic SysRq
+sysctl -q kernel.sysrq=1 &
+
+# Remove possible stale lockfile
+rm -f /var/lib/pacman/db.lck &