I am stupid

Noticed that this directory may not exist so the mount fails.

LICENSE

@@ -1,6 +1,6 @@
 BSD 2-Clause License
 
-Copyright (c) 2017, Cromnix GNU/Linux
+Copyright (c) 2018-2019, Artix Linux
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,12 +1,10 @@
-VERSION = 0.5
+VERSION = 0.8
 
 PKG = live-services
 TOOLS = artools
 
 SYSCONFDIR = /etc
-ifdef PREFIX
-PREFIX = /usr/local
-endif
+PREFIX ?= /usr
 BINDIR = $(PREFIX)/bin
 LIBDIR = $(PREFIX)/lib
 DATADIR = $(PREFIX)/share
@@ -14,10 +12,6 @@ DATADIR = $(PREFIX)/share
 FMODE = -m0644
 DMODE = -dm0755
 BMODE = -m0755
-RM = rm -f
-M4 = m4 -P
-CHAW = chmod a-w
-CHX = chmod +x
 
 BIN = \
 	bin/artix-live
@@ -39,27 +33,22 @@ RUNIT_SVD = \
 RUNIT_SV = \
 	data/runit/pacman-init.run
 
-GRUB_DEFAULT = \
-	data/grub2-portable-efi
+S6_LIVE = \
+	$(wildcard data/s6/artix-live/*)
 
-GRUB_D = \
-	data/99_zzz-portable-efi
+S6_PI = \
+	$(wildcard data/s6/pacman-init/*)
 
-all: $(BIN) $(RC) $(RUNIT_SV) $(XBIN) $(GRUB_D)
+S6_BUNDLE = \
+	$(wildcard data/s6/live/*)
 
-EDIT = sed -e "s|@datadir[@]|$(DATADIR)/$(TOOLS)|g" \
-	-e "s|@sysconfdir[@]|$(SYSCONFDIR)/$(TOOLS)|g" \
-	-e "s|@libdir[@]|$(LIBDIR)/$(TOOLS)|g"
+S6_SV = \
+	data/s6/pacman-init.run
 
-%: %.in Makefile
-	@echo "GEN $@"
-	@$(RM) "$@"
-	@$(M4) $@.in | $(EDIT) >$@
-	@$(CHAW) "$@"
-	@$(CHX) "$@"
+XDG = $(wildcard data/*.desktop)
+
+XBIN = bin/desktop-items
 
-clean:
-	$(RM) $(BIN) $(RC) $(GRUB_D)
 
 install_base:
 	install $(DMODE) $(DESTDIR)$(BINDIR)
@@ -79,40 +68,31 @@ install_runit:
 	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/rc/sysinit
 	install $(DMODE) $(DESTDIR)$(LIBDIR)/rc/sv.d
 
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
 	install $(BMODE) $(RUNIT_SVD) $(DESTDIR)$(LIBDIR)/rc/sv.d
 	ln -sf $(LIBDIR)/rc/sv.d/live $(DESTDIR)$(SYSCONFDIR)/rc/sysinit/98-live
 
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init
 	install $(BMODE) $(RUNIT_SV) $(DESTDIR)$(SYSCONFDIR)/runit/sv/pacman-init/run
 
-install_portable_efi:
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/default
-	install $(BMODE) $(GRUB_DEFAULT) $(DESTDIR)$(SYSCONFDIR)/default
+install_s6:
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv
 
-	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/grub.d
-	install $(BMODE) $(GRUB_D) $(DESTDIR)$(SYSCONFDIR)/grub.d
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init
+	install $(BMODE) $(S6_PI) $(DESTDIR)$(SYSCONFDIR)/s6/sv/pacman-init/
 
-uninstall_base:
-	for f in $(notdir $(BIN)); do $(RM) $(DESTDIR)$(BINDIR)/$$f; done
-	for f in $(notdir $(SHARED)); do $(RM) $(DESTDIR)$(DATADIR)/$(TOOLS)/$$f; done
-	for f in $(notdir $(LIBS)); do $(RM) $(DESTDIR)$(LIBDIR)/$(TOOLS)/$$f; done
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live
+	install $(BMODE) $(S6_LIVE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/artix-live/
 
-uninstall_portable_efi:
-	for f in $(notdir $(GRUB_DEFAULT)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/default/$$f; done
-	for f in $(notdir $(GRUB_D)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/grub.d/$$f; done
+	install $(DMODE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live
+	install $(BMODE) $(S6_BUNDLE) $(DESTDIR)$(SYSCONFDIR)/s6/sv/live/
 
-uninstall_rc:
-	for f in $(notdir $(RC)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/init.d/$$f; done
+install_xdg:
+	install -dm0755 $(DESTDIR)$(PREFIX)/bin
+	install -m0755 ${XBIN} $(DESTDIR)$(PREFIX)/bin
 
-uninstall_runit:
-	for f in $(notdir $(RUNIT_SV)); do $(RM) $(DESTDIR)$(SYSCONFDIR)/runit/sv/$$f; done
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
+	install -m0755 ${XDG} $(DESTDIR)$(SYSCONFDIR)/skel/.config/autostart
 
-install: install_base install_rc install_portable_efi
+install: install_base install_rc install_runit install_s6 install_xdg
 
-uninstall: uninstall_base uninstall_rc uninstall_runit uninstall_portable_efi
-
-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: all clean install uninstall dist
+.PHONY: install

bin/artix-live

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+LOGFILE='/var/log/artix-live.log'
+
+. /usr/lib/artools/util-live.sh
+
+load_live_config "/etc/artools/live.conf" || load_live_config "/usr/share/artools/live.conf"
+
+CONSOLEFONT="$(kernel_cmdline vconsole.font)"
+CONSOLEMAP="$(kernel_cmdline vconsole.font.map)"
+echo "Got consolefont ${CONSOLEFONT} and consolemap ${CONSOLEMAP}" >> "${LOGFILE}"
+
+# Activate swap
+configure_swap
+echo "Activated swap and added to fstab" >> "${LOGFILE}"
+
+configure_language
+echo "Finished localization" >> "${LOGFILE}"
+
+configure_user 'root'
+echo "Configured root user" >> "${LOGFILE}"
+
+configure_user "${USER_NAME}"
+echo "Created user ${USER_NAME} with password ${PASSWORD}" >> "${LOGFILE}"
+
+detect_desktop_env
+echo "Detected ${DEFAULT_DESKTOP_EXECUTABLE} ${DEFAULT_DESKTOP_FILE}" >> "${LOGFILE}"
+
+configure_accountsservice "${USER_NAME}"
+echo "Configured accountsservice" >> "${LOGFILE}"
+
+configure_displaymanager
+echo "Configured displaymanager" >> "${LOGFILE}"
+
+configure_branding
+echo "Configured branding" >> "${LOGFILE}"

bin/artix-live.in

@@ -1,62 +0,0 @@
-#!/bin/sh
-
-LIBDIR='@libdir@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
-LOGFILE='/var/log/artix-live.log'
-
-export LC_MESSAGES=C
-export LANG=C
-
-livetimer=$(date +%s%3N)
-
-[[ -r ${LIBDIR}/util-live.sh ]] && source ${LIBDIR}/util-live.sh
-
-load_live_config "${SYSCONFDIR}/live.conf" || load_live_config "${DATADIR}/live.conf"
-
-livetimer=$(get_timer_ms)
-detect_desktop_env
-echo "Detected ${default_desktop_executable} ${default_desktop_file}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
-CONSOLEFONT="$(kernel_cmdline vconsole.font)"
-CONSOLEMAP="$(kernel_cmdline vconsole.font.map)"
-arch=$(uname -m)
-echo "Got consolefont and arch $arch: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-# Activate swap
-livetimer=$(get_timer_ms)
-configure_swap
-echo "Activated swap and added to fstab: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
-configure_language
-echo "Finished localization: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
-configure_user
-echo "Created user ${username} with password ${password}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
-configure_sudoers_d
-echo "Configured sudoers: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-# livetimer=$(get_timer_ms)
-# configure_machine_id
-# echo "Configured machine-id: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
-configure_accountsservice "${username}"
-echo "Configured accountsservice: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
-configure_displaymanager
-echo "Configured displaymanager: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-# livetimer=$(get_timer_ms)
-# configure_calamares
-# echo "Configured calamares netinstall ${netinstall} $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
-
-livetimer=$(get_timer_ms)
-configure_user_root /
-echo "Configured root user: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"

bin/desktop-items

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Ensure the user directories are created, some DEs (MATE)
+# create them after autostart scripts are run
+xdg-user-dirs-update --force
+
+xdg=$(xdg-user-dir DESKTOP)
+src=/usr/share/applications
+
+# if [[ -f $src/org.kde.konversation.desktop ]]; then
+#     install -m644 $src/org.kde.konversation.desktop \
+#     $xdg/org.kde.konversation.desktop
+# fi
+
+if [[ -f /usr/bin/calamares ]]; then
+    cp -f $src/calamares.desktop "$xdg/"
+    sed -i s/Icon.*=calamares/Icon=artixlinux-logo/g "$xdg"/calamares.desktop
+    chmod +x "$xdg/calamares.desktop"
+fi
+
+docs=/usr/share/doc/artix
+
+for f in {Configuration,Troubleshooting}.pdf; do
+    ln -s $docs/$f "$xdg"/$f
+done
+
+if [[ -d /run/openrc ]]; then
+    ln -s $docs/OpenRC.pdf "$xdg"/OpenRC.pdf
+elif [[ -d /run/runit ]]; then
+    ln -s $docs/Runit.pdf "$xdg"/Runit.pdf
+else
+    ln -s $docs/S6.pdf "$xdg"/S6.pdf
+fi
+
+echo "live session details: /var/log/artix-live.log" > "$xdg"/README.txt

data/99_zzz-portable-efi.in

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# grub-mkconfig helper script.
-#
-# Copyright © 2014 Niall Walsh <niallwalsh@celtux.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-set -e
-
-AT_EFI_STANDALONE=""
-AT_EFI_PORTABLE_PATH="/boot/efi/EFI/BOOT"
-
-# override tool behaviour through /etc/default/grub2-fll-standalone
-if [ -r /etc/default/grub2-portable-efi ]; then
-	. /etc/default/grub2-portable-efi
-fi
-
-patt='[[:space:]]-o[[:space:]]\+/boot/grub/grub.cfg'
-# do nothing if disabled or grub-mkconfig is generating /boot/grub/grub.cfg
-( [ "${AT_EFI_STANDALONE}" != "disable" ] && \
-	ps x | grep 'grub-mkconfig[[:space:]]' | grep -q -e "${patt}[[:space:]]" -e "${patt}$" ) || exit
-
-beeb="${AT_EFI_PORTABLE_PATH}"
-if [ -e "${beeb}" ]; then
-	# do not do anything to a beeb we didn't create
-	[ ! -e "${beeb}/fullstory" ] && exit
-else
-	# create beeb and mark it as ours
-	mkdir -p "${beeb}"
-	touch "${beeb}/fullstory"
-fi
-
-for platform in i386-efi x86_64-efi ; do
-	filename="bootx64"
-	[ "${platform}" = "i386-efi" ] && filename="bootia32"
-	[ -e /usr/lib/grub/${platform} ] && grub-mkstandalone \
-		-o ${beeb}/${filename}.efi --compress=xz  -O ${platform} \
-		/boot/grub/grub.cfg=/boot/grub/grub.cfg.new 2>&1 > /dev/null
-done
-

data/desktop.map

@@ -4,15 +4,15 @@ jwm:jwm
 i3:i3
 fluxbox:startfluxbox
 pekwm:pekwm
-plasma:startkde
-gnome:gnome-session
-xfce:startxfce4
-cinnamon:cinnamon-session-cinnamon
-mate:mate-session
 enlightenment:enlightenment_start
+Lumina-DE:start-lumina-desktop
 LXDE:lxsession
+plasma:startkde
 lxqt:lxqt-session
 pantheon:pantheon-session
 budgie-desktop:budgie-desktop
 deepin:startdde
-Lumina-DE:start-lumina-desktop
+mate:mate-session
+cinnamon:cinnamon-session-cinnamon
+xfce:startxfce4
+gnome:gnome-session

data/grub2-portable-efi

@@ -1,15 +0,0 @@
-# Defaults for grub2-portable-efi update-grub helper
-# sourced by grub2's update-grub
-# installed at /etc/default/grub2-portable-efi by the maintainer scripts
-
-#
-# This is a POSIX shell fragment
-#
-
-# specify is this should be disabled (set to "disable")
-# default:
-#AT_EFI_STANDALONE=""
-
-# specify where to install the portable efi
-# default: /boot/efi/EFI/BOOT
-#AT_EFI_PORTABLE_PATH="/boot/efi/EFI/BOOT"

data/live.conf

@@ -1,20 +1,13 @@
 # live session configuration
 
 # autologin
-autologin=true
+AUTOLOGIN=true
 
 # live username
-username=artix
+USER_NAME=artix
 
 # live password
-password=artix
+PASSWORD=artix
 
 # live group membership
-addgroups='video,power,disk,storage,optical,network,lp,scanner,wheel'
-
-# default_desktop_file
-default_desktop_file=lxqt
-
-# default_desktop_executable
-default_desktop_executable=lxqt-session
-
+ADDGROUPS='video,power,cdrom,network,lp,scanner,wheel'

data/rc/gnupg-mount

@@ -1,5 +1,5 @@
 #!/usr/bin/openrc-run
-# Copyright 2015 artoo (artoo@cromnix.org)
+# Copyright 2019 artoo (artoo@artixlinux.org)
 # Distributed under the terms of the GNU General Public License v2
 
 target_dir=/etc/pacman.d/gnupg

data/s6/artix-live/type

@@ -0,0 +1 @@
+oneshot

data/s6/artix-live/up

@@ -0,0 +1,3 @@
+#!/usr/bin/execlineb -P
+if { echo "Initializing artix live system" }
+foreground { /usr/bin/artix-live }

data/s6/live/contents

@@ -0,0 +1,2 @@
+artix-live
+pacman-init

data/s6/live/type

@@ -0,0 +1 @@
+bundle

data/s6/pacman-init/down

@@ -0,0 +1,2 @@
+#!/usr/bin/execline -P
+umount -l /etc/pacman.d/gnupg

data/s6/pacman-init/type

@@ -0,0 +1 @@
+oneshot

data/s6/pacman-init/up

@@ -0,0 +1,6 @@
+#!/usr/bin/execlineb -P
+foreground { mkdir -p /etc/pacman.d/gnupg }
+foreground { mount -t tmpfs -o size=10M,mode=0755 tmpfs /etc/pacman.d/gnupg }
+fdmove -c 2 1
+foreground { pacman-key --init }
+foreground { pacman-key --populate archlinux artix }

lib/util-live.sh

@@ -9,6 +9,9 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+export LC_MESSAGES=C
+export LANG=C
+
 kernel_cmdline(){
     for param in $(cat /proc/cmdline); do
         case "${param}" in
@@ -33,43 +36,28 @@ get_tz(){
     echo $(kernel_cmdline tz)
 }
 
-get_cal_mode(){
-    echo $(kernel_cmdline netinstall)
-}
-
-get_timer_ms(){
-    echo $(date +%s%3N)
-}
-
-# $1: start timer
-elapsed_time_ms(){
-    echo $(echo $1 $(get_timer_ms) | awk '{ printf "%0.3f",($2-$1)/1000 }')
-}
-
 load_live_config(){
 
     [[ -f $1 ]] || return 1
 
-    live_conf="$1"
+    local live_conf="$1"
 
     [[ -r ${live_conf} ]] && source ${live_conf}
 
-    [[ -z ${autologin} ]] && autologin=true
+    AUTOLOGIN=${AUTOLOGIN:-true}
 
-    [[ -z ${username} ]] && username="artix"
+    USER_NAME=${USER_NAME:-"artix"}
 
-    [[ -z ${password} ]] && password="artix"
+    PASSWORD=${PASSWORD:-"artix"}
 
-    [[ -z ${addgroups} ]] && addgroups="video,power,storage,optical,network,lp,scanner,wheel,users,audio"
-
-    echo "Loaded ${live_conf}: $(elapsed_time_ms ${livetimer})ms" >> "${LOGFILE}"
+    ADDGROUPS=${ADDGROUPS:-"video,power,cdrom,network,lp,scanner,wheel,users,log"}
 
     return 0
 }
 
 is_valid_de(){
-    if [[ ${default_desktop_executable} != "none" ]] && \
-    [[ ${default_desktop_file} != "none" ]]; then
+    if [[ ${DEFAULT_DESKTOP_EXECUTABLE} != "none" ]] && \
+    [[ ${DEFAULT_DESKTOP_FILE} != "none" ]]; then
         return 0
     else
         return 1
@@ -78,21 +66,21 @@ is_valid_de(){
 
 load_desktop_map(){
     local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g" \
-        file=${DATADIR}/desktop.map
+        file=/usr/share/artools/desktop.map
     local desktop_map=$(sed "$_com_rm" "$file" | sed "$_space" | sed "$_clean")
     echo ${desktop_map}
 }
 
 detect_desktop_env(){
-    local xs=/usr/share/xsessions ex=/usr/bin key val map=( $(load_desktop_map) )
-    default_desktop_file="none"
-    default_desktop_executable="none"
+    local key val map=( $(load_desktop_map) )
+    DEFAULT_DESKTOP_FILE="none"
+    DEFAULT_DESKTOP_EXECUTABLE="none"
     for item in "${map[@]}";do
         key=${item%:*}
         val=${item#*:}
-        if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
-            default_desktop_file="$key"
-            default_desktop_executable="$val"
+        if [[ -f /usr/share/xsessions/$key.desktop ]] && [[ -f /usr/bin/$val ]];then
+            DEFAULT_DESKTOP_FILE="$key"
+            DEFAULT_DESKTOP_EXECUTABLE="$val"
         fi
     done
 }
@@ -101,7 +89,7 @@ configure_accountsservice(){
     local path=/var/lib/AccountsService/users
     if [ -d "${path}" ] ; then
         echo "[User]" > ${path}/$1
-        echo "XSession=${default_desktop_file}" >> ${path}/$1
+        echo "XSession=${DEFAULT_DESKTOP_FILE}" >> ${path}/$1
         if [[ -f "/var/lib/AccountsService/icons/$1.png" ]];then
             echo "Icon=/var/lib/AccountsService/icons/$1.png" >> ${path}/$1
         fi
@@ -122,78 +110,65 @@ configure_accountsservice(){
     done
  }
 
- set_lightdm_vt(){
-	sed -i -e 's/^.*minimum-vt=.*/minimum-vt=7/' /etc/lightdm/lightdm.conf
- }
-
 configure_displaymanager(){
     # Try to detect desktop environment
     # Configure display manager
     if [[ -f /usr/bin/lightdm ]];then
         groupadd -r autologin
-        set_lightdm_vt
+        sed -i -e 's/^.*minimum-vt=.*/minimum-vt=7/' /etc/lightdm/lightdm.conf
         set_lightdm_greeter
         if $(is_valid_de); then
-                sed -i -e "s/^.*user-session=.*/user-session=$default_desktop_file/" /etc/lightdm/lightdm.conf
+                sed -i -e "s/^.*user-session=.*/user-session=$DEFAULT_DESKTOP_FILE/" /etc/lightdm/lightdm.conf
         fi
-        if ${autologin};then
-            gpasswd -a ${username} autologin &> /dev/null
-            sed -i -e "s/^.*autologin-user=.*/autologin-user=${username}/" /etc/lightdm/lightdm.conf
+        if ${AUTOLOGIN};then
+            gpasswd -a ${USER_NAME} autologin &> /dev/null
+            sed -i -e "s/^.*autologin-user=.*/autologin-user=${USER_NAME}/" /etc/lightdm/lightdm.conf
             sed -i -e "s/^.*autologin-user-timeout=.*/autologin-user-timeout=0/" /etc/lightdm/lightdm.conf
             sed -i -e "s/^.*pam-autologin-service=.*/pam-autologin-service=lightdm-autologin/" /etc/lightdm/lightdm.conf
         fi
     elif [[ -f /usr/bin/gdm ]];then
         configure_accountsservice "gdm"
-        if ${autologin};then
-            sed -i -e "s/\[daemon\]/\[daemon\]\nAutomaticLogin=${username}\nAutomaticLoginEnable=True/" /etc/gdm/custom.conf
+        if ${AUTOLOGIN};then
+            sed -i -e "s/\[daemon\]/\[daemon\]\nAutomaticLogin=${USER_NAME}\nAutomaticLoginEnable=True/" /etc/gdm/custom.conf
         fi
     elif [[ -f /usr/bin/sddm ]];then
         if $(is_valid_de); then
-            sed -i -e "s|^Session=.*|Session=$default_desktop_file.desktop|" /etc/sddm.conf
+            sed -i -e "s|^Session=.*|Session=$DEFAULT_DESKTOP_FILE.desktop|" /etc/sddm.conf
         fi
-        if ${autologin};then
-            sed -i -e "s|^User=.*|User=${username}|" /etc/sddm.conf
+        if ${AUTOLOGIN};then
+            sed -i -e "s|^User=.*|User=${USER_NAME}|" /etc/sddm.conf
         fi
     elif [[ -f /usr/bin/lxdm ]];then
         if $(is_valid_de); then
-            sed -i -e "s|^.*session=.*|session=/usr/bin/$default_desktop_executable|" /etc/lxdm/lxdm.conf
+            sed -i -e "s|^.*session=.*|session=/usr/bin/${DEFAULT_DESKTOP_EXECUTABLE}|" /etc/lxdm/lxdm.conf
         fi
-        if ${autologin};then
-            sed -i -e "s/^.*autologin=.*/autologin=${username}/" /etc/lxdm/lxdm.conf
+        if ${AUTOLOGIN};then
+            sed -i -e "s/^.*autologin=.*/autologin=${USER_NAME}/" /etc/lxdm/lxdm.conf
         fi
     fi
 }
 
 gen_pw(){
-    echo $(perl -e 'print crypt($ARGV[0], "password")' ${password})
-}
-
-configure_user(){
-    # set up user and password
-    if [[ -n ${password} ]];then
-            useradd -m -G ${addgroups} -p $(gen_pw) -s /bin/bash ${username}
-    else
-            useradd -m -G ${addgroups} -s /bin/bash ${username}
-    fi
+    echo $(perl -e 'print crypt($ARGV[0], "password")' ${PASSWORD})
 }
 
 find_legacy_keymap(){
-    local file="${DATADIR}/kbd-model.map"
+    local file="/usr/share/artools/kbd-model.map" kt="$1"
     while read -r line || [[ -n $line ]]; do
         if [[ -z $line ]] || [[ $line == \#* ]]; then
             continue
         fi
 
-        mapping=( $line ); # parses columns
+        local mapping=( $line ); # parses columns
         if [[ ${#mapping[@]} != 5 ]]; then
             continue
         fi
 
-        if  [[ "${keytable}" != "${mapping[0]}" ]]; then
+        if  [[ "$kt" != "${mapping[0]}" ]]; then
             continue
         fi
 
-        if [[ "${mapping[3]}" = "-" ]]; then
+        if [[ "${mapping[3]}" == "-" ]]; then
             mapping[3]=""
         fi
 
@@ -212,12 +187,13 @@ write_x11_config(){
     local X11_MODEL="pc105"
     local X11_VARIANT=""
     local X11_OPTIONS="terminate:ctrl_alt_bksp"
+    local kt="$1"
 
-    find_legacy_keymap
+    find_legacy_keymap "$kt"
 
     # layout not found, use KBLAYOUT
     if [[ -z "$X11_LAYOUT" ]]; then
-        X11_LAYOUT="${keytable}"
+        X11_LAYOUT="$kt"
     fi
 
     # create X11 keyboard layout config
@@ -239,17 +215,11 @@ write_x11_config(){
 configure_language(){
     # hack to be able to set the locale on bootup
     local lang=$(get_lang)
-    keytable=$(get_keytable)
+    local keytable=$(get_keytable)
     local timezone=$(get_tz)
-    # Fallback
-#     [[ -z "${lang}" ]] && lang="en_US"
-#     [[ -z "${keytable}" ]] && keytable="us"
-#     [[ -z "${timezone}" ]] && timezone="Etc/UTC"
 
     sed -e "s/#${lang}.UTF-8/${lang}.UTF-8/" -i /etc/locale.gen
 
-    # 	echo "LANG=${lang}.UTF-8" >> /etc/environment
-
     if [[ -d /run/openrc ]]; then
         sed -i "s/keymap=.*/keymap=\"${keytable}\"/" /etc/conf.d/keymaps
     fi
@@ -257,7 +227,7 @@ configure_language(){
     echo "LANG=${lang}.UTF-8" > /etc/locale.conf
     ln -sf /usr/share/zoneinfo/${timezone} /etc/localtime
 
-    write_x11_config
+    write_x11_config "${keytable}"
 
     loadkeys "${keytable}"
 
@@ -267,23 +237,6 @@ configure_language(){
     echo "Configured timezone: ${timezone}" >> "${LOGFILE}"
 }
 
-configure_calamares(){
-    if [[ -f /usr/bin/calamares ]];then
-        netinstall=$(get_cal_mode)
-        if [[ "${netinstall}" == 'no' ]];then
-            sed -e "/- netinstall/d" \
-                -e "s|- chrootcfg|- unpackfs|" -i /etc/calamares/settings.conf
-
-            sed -e '$ d' -i /etc/calamares/modules/welcome.conf
-        fi
-    fi
-}
-
-configure_sudoers_d(){
-    echo "%wheel  ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/g_wheel
-    echo "root ALL=(ALL) ALL"  > /etc/sudoers.d/u_root
-}
-
 configure_swap(){
     local swapdev="$(fdisk -l 2>/dev/null | grep swap | cut -d' ' -f1)"
     if [ -e "${swapdev}" ]; then
@@ -291,8 +244,21 @@ configure_swap(){
     fi
 }
 
-configure_user_root(){
-    # set up root password
-    echo "root:${password}" | chroot $1 chpasswd
-    cp /etc/skel/.{bash_profile,bashrc,bash_logout} /root/
+configure_branding(){
+    if [[ -f /usr/bin/neofetch ]]; then
+        neofetch >| /etc/issue
+    fi
+}
+
+configure_user(){
+    local user="$1"
+    if [[ "$user" == 'root' ]];then
+        echo "root:${PASSWORD}" | chroot / chpasswd
+        cp /etc/skel/.{bash_profile,bashrc,bash_logout} /root/
+    else
+        local args=(-m -G ${ADDGROUPS} -s /bin/bash $user)
+        # set up user and password
+        [[ -n ${PASSWORD} ]] && args+=(-p $(gen_pw))
+        useradd "${args[@]}"
+    fi
 }