remove portable efi

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"

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

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,12 +100,12 @@ 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
@@ -148,3 +146,4 @@ kwrite
 falkon
 xarchiver
 vlc
+breeze-icons

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,13 +99,13 @@ 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

mate/live-overlay

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