Merge branch 'dev'

LICENSE

-Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
+Copyright (c) 2015-2019 Eric Vidal <eric@obarun.org>
 All rights reserved.
 
 Permission to use, copy, modify, and/or distribute this software for any

PKGBUILD

-# Copyright (c) 2015-2018 Eric Vidal <eric@obarun.org>
+# 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
@@ -21,7 +21,6 @@ depends=(obarun-install)
 #install=
 source=("$pkgname::git+file:///var/lib/obarun/$pkgname/update_package/$pkgname")
 md5sums=(SKIP)
-validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal
 
 pkgver() {
 	cd "${pkgname}"

jwm/customizeChroot

@@ -50,44 +50,20 @@ create_log_user(){
 }
 custo_once create_log_user 
 
-##		Configure S6 service
-
-config_s6(){
-	
-	out_action "Enable syslogds6 service"
-	cp -ra /etc/s6-serv/available/classic/syslogds6 /etc/s6-serv/enabled/classic/
-	out_action "Enable dbus service"
-	cp -ra /etc/s6-serv/available/classic/dbus /etc/s6-serv/enabled/classic/
-	out_action "Enable consolekit service"
-	cp -ra /etc/s6-serv/available/classic/consolekit /etc/s6-serv/enabled/classic/
-	out_action "Enable ntpd service"
-	cp -ra /etc/s6-serv/available/classic/ntpd /etc/s6-serv/enabled/classic/
-	
-	
-	out_action "Create Live database"
-	s6opts add live bundle-Connmand bundle-Wpa-supplicant
-	s6opts add live bundle-Avahi
-	s6opts compile Live live	
-	
-	out_action "Make Live as current database"
-	rm /etc/s6-serv/enabled/rc/compiled/current
-	ln -sf /etc/s6-serv/enabled/rc/compiled/Live /etc/s6-serv/enabled/rc/compiled/current
-	
-	out_action "Create directories for user supervision tree"
-	su "${NEWUSER}" -c "s6opts user"
-	out_action "Enable dbus service for ${NEWUSER} user"
-	su "${NEWUSER}" -c "cp -ra /etc/s6-serv/available/user/classic/dbus /home/${NEWUSER}/service/enabled/classic/"
-	out_action "Create ${NEWUSER} log directory for dbus"
-	su "${NEWUSER}" -c "s6opts checklog dbus"
-	
-	out_action "Create User-live database"
-	su "${NEWUSER}" -c "s6opts add user-live xdg-user-dirs-oneshot"
-	su "${NEWUSER}" -c "s6opts compile User-live user-live"
+config_66(){
 	
-	out_action "Make User-live as current database"
-	rm /home/"${NEWUSER}"/service/enabled/rc/compiled/current
-	ln -sf /home/"${NEWUSER}"/service/enabled/rc/compiled/User-live /home/"${NEWUSER}"/service/enabled/rc/compiled/current
+	# creation of the live/ to avoid crash
+	mkdir -p -m1777 /run/66
+	out_action "Enable dbus,connmand, consolekit,wpa_supplicant and ntpd on tree root"
+	66-enable -v3 dbus ntpd consolekit connmand wpa_supplicant
+	# avoid permissions access issue
+	chown -R ${NEWUSER}:users /run/66
+	out_action "Create tree graphics for ${NEWUSER}, enables and makes it current"
+	su "${NEWUSER}" -c "66-tree -v3 -Ecn graphics"
+	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"
+	rm -rf /run/66
 }
-custo_once config_s6
+custo_once config_66
 
 out_valid "Customization terminate"

jwm/package_list/applications

-######One application per line, you can use # to comment a line, blank line are ignored
-
-##				applications
-
-asoundconf
-clipit
-connman
-connman-gtk
-compton
-epdfview
-galculator-gtk2 
-geany
-geeqie
-gmrun
-gparted 
-hexchat
-htop 
-lxrandr
-mc
-midori
-parole
-spacefm
-terminator 
-udevil 
-unrar 
-unzip 
-volumeicon
-xarchiver-gtk2
-zenity
-

jwm/package_list/base

-######One application per line, you can use # to comment a line, blank line are ignored
+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
 
-##			base 
+## Special case for applysys.
+## Need to be here to apply sysuser file,
+## at first installation.
+
+#--------------
+## system base
+#--------------
 
 applysys
 bash
 bzip2
 coreutils
 cryptsetup
-device-mapper
 dhcpcd
 diffutils
 e2fsprogs
-eudev
-file
 filesystem
-findutils
 gawk
 gcc-libs
 gettext
 glibc
-grep
-gzip
 inetutils
 iproute2
-iptables
 iputils
-jfsutils
 less
 licenses
-libgudev
 linux
-logrotate
-lvm2
+linux-firmware
 man-db
 man-pages
-mdadm
-nano
-nbd
 pacman
 pciutils
 perl
-util-linux
-libutil-linux
 procps-ng
 psmisc
-reiserfsprogs
-s-nail
-sed
 shadow
 sysfsutils
 tar
-texinfo
 usbutils
-vi
+util-linux
 which
 xfsprogs
-libusb
-mkinitcpio
-sudo
-zsh
-zsh-completions 
+

jwm/package_list/base_X

+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
+
+#-----------
+## X server
+#-----------
+
+xorg-server
+xorg-server-common
+mesa
+mesa-vdpau
+libva-mesa-driver
+opencl-mesa
+xf86-input-libinput
+xorg-font-utils 
+xorg-fonts-100dpi
+xorg-xev 
+xorg-xinit
+xorg-xprop 
+xterm 
+xcb-util-renderutil
+
+
+#------------------
+## driver for xorg
+#------------------
+
+#xf86-input-keyboard 
+#xf86-input-mouse
+#xf86-input-synaptics
+#xf86-input-vmmouse
+#xf86-input-void 
+
+#xf86-video-ati
+#xf86-video-dummy 
+#xf86-video-fbdev 
+#xf86-video-intel
+#xf86-video-nouveau
+#xf86-video-openchrome
+#xf86-video-vesa 
+#xf86-video-voodoo  

jwm/package_list/base_devel

-####One application per line, you can use # to comment a line, blank line are ignored
+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
 
-##		base-devel
+#-------------
+## base-devel
+#-------------
 
 autoconf
+autogen
 automake
 binutils
 bison
 fakeroot
+file
+findutils
 flex
+gawk
 gcc
+gettext
+grep
 groff
+gzip
 libtool
 m4
 make
 patch
 pkgconf
-
+sed
+texinfo

jwm/package_list/base_obarun

+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
+
+#---------
+## obarun
+#---------
+
+66
+applysys
+eudev
+execline
+git
+htop
+libgudev
+mc
+nano
+obarun-keyring
+obarun-zsh
+oblibs
+p7zip
+s6
+s6-linux-utils
+s6-portable-utils
+s6-rc
+skalibs
+sudo
+unrar
+unzip
+vi
+zsh
+zsh-completions
+
+#-----------
+## services
+#-----------
+
+boot-66serv
+root-66tree
+dhcpcd-66serv
+
+
+

xfce4/package_list/utilities → jwm/package_list/base_utilities

-######One application per line, you can use # to comment a line, blank line are ignored
+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
+
+
+#--------------
+## boot loader
+#--------------
 
-##				boot loader
 
 syslinux
 gptfdisk
-grub
 
-##				utilities
+#------------------
+## console browser
+#------------------
+
+lynx
+
+#------------
+## utilities
+#------------
 
-alsa-lib 
-alsa-plugins 
-alsa-tools 
-alsa-utils 
-arandr 
-arch-install-scripts
 btrfs-progs 
-colord
 crda
-consolekit2
-dbus
-ddrescue
 dmraid
 dosfstools 
-elinks 
-git
-haveged
-libatasmart
-#libbsd included for compatibility with MAC
-libbsd
 libinput
-libpulse
-libcups
-libwacom
 nfs-utils
 ntfs-3g
-numlockx 
 parted 
 perl-file-mimeinfo 
-polkit
 python
 refind-efi
-rtkit
 udisks2
-upower
 usb_modeswitch
 wget 
 wireless_tools 
 wpa_supplicant
-wvdial
-xdg-utils 
-xorg-xkill
 
-##			obarun stuff
+#-------------------
+## obarun utilities
+#-------------------
 
 obarun-install
 obarun-install-themes
 pacopts
-obarun-keyring
-obarun-zsh
 
-## 			codec
+#-------------------
+## fonts
+#-------------------
 
-gstreamer
-gst-libav
-gst-plugins-bad
-gst-plugins-base
-gst-plugins-good
-gst-plugins-ugly
+fontconfig  
+gsfonts 

jwm/package_list/desktop

-######One application per line, you can use # to comment a line, blank line are ignored
+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
 
-##			specific applications for the desktop
+#-----------
+## JWM
+#-----------
 
-gvfs
-gvfs-smb
 jwm
 xdgmenumaker
 obshutdown-git
 lxappearance
-polkit-gnome
 i3lock
 rofi
 gsimplecal
-xdg-user-dirs
+
+#-----------
+## Services
+#-----------
+
+dbus-66serv
+connmand-66serv
+consolekit-66serv
+dmraid-66serv
+ntpd-66serv
+wpa_supplicant-66serv
+xdg-user-dirs-66serv
+nfs-utils-66serv
+cupsd-66serv
+
+#-----------
+## Applications
+#-----------
+
+asoundconf
+clipit
+connman
+connman-gtk
+compton
+epdfview
+galculator-gtk2 
+geany
+geeqie
+gmrun
+gparted 
+gvfs
+gvfs-smb
+hexchat
 imagemagick
+lxrandr
+midori
+parole
+polkit-gnome
 scrot
+spacefm
+terminator 
+udevil 
+volumeicon
+xarchiver-gtk2
+xdg-user-dirs
+zenity
 
-## themes
+#-----------
+## Themes
+#-----------
 
 arc-gtk-theme
 faenza-icon-theme
@@ -24,3 +71,50 @@ hicolor-icon-theme
 gtk-update-icon-cache 
 gtk-engine-murrine
 gtk-engines
+
+#-----------
+## Fonts
+#-----------
+
+ttf-liberation
+
+#-----------
+## Utilities
+#-----------
+
+alsa-lib 
+alsa-plugins 
+alsa-tools 
+alsa-utils 
+arandr 
+arch-install-scripts
+colord
+consolekit2
+dbus
+ddrescue
+haveged
+libatasmart
+#libbsd included for compatibility with MAC
+libbsd
+libcups
+libpulse
+libwacom
+notification-daemon
+openntpd
+numlockx 
+polkit
+upower
+wvdial
+xdg-utils 
+xorg-xkill
+
+#-----------
+## Codec
+#-----------
+
+gstreamer
+gst-libav
+gst-plugins-bad
+gst-plugins-base
+gst-plugins-good
+gst-plugins-ugly

jwm/package_list/fonts

-######One application per line, you can use # to comment a line, blank line are ignored
-
-##				fonts
-
-fontconfig 
-gsfonts 
-ttf-liberation
-
-
-

jwm/package_list/s6

-######One application per line, you can use # to comment a line, blank line are ignored
-
-##				init system 
-
-s6
-s6-linux-utils
-s6-portable-utils
-s6-rc
-s6-boot
-skalibs
-execline
-s6opts
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 

jwm/package_list/server_X

-######One application per line, you can use # to comment a line, blank line are ignored
-
-##			X server
-
-xorg-server
-xorg-server-common
-mesa
-mesa-vdpau
-libva-mesa-driver
-opencl-mesa
-xf86-input-libinput
-xorg-bdftopcf 
-xorg-font-utils 
-xorg-fonts-100dpi
-xorg-xev 
-xorg-xinit
-xorg-xprop 
-xterm 
-xcb-util-renderutil
-
-
-##			driver for xorg
-
-xf86-input-synaptics
-xf86-input-vmmouse
-xf86-video-ati
-xf86-video-intel
-xf86-video-nouveau
-xf86-video-openchrome
-xf86-input-keyboard 
-xf86-input-mouse
-xf86-input-void 
-xf86-video-dummy 
-xf86-video-fbdev 
-xf86-video-vesa 
-xf86-video-voodoo 

jwm/package_list/services

-######One application per line, you can use # to comment a line, blank line are ignored
-
-avahi-s6rcserv
-dbus-s6rcserv
-dbus-s6serv
-dhcpcd-s6rcserv
-connmand-s6rcserv
-consolekit-s6serv
-dmraid-s6rcserv
-nfs-utils-s6rcserv
-ntpd-s6serv
-rtkit-s6serv
-wpa-supplicant-s6rcserv
-syslogds6-s6serv
-xdg-user-dirs-s6rcserv

jwm/package_list/utilities

-######One application per line, you can use # to comment a line, blank line are ignored
-
-##				boot loader
-
-syslinux
-gptfdisk
-grub
-
-##				utilities
-
-alsa-lib 
-alsa-plugins 
-alsa-tools 
-alsa-utils 
-arandr 
-arch-install-scripts
-btrfs-progs 
-cgmanager
-colord
-consolekit2
-crda
-dbus
-ddrescue
-dmraid
-dosfstools 
-elinks 
-git
-haveged
-libatasmart
-#libbsd included for compatibility with MAC
-libbsd
-libcups
-libinput
-libpulse
-libwacom
-nfs-utils
-notification-daemon
-ntfs-3g
-openntpd
-numlockx 
-parted 
-perl-file-mimeinfo 
-polkit
-python
-refind-efi
-rtkit
-udisks2
-upower
-usb_modeswitch
-wget 
-wireless_tools 
-wpa_supplicant
-wvdial
-xdg-utils 
-xorg-xkill
-
-##			obarun stuff
-
-obarun-install
-obarun-install-themes
-pacopts
-obarun-keyring
-obarun-zsh
-
-## 			codec
-
-gstreamer
-gst-libav
-gst-plugins-bad
-gst-plugins-base
-gst-plugins-good
-gst-plugins-ugly

jwm/pacman.conf

@@ -22,7 +22,8 @@ HoldPkg     = pacman glibc
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-IgnorePkg   = systemd libsystemd
+IgnorePkg   = systemd
+IgnorePkg   = libsystemd
 #IgnoreGroup =
 
 #NoUpgrade   =
@@ -67,13 +68,25 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[obarun-testing]
+[66]
+SigLevel = Required 
+Server = https://repo.obarun.org/66-repo
+
+#[obcore-testing]
 #SigLevel = Required
-#Server = https://repo.obarun.org/$arch/testing
+#Server = https://repo.obarun.org/obcore/testing/
 
-[obarun]
-SigLevel = Required 
-Server = https://repo.obarun.org/$arch
+#[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

jwm/rootfs/etc/pacman.conf

@@ -22,7 +22,8 @@ HoldPkg     = pacman glibc
 Architecture = auto
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-IgnorePkg   = systemd libsystemd
+IgnorePkg   = systemd
+IgnorePkg   = libsystemd
 #IgnoreGroup =
 
 #NoUpgrade   =
@@ -68,13 +69,25 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[obarun-testing]
+[66]
+SigLevel = Required 
+Server = https://repo.obarun.org/66-repo
+
+#[obcore-testing]
 #SigLevel = Required
-#Server = https://repo.obarun.org/$arch/testing
+#Server = https://repo.obarun.org/obcore/testing/
 
-[obarun]
-SigLevel = Required 
-Server = https://repo.obarun.org/$arch
+#[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

jwm/rootfs/etc/skel/.config/rofi/obarun.rasi

@@ -48,7 +48,7 @@
     highlight:     bold #ffffff;
     font: "Deja-vu sans 10";
 }
-configuration {
+#configuration {
 	display-drun:   "Applications";
 	display-run:    "Execute";
 	display-window: "Windows";

jwm/rootfs/etc/skel/.scandir

+#!/usr/bin/execlineb -P
+#emptyenv -p
+s6-setsid -qb --
+umask 022
+
+66-scandir -v3 -cu
+

jwm/rootfs/etc/skel/.xinitrc

@@ -9,5 +9,7 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  done
  unset f
 fi
-
+(.scandir &) &
+sleep 01
+66-all -v3 up
 exec ck-launch-session jwm