resolve conflicts

openbox/rootfs/etc/skel/.config/tint2/tint2rc

@@ -134,7 +134,7 @@ launcher_tooltip = 0
 launcher_item_app = /usr/share/applications/midori.desktop
 launcher_item_app = /usr/share/applications/spacefm.desktop
 launcher_item_app = /usr/share/applications/geany.desktop
-launcher_item_app = /usr/share/applications/terminator.desktop
+launcher_item_app = /usr/share/applications/sakura.desktop
 
 #-------------------------------------
 # Clock

openbox/rootfs/etc/skel/Desktop/README

@@ -14,7 +14,7 @@ LOGIN AND PASSWORD
 ------------------
 
 root login : root
-user login : obarun
+user login : oblive
 root password : toor
 obarun password : toor
 

plasma/customizeChroot

@@ -49,14 +49,33 @@ 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_66(){
+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
 
-    # creation of the live/ to avoid crash
-    mkdir -p -m1777 /run/66
+config_66(){
 
-    out_action "Create, enable tree [system]"
+    out_action "Create and enable tree [system]"
     66-tree -v3 -nE system
 
     out_action "Enable ntpd,sshd on tree [system]"
@@ -67,17 +86,12 @@ config_66(){
 
     out_action "Enable dbus,networkmanager,wpa_supplicant services,sddm on tree [desktop]"
     66-enable -v3 -t desktop dbus networkmanager wpa_supplicant sddm
-
-    # avoid permissions access issue
-    chown -R ${NEWUSER}:users /run/66
-
-    out_action "For ${NEWUSER}: Create, enable tree [gui] with flag current"
+    
+    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"
-
-    rm -rf /run/66
 }
 custo_once config_66
 
@@ -110,10 +124,9 @@ 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 startkde
+#exec ck-launch-session startkde
 EOF"
 }
 custo_once config_user
 
 out_valid "Customization terminate"
-

plasma/package_list/base_obarun

@@ -8,19 +8,18 @@
 #---------
 
 66
-applysys
-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
-elogind
 eudev
 sudo
 
@@ -30,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
 #--------------------
@@ -38,18 +45,13 @@ unrar
 unzip
 p7zip
 
-#---------------
-## file manager
-#---------------
-
-# mc
-
-#--------------
-## text editor
-#--------------
+#----------------------------
+## text editor / file manager
+#----------------------------
 
 # nano
 # vi
+# mc
 
 #-------------
 ## dvc system
@@ -57,6 +59,12 @@ p7zip
 
 # git
 
+#---------------
+## data recovery
+#---------------
+
+# testdisk
+
 #--------------
 ## 66 services
 #--------------
@@ -75,4 +83,5 @@ sddm-66serv
 
 # dhcpcd-66serv
 # dmraid-66serv
+# haveged-66serv
 # nfs-utils-66serv

plasma/package_list/desktop

@@ -142,13 +142,6 @@ user-manager
 # simplescreenrecorder
 # obs-studio
 
-#---------------------
-## Other applications
-#---------------------
-
-# firefox
-# thunderbird
-
 #--------
 ## fonts
 #--------

plasma/pacman.conf

@@ -24,6 +24,7 @@ Architecture = auto
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 IgnorePkg   = systemd
 IgnorePkg   = libsystemd
+IgnorePkg   = systemd-libs
 #IgnoreGroup =
 
 #NoUpgrade   =
@@ -76,18 +77,22 @@ Server = https://repo.obarun.org/66-repo
 #SigLevel = Required
 #Server = https://repo.obarun.org/obcore/testing/
 
-[obextra-testing]
-SigLevel = Required
-Server = https://repo.obarun.org/obextra/testing
-
 [obcore]
 SigLevel = Required
 Server = https://repo.obarun.org/obcore
 
+#[obextra-testing]
+#SigLevel = Required
+#Server = https://repo.obarun.org/obextra/testing
+
 [obextra]
 SigLevel = Required
 Server = https://repo.obarun.org/obextra
 
+[observice]
+SigLevel = Required
+Server = https://repo.obarun.org/observice
+
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 
@@ -111,5 +116,3 @@ Include = /etc/pacman.d/mirrorlist
 
 #[multilib]
 #Include = /etc/pacman.d/mirrorlist
-
-

plasma/rootfs/etc/obarun/install.conf

+# Copyright (c) 2015-2019 Eric Vidal <eric@obarun.org>
+# All rights reserved.
+# 
+# This file is part of Obarun. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution.
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+##################
+## Main variable
+##################
+
+# allow to update the obarun-install script when it launched [yes|no]
+UPDATE_INS="yes"
+
+# allow to update the obarun-install-themes script when it launched [yes|no]
+UPDATE_TPL="yes"
+
+# Be more/less verbose
+# 1 for more, 0 for less
+DEBUG=0
+
+# git source of obarun-install package 
+GIT_ADDR="https://framagit.org/Obarun/obarun-install.git"
+
+# git source of obarun-install-themes package 
+GIT_ADDR_THEMES="https://framagit.org/Obarun/obarun-install-themes.git"
+
+# git branch to use, if not set master is took by default
+BRANCH=""
+
+# git branch to use for obarun-install-themes, if not set master is took by default
+THEMES_BRANCH=""
+
+# gpg directory used during the installation
+GPG_DIR="/var/lib/obarun/gnupg"
+
+# editor used during the installation
+EDITOR="mcedit"
+
+# valid mountpoint for installation
+NEWROOT="/mnt"
+
+# configuration files directory used for the installation
+CONFIG_DIR="plasma"
+
+# cache directory used during the installation
+CACHE_DIR="/var/cache/pacman/pkg"
+
+# use rankmirrors to find the fastest local mirror
+# expected value are yes or no without uppercase
+RANKMIRRORS="no"
+
+#########################
+## Customization variable
+#########################
+
+# define name of the host for the new installation 
+HOSTNAME="Ob66"
+
+# define the locale for the new installation
+LOCALE="en_US.UTF-8"
+
+# define the zone for the new installation e.g Europe 
+ZONE="GMT"
+
+# define the subzone for the new installation e.g. Londres 
+SUBZONE=""
+
+# define the keymap for the console for the new installation
+KEYMAP="us"
+
+# define the keymap for the Desktop for the new installation
+XKEYMAP="us"
+
+# define the name for a new user for the new installation
+NEWUSER="oblive"

plasma/rootfs/etc/pacman.conf

-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-IgnorePkg   = systemd
-IgnorePkg   = libsystemd
-#IgnoreGroup =
-
-#NoUpgrade   =
-NoExtract   = /usr/lib/libsystemd*.*  
-
-# Misc options
-#UseSyslog
-Color
-TotalDownload
-CheckSpace
-VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel = Required DatabaseOptional 
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[66]
-SigLevel = Required 
-Server = https://repo.obarun.org/66-repo
-
-#[obcore-testing]
-#SigLevel = Required
-#Server = https://repo.obarun.org/obcore/testing/
-
-[obextra-testing]
-SigLevel = Required
-Server = https://repo.obarun.org/obextra/testing
-
-[obcore]
-SigLevel = Required
-Server = https://repo.obarun.org/obcore
-
-[obextra]
-SigLevel = Required
-Server = https://repo.obarun.org/obextra
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
-
-

xfce4/package_list/base_utilities

@@ -46,6 +46,7 @@ wpa_supplicant
 obarun-install
 obarun-install-themes
 pacopts
+obnews
 
 #-------------------
 ## fonts

xfce4/package_list/desktop

@@ -68,7 +68,7 @@ parole
 polkit-gnome
 scrot
 spacefm
-terminator 
+sakura 
 udevil 
 volumeicon
 xarchiver-gtk2

xfce4/pacman.conf

@@ -24,6 +24,7 @@ Architecture = auto
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 IgnorePkg   = systemd
 IgnorePkg   = libsystemd
+IgnorePkg   = systemd-libs
 #IgnoreGroup =
 
 #NoUpgrade   =
@@ -76,18 +77,22 @@ Server = https://repo.obarun.org/66-repo
 #SigLevel = Required
 #Server = https://repo.obarun.org/obcore/testing/
 
-#[obextra-testing]
-#SigLevel = Required
-#Server = https://repo.obarun.org/obextra/testing
-
 [obcore]
 SigLevel = Required
 Server = https://repo.obarun.org/obcore
 
+#[obextra-testing]
+#SigLevel = Required
+#Server = https://repo.obarun.org/obextra/testing
+
 [obextra]
 SigLevel = Required
 Server = https://repo.obarun.org/obextra
 
+[observice]
+SigLevel = Required
+Server = https://repo.obarun.org/observice
+
 #[testing]
 #Include = /etc/pacman.d/mirrorlist
 

xfce4/rootfs/etc/obarun/install.conf

+# Copyright (c) 2015-2019 Eric Vidal <eric@obarun.org>
+# All rights reserved.
+# 
+# This file is part of Obarun. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution.
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+##################
+## Main variable
+##################
+
+# allow to update the obarun-install script when it launched [yes|no]
+UPDATE_INS="yes"
+
+# allow to update the obarun-install-themes script when it launched [yes|no]
+UPDATE_TPL="yes"
+
+# Be more/less verbose
+# 1 for more, 0 for less
+DEBUG=0
+
+# git source of obarun-install package 
+GIT_ADDR="https://framagit.org/Obarun/obarun-install.git"
+
+# git branch to use, if not set master is took by default
+BRANCH=""
+
+# gpg directory used during the installation
+GPG_DIR="/var/lib/obarun/gnupg"
+
+# editor used during the installation
+EDITOR="mcedit"
+
+# valid mountpoint for installation
+NEWROOT="/mnt"
+
+# configuration files directory used for the installation
+CONFIG_DIR="xfce4"
+
+# cache directory used during the installation
+CACHE_DIR="/var/cache/pacman/pkg"
+
+# use rankmirrors to find the fastest local mirror
+# expected value are yes or no without uppercase
+RANKMIRRORS="no"
+
+#########################
+## Customization variable
+#########################
+
+# define name of the host for the new installation 
+HOSTNAME="Ob66"
+
+# define the locale for the new installation
+LOCALE="en_US.UTF-8"
+
+# define the zone for the new installation e.g Europe 
+ZONE="GMT"
+
+# define the subzone for the new installation e.g. Londres 
+SUBZONE=""
+
+# define the keymap for the console for the new installation
+KEYMAP="us"
+
+# define the keymap for the Desktop for the new installation
+XKEYMAP="us"
+
+# define the name for a new user for the new installation
+NEWUSER="oblive"

xfce4/rootfs/etc/pacman.conf

-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-IgnorePkg   = systemd
-IgnorePkg   = libsystemd
-#IgnoreGroup =
-
-#NoUpgrade   =
-NoExtract   = /usr/lib/libsystemd*.*  
-
-# Misc options
-#UseSyslog
-Color
-TotalDownload
-CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel = Required DatabaseOptional 
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[66]
-SigLevel = Required 
-Server = https://repo.obarun.org/66-repo
-
-#[obcore-testing]
-#SigLevel = Required
-#Server = https://repo.obarun.org/obcore/testing/
-
-#[obextra-testing]
-#SigLevel = Required
-#Server = https://repo.obarun.org/obextra/testing
-
-[obcore]
-SigLevel = Required
-Server = https://repo.obarun.org/obcore
-
-[obextra]
-SigLevel = Required
-Server = https://repo.obarun.org/obextra
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-
-#[multilib-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-#[multilib]
-#Include = /etc/pacman.d/mirrorlist
-
-