base:

* fix runit openssh
* rm zd firmware

Makefile

@@ -1,4 +1,4 @@
-VERSION=0.7
+VERSION=0.8
 
 PKG = iso-profiles
 TOOLS = artools
@@ -42,13 +42,6 @@ LXQT = \
 LXQT_DM = \
 	lxqt/desktop-overlay/etc/sddm.conf
 
-LXDE = \
-	$(wildcard lxde/Packages-*) \
-	lxde/profile.conf
-
-LXDE_DM = \
-	$(wildcard lxde/desktop-overlay/etc/lightdm/*.conf)
-
 install-base:
 	install $(DMODE) $(DESTDIR)$(BASEDIR)
 	install $(FMODE) $(BASE) $(DESTDIR)$(BASEDIR)
@@ -71,12 +64,6 @@ install-lxqt:
 	install $(DMODE)  $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)
 	install $(FMODE) $(LXQT_DM) $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)
 
-install-lxde:
-	install $(DMODE) $(DESTDIR)$(LXDEDOR)
-	install $(FMODE) $(LXDE) $(DESTDIR)$(LXDEDOR)
-	install $(DMODE)  $(DESTDIR)$(LXDEDOR)$(SYSCONFDIR)/lightdm
-	install $(FMODE) $(LXDE_DM) $(DESTDIR)$(LXDEDOR)$(SYSCONFDIR)/lightdm
-
 uninstall-base:
 	for f in $(notdir $(BASE)); do $(RM) $(DESTDIR)$(BASEDIR)/$$f; done
 	for f in $(notdir $(LIVE)); do $(RM) $(DESTDIR)$(OVERLAYDIR)/$$f; done
@@ -90,17 +77,13 @@ uninstall-lxqt:
 	for f in $(notdir $(LXQT_DM)); do $(RM) $(DESTDIR)$(LXQTDIR)$(SYSCONFDIR)/$$f; done
 	$(RMD) $(DESTDIR)$(LXQTDIR)
 
-uninstall-lxde:
-	for f in $(notdir $(LXDE)); do $(RM) $(DESTDIR)$(LXDEDOR)/$$f; done
-	for f in $(notdir $(LXDE_DM)); do $(RM) $(DESTDIR)$(LXDEDOR)$(SYSCONFDIR)/lightdm/$$f; done
-	$(RMD) $(DESTDIR)$(LXDEDOR)
+install: install-lxqt install-base
 
-install: install-lxqt install-lxde install-base
-
-uninstall: uninstall-lxqt uninstall-lxde uninstall-base
+uninstall: uninstall-lxqt uninstall-base
 
 dist:
 	git archive --format=tar --prefix=$(PKG)-$(VERSION)/ $(VERSION) | gzip -9 > $(PKG)-$(VERSION).tar.gz
 	gpg --detach-sign --use-agent $(PKG)-$(VERSION).tar.gz
 
-.PHONY: install uninstall dist
+.PHONY: install uninstall dist install-lxqt install-base uninstall-lxqt uninstall-base
+

base/Packages-Live

@@ -5,3 +5,11 @@ nbd
 >openrc artix-live-openrc
 >runit artix-live-runit
 artix-live-portable-efi
+
+>openrc networkmanager-openrc
+>openrc ntp-openrc
+>openrc bluez-openrc
+
+>runit networkmanager-runit
+>runit ntp-runit
+>runit bluez-runit

base/Packages-Root

@@ -32,7 +32,7 @@ iputils
 ipw2100-fw
 ipw2200-fw
 jfsutils
-KERNEL
+linux
 less
 licenses
 linux-firmware
@@ -45,7 +45,6 @@ mkinitcpio-openswap
 nano
 net-tools
 ntfs-3g
-artix-sysvcompat
 >openrc acpid-openrc
 >openrc cronie-openrc
 >openrc cryptsetup-openrc
@@ -55,8 +54,9 @@ artix-sysvcompat
 >openrc mdadm-openrc
 >openrc nfs-utils-openrc
 >openrc rsync-openrc
+>openrc openssh-openrc
 >openrc wpa_supplicant-openrc
->runit runit
+>openrc syslog-ng-openrc
 >runit acpid-runit
 >runit cronie-runit
 >runit dhcpcd-runit
@@ -65,7 +65,10 @@ artix-sysvcompat
 >runit mdadm-runit
 >runit nfs-utils-runit
 >runit rsync-runit
+>runit openssh-runit
 >runit wpa_supplicant-runit
+>runit syslog-ng-runit
+artix-sysvcompat
 os-prober
 pacman
 pciutils
@@ -86,5 +89,4 @@ util-linux
 which
 efibootmgr
 xfsprogs
-zd1211-firmware
 zsh

lxde/Packages-Desktop

@@ -1,70 +0,0 @@
-gpicview-gtk3
-lxappearance-gtk3
-lxappearance-obconf-gtk3
-lxde-common
-lxde-icon-theme
-lxhotkey-gtk3
-lxinput-gtk3
-lxlauncher-gtk3
-lxmusic-gtk3
-lxpanel-gtk3
-lxrandr-gtk3
-lxsession-gtk3
-lxtask-gtk3
-lxterminal
-openbox
-pcmanfm-gtk3
-compton
-gvfs
-inxi
-file-roller
-gedit
-
-#lxdm-gtk3
-lightdm-gtk-greeter
-
-artix-lxde-presets
-alsa-firmware
-
-media-player-info
-mobile-broadband-provider-info
-modemmanager
-network-manager-applet
-nss-mdns
->openrc alsa-utils-openrc
->openrc avahi-openrc
->openrc displaymanager-openrc
->openrc json-c
->openrc networkmanager-openrc
->openrc ntp-openrc
->openrc openrc-settingsd
->openrc openssh-openrc
->openrc syslog-ng-openrc
-powertop
-terminus-font
-ttf-bitstream-vera
-ttf-dejavu
-ttf-droid
-ttf-inconsolata
-ttf-indic-otf
-ttf-liberation
-xdg-user-dirs
-xdg-utils
-xorg-server
-xorg-twm
-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
-librabbitmq-c
-libmongoc
-python

lxde/Packages-Live

@@ -1,16 +0,0 @@
-mkinitcpio-nfs-utils
-squashfs-tools
-nbd
-
->openrc artix-live-openrc
->runit artix-live-runit
-artix-live-portable-efi
-
-calamares
-gparted
-#orca
-
-virtualbox-guest-modules-artix
-virtualbox-guest-utils
-open-vm-tools
-broadcom-wl

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

@@ -1,65 +0,0 @@
-# LightDM GTK+ Configuration
-# Available configuration options listed below.
-#
-# Appearance:
-#  theme-name = GTK+ theme to use
-#  icon-theme-name = Icon theme to use
-#  cursor-theme-name = Cursor theme to use
-#  cursor-theme-size = Cursor size to use
-#  background = Background file to use, either an image path or a color (e.g. #772953)
-#  user-background = false|true ("true" by default)  Display user background (if available)
-#  transition-duration = Length of time (in milliseconds) to transition between background images ("500" by default)
-#  transition-type = ease-in-out|linear|none  ("ease-in-out" by default)
-#
-# Fonts:
-#  font-name = Font to use
-#  xft-antialias = false|true  Whether to antialias Xft fonts
-#  xft-dpi = Resolution for Xft in dots per inch (e.g. 96)
-#  xft-hintstyle = none|slight|medium|hintfull  What degree of hinting to use
-#  xft-rgba = none|rgb|bgr|vrgb|vbgr  Type of subpixel antialiasing
-#
-# Login window:
-#  active-monitor = Monitor to display greeter window (name or number). Use #cursor value to display greeter at monitor with cursor. Can be a semicolon separated list
-#  position = x y ("50% 50%" by default)  Login window position
-#  default-user-image = Image used as default user icon, path or #icon-name
-#  hide-user-image = false|true ("false" by default)
-#
-# Panel:
-#  panel-position = top|bottom ("top" by default)
-#  clock-format = strftime-format string, e.g. %H:%M
-#  indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power", "~clock", "~host", "~spacer". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path
-#
-# Accessibility:
-#  a11y-states = states of accessibility features: "name" - save state on exit, "-name" - disabled at start (default value for unlisted), "+name" - enabled at start. Allowed names: contrast, font, keyboard, reader.
-#  keyboard = command to launch on-screen keyboard (e.g. "onboard")
-#  keyboard-position = x y[;width height] ("50%,center -0;50% 25%" by default)  Works only for "onboard"
-#  reader = command to launch screen reader (e.g. "orca")
-#  at-spi-enabled = false|true ("true" by default) Enables accessibility at-spi-command if the greeter is built with it enabled
-#
-# Security:
-#  allow-debugging = false|true ("false" by default)
-#  screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen
-#
-# Template for per-monitor configuration:
-#  [monitor: name]
-#  background = overrides default value
-#  user-background = overrides default value
-#  laptop = false|true ("false" by default) Marks monitor as laptop display
-#  transition-duration = overrides default value
-#
-[greeter]
-background=/usr/share/backgrounds/Artix_wallpaper.png
-#user-background=
-#theme-name=
-#icon-theme-name=
-#font-name=
-#xft-antialias=
-#xft-dpi=
-#xft-hintstyle=
-#xft-rgba=
-#indicators=
-#clock-format=
-#keyboard=
-#reader=
-#position=
-#screensaver-timeout=

lxde/desktop-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=example-gtk-gnome
-#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=
-#autologin-user-timeout=0
-#autologin-in-background=false
-#autologin-session=
-#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/desktop-overlay/etc/pam.d/lightdm-greeter

@@ -1,17 +0,0 @@
-#%PAM-1.0
-
-# Load environment from /etc/environment and ~/.pam_environment
-auth      required pam_env.so
-
-# Always let the greeter start without authentication
-auth      required pam_permit.so
-
-# No action required for account management
-account   required pam_permit.so
-
-# Can't change password
-password  required pam_deny.so
-
-# Setup session
-session   required pam_unix.so
-session   optional pam_elogind.so

lxde/profile.conf

@@ -1,28 +0,0 @@
-################ 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' 'NetworkManager')
-
-# default group membership
-# addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,log"
-
-# calamares netgroups
-# netgroups_url="https://raw.githubusercontent.com/artix-linux/netgroups/master"
-
-################# live-session #################
-
-# unset defaults to given value
-# hostname="artix"
-
-# unset defaults to given value
-# username="artix"
-
-# unset defaults to given value
-# password="artix"

lxqt/Packages-Desktop

@@ -16,8 +16,6 @@ nss-mdns
 >openrc networkmanager-openrc
 >openrc ntp-openrc
 >openrc openrc-settingsd
->openrc openssh-openrc
->openrc syslog-ng-openrc
 >openrc bluez-openrc
 
 >runit alsa-utils-runit
@@ -26,8 +24,6 @@ nss-mdns
 >runit json-c
 >runit networkmanager-runit
 >runit ntp-runit
->runit openssh-runit
->runit syslog-ng-runit
 >runit bluez-runit
 
 librabbitmq-c