resolve conflict

plasma/customizeChroot

@@ -49,7 +49,29 @@ create_log_user(){
     out_action "add ${NEWUSER} at log group"
     gpasswd -a "$NEWUSER" log
 }
-custo_once create_log_user 
+custo_once create_log_user
+
+config_vguest(){
+    exec 2>/dev/null
+
+    file="virtualbox-guest-utils"
+
+    if [ "$(pacman -Qe virtualbox-guest-utils | grep -o virtualbox-guest-utils)" = "$file" ] ; then
+    echo "Package "$file" was found."
+
+    out_action "Create 'modules-load.d' directory"
+    mkdir /etc/modules-load.d
+
+    out_action "Create vbox.conf file"
+    cat > /etc/modules-load.d/vbox.conf <<EOF
+vboxsf
+vboxvideo
+EOF
+    else
+    echo "package "$file" was not found"
+    fi
+}
+custo_once config_vguest
 
 config_66(){
 
@@ -59,20 +81,52 @@ config_66(){
     out_action "Enable ntpd,sshd on tree [system]"
     66-enable -v3 -t system ntpd sshd
 
-    out_action "Create, enable and set flag default on tree [desktop]"
+    out_action "Create, enable tree [desktop] with flag current"
     66-tree -v3 -nEc desktop
 
-    out_action "Enable dbus,networkmanager,wpa_supplicant services on tree [desktop]"
-    66-enable -v3 -t desktop dbus networkmanager wpa_supplicant
+    out_action "Enable dbus,networkmanager,wpa_supplicant services,sddm on tree [desktop]"
+    66-enable -v3 -t desktop dbus networkmanager wpa_supplicant sddm
+    
+    out_action "For ${NEWUSER}: Create, enable tree [gui] and set as current"
+    su "${NEWUSER}" -c "66-tree -v3 -nEc gui"
+
+    out_action "Enable dbus-user and xdg-user-dirs on tree [gui]"
+    su "${NEWUSER}" -c "66-enable -v3 -t gui dbus-user xdg-user-dirs"
+}
+custo_once config_66
 
-    out_action "Create tree graphics for ${NEWUSER}, enables and makes it current"
-    su "${NEWUSER}" -c "66-tree -v3 -Ecn graphics"
+config_user(){
 
-    out_action "Enable dbus-user and xdg-user-dirs on tree graphics"
-    su "${NEWUSER}" -c "66-enable -v3 -t graphics dbus-user xdg-user-dirs"
+    out_action "Create ${NEWUSER} .scandir file"
+    su "${NEWUSER}" -c "cat > /home/${NEWUSER}/.scandir <<EOF
+#!/usr/bin/execlineb -P
+#emptyenv -p
+s6-setsid -qb --
+umask 022
 
+66-scandir -v3 -cu
+EOF"
+    out_action "Set 750 permissions on .scandir file"
+    su "${NEWUSER}" -c "chmod 750 /home/${NEWUSER}/.scandir"
+    
+    out_action "Create ${NEWUSER} .zprofile file"
+    su "${NEWUSER}" -c "cat > /home/${NEWUSER}/.zprofile <<EOF
+## Execute scandir script
+## Send a down signal, or 'could not sync environment to dbus' with sddm when user logout/login 
+## Send an up signal for services inside tree [gui]
+
+(.scandir &) &
+66-all -t gui down
+sleep 01
+66-all -t gui up
+EOF"
+
+    out_action "Create ${NEWUSER} .xinitrc file"
+    su "${NEWUSER}" -c "cat > /home/${NEWUSER}/.xinitrc <<EOF
+## Uncomment if you use startx command line to launch plasma DE
+#exec ck-launch-session startkde
+EOF"
 }
-custo_once config_66
+custo_once config_user
 
 out_valid "Customization terminate"
-

plasma/package_list/base_obarun

@@ -8,19 +8,19 @@
 #---------
 
 66
-applysys
-eudev
-execline
-obarun-keyring
-obarun-zsh
-oblibs
 s6
+s6-rc
 s6-linux-utils
 s6-portable-utils
-s6-rc
+oblibs
 skalibs
+execline
+applysys
+obarun-keyring
+obarun-zsh
 zsh
 zsh-completions
+eudev
 sudo
 
 #-----------------
@@ -29,6 +29,14 @@ sudo
 
 htop
 
+#------------------------------------------------
+## entropy 
+## run: cat /proc/sys/kernel/random/entropy_avail
+## if it is rather low (<1000), install haveged.
+#------------------------------------------------ 
+
+# haveged
+
 #--------------------
 ## archive utilities
 #--------------------
@@ -37,18 +45,13 @@ unrar
 unzip
 p7zip
 
-#---------------
-## file manager
-#---------------
-
-# mc
-
-#--------------
-## text editor
-#--------------
+#----------------------------
+## text editor / file manager
+#----------------------------
 
 # nano
 # vi
+# mc
 
 #-------------
 ## dvc system
@@ -56,6 +59,12 @@ p7zip
 
 # git
 
+#---------------
+## data recovery
+#---------------
+
+# testdisk
+
 #--------------
 ## 66 services
 #--------------
@@ -67,12 +76,13 @@ ntpd-66serv
 sshd-66serv
 
 dbus-66serv
+consolekit-66serv
 networkmanager-66serv
 wpa_supplicant-66serv
 xdg-user-dirs-66serv
-consolekit-66serv
+sddm-66serv
 
-# sddm-66serv
 # dhcpcd-66serv
 # dmraid-66serv
+# haveged-66serv
 # nfs-utils-66serv