Merge branch 'dev-jm' into dev

jwm-art/customizeChroot

+#!@BINDIR@/bash
+# Copyright (c) 2015-2018 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.
+
+sourcing(){
+
+    local list
+
+    for list in /tmp/obarun-install-tmp/install.conf /usr/lib/obarun/util.sh; do
+        if [[ -f "${list}" ]]; then
+            source "${list}"
+        else
+            out_error "Missing file : ${list}"
+            exit	
+        fi
+    done
+    
+    unset list
+}
+sourcing
+
+custo_once() {
+    local _tmp cmd
+    cmd="${1}"
+    _tmp="/tmp/obarun-install-tmp"
+    
+    if [[ ! -d $_tmp ]]; then
+        mkdir -p -m0755 $_tmp || die "Impossible to create $_tmp"
+    fi
+    if [[ ! -e $_tmp/customize.${cmd} ]]; then
+        "${cmd}" || die "Cannot execute $_"
+        touch $_tmp/customize.${cmd}
+    else
+        return
+    fi
+    unset _tmp
+}
+
+############################## only modifie this script after this line ############################
+
+
+create_log_user(){
+    out_action "add ${NEWUSER} at log group"
+    gpasswd -a "$NEWUSER" log
+}
+custo_once create_log_user 
+
+config_66(){
+
+    # creation of the live/ to avoid crash
+    mkdir -p -m1777 /run/66
+
+    out_action "Create, enable tree [system]"
+    66-tree -v3 -nE system
+
+    out_action "Enable ntpd,sshd on tree [system]"
+    66-enable -v3 -t system ntpd sshd
+
+    out_action "Create, enable tree [desktop] with flag current"
+    66-tree -v3 -nEc desktop
+
+    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"
+    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
+
+config_user(){
+
+    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
+#exec jwm
+EOF"
+}
+custo_once config_user
+
+out_valid "Customization terminate"
+

jwm-art/package_list/base

+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
+
+## Special case for applysys.
+## Need to be here to apply sysuser file,
+## at first installation.
+
+#--------------
+## system base
+#--------------
+
+applysys
+bash
+bzip2
+coreutils
+cryptsetup
+dhcpcd
+diffutils
+e2fsprogs
+filesystem
+gawk
+gcc-libs
+gettext
+glibc
+inetutils
+iproute2
+iputils
+less
+licenses
+linux
+linux-firmware
+man-db
+man-pages
+pacman
+pciutils
+perl
+procps-ng
+psmisc
+shadow
+sysfsutils
+tar
+usbutils
+util-linux
+which
+xfsprogs

jwm-art/package_list/base_X

+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
+
+#-----------
+## X server
+#-----------
+
+xorg-server
+xorg-xinit
+xorg-fonts-100dpi
+xf86-input-libinput
+
+#------------------
+## 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 
+
+#-------------------
+## graphics library
+#-------------------
+
+# mesa
+# mesa-vdpau
+# opencl-mesa
+# libva-mesa-driver

jwm-art/package_list/base_obarun

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

jwm-art/package_list/base_utilities

+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
+
+#--------------
+## boot loader
+#--------------
+
+grub
+#syslinux
+#gptfdisk
+
+#------------
+## utilities
+#------------
+
+#btrfs-progs 
+#crda
+#dmraid
+#dosfstools 
+#libinput
+#nfs-utils
+#ntfs-3g
+#parted 
+#perl-file-mimeinfo 
+#python
+#refind-efi
+#udisks2
+#usb_modeswitch
+#wget 
+#wireless_tools 
+#wpa_supplicant
+#unrar
+#unzip
+#vi
+#p7zip
+#mc
+#nano
+#git
+#htop
+
+#-------------------
+## obarun utilities
+#-------------------
+
+pacopts
+
+#-------------------
+## fonts
+#-------------------

jwm-art/package_list/desktop

+### One application per line.
+### You can use # to comment a line.
+### Blank line are ignored.
+#####################################
+
+#-----------
+## JWM
+#-----------
+
+jwm
+#xdgmenumaker
+#obshutdown-git
+#lxappearance
+#i3lock
+#rofi
+#gsimplecal
+
+#-----------
+## 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
+#-----------
+
+#arc-gtk-theme
+#faenza-icon-theme
+#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-art/package_list/desktop_av

+a2jmidid
+aeolus
+aj-snapshot
+aliki
+allegro
+allegro4
+ambdec
+ams
+amsynth
+audaspace
+blender
+cadence
+chuck
+din
+dragonfly-reverb
+drumgizmo
+drumkv1
+dssi
+ffmpeg
+geonkick
+gst-plugins-good
+jaaa
+jack_capture
+jacktrip
+japa
+jconvolver
+jnoisemeter
+lib32-jack
+libvisual-plugins
+lilv
+linuxsampler
+lsp-plugins
+luppp
+marsyas
+meterbridge
+moc
+mpd
+mplayer
+mpv
+njconnect
+non-mixer
+non-sequencer
+non-session-manager
+non-timeline
+obs-studio
+osc2midi
+padthv1
+patchage
+patchmatrix
+portaudio
+projectm-jack
+pulseaudio-jack
+python-jack-client
+qjackctl
+qmidiarp
+qmidinet
+recordmydesktop
+ring-daemon
+rosegarden
+rtaudio
+rtmidi
+samplv1
+setbfree
+simplescreenrecorder
+snd
+spectmorph
+ssr
+stk
+supercollider
+synthv1
+timidity++
+wolf-shaper
+x42-plugins
+yass
+yoshimi
+zam-plugins
+zita-ajbridge
+zita-at1
+zita-bls1
+zita-dpl1
+zita-jclient
+zita-lrx
+zita-mu1
+zita-njbridge
+zita-rev1
+alsa-plugins
+avidemux-cli
+dpf-plugins
+faust
+gpac
+link
+milkytracker
+mlt
+mpg123
+openshot
+qmmp
+sdl2
+vlc
+xine-lib
+xmms2
+alsa-plugins
+aubio
+avidemux
+firefox
+gpac
+helm
+libffado
+mencoder
+milkytracker
+mlt
+mpg123
+mplayer
+non-daw
+openal
+projectm
+aubio
+python-mlt
+qmmp
+recordmydesktop
+sdl2
+vlc
+xine-lib
+xmms2
+jack2

jwm-art/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      = /var/lib/obarun/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
+
+

jwm-art/rootfs/etc/X11/Xwrapper.config

+needs_root_rights = yes

jwm-art/rootfs/etc/X11/xorg.conf.d/00-keyboard.conf

+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "us"
+        Option "XkbModel" "pc105"
+EndSection

jwm-art/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
+
+

jwm-art/rootfs/etc/sudoers

+## sudoers file.
+##
+## This file MUST be edited with the 'visudo' command as root.
+## Failure to use 'visudo' may result in syntax or file permission errors
+## that prevent sudo from running.
+##
+## See the sudoers man page for the details on how to write a sudoers file.
+##
+
+##
+## Host alias specification
+##
+## Groups of machines. These may include host names (optionally with wildcards),
+## IP addresses, network numbers or netgroups.
+# Host_Alias	WEBSERVERS = www1, www2, www3
+
+##
+## User alias specification
+##
+## Groups of users.  These may consist of user names, uids, Unix groups,
+## or netgroups.
+# User_Alias	ADMINS = millert, dowdy, mikef
+
+##
+## Cmnd alias specification
+##
+## Groups of commands.  Often used to group related commands together.
+# Cmnd_Alias	PROCESSES = /usr/bin/nice, /bin/kill, /usr/bin/renice, \
+# 			    /usr/bin/pkill, /usr/bin/top
+# Cmnd_Alias	REBOOT = /sbin/halt, /sbin/reboot, /sbin/poweroff
+
+##
+## Defaults specification
+##
+## You may wish to keep some of the following environment variables
+## when running commands via sudo.
+##
+## Locale settings
+# Defaults env_keep += "LANG LANGUAGE LINGUAS LC_* _XKB_CHARSET"
+##
+## Run X applications through sudo; HOME is used to find the
+## .Xauthority file.  Note that other programs use HOME to find   
+## configuration files and this may lead to privilege escalation!
+# Defaults env_keep += "HOME"
+##
+## X11 resource path settings
+# Defaults env_keep += "XAPPLRESDIR XFILESEARCHPATH XUSERFILESEARCHPATH"
+##
+## Desktop path settings
+# Defaults env_keep += "QTDIR KDEDIR"
+##
+## Allow sudo-run commands to inherit the callers' ConsoleKit session
+# Defaults env_keep += "XDG_SESSION_COOKIE"
+##
+## Uncomment to enable special input methods.  Care should be taken as
+## this may allow users to subvert the command being run via sudo.
+# Defaults env_keep += "XMODIFIERS GTK_IM_MODULE QT_IM_MODULE QT_IM_SWITCHER"
+##
+## Uncomment to enable logging of a command's output, except for
+## sudoreplay and reboot.  Use sudoreplay to play back logged sessions.
+# Defaults log_output
+# Defaults!/usr/bin/sudoreplay !log_output
+# Defaults!/usr/local/bin/sudoreplay !log_output
+# Defaults!REBOOT !log_output
+
+##
+## Runas alias specification
+##
+
+##
+## User privilege specification
+##
+root ALL=(ALL) ALL
+
+## Uncomment to allow members of group wheel to execute any command
+%wheel ALL=(ALL) ALL
+
+## Same thing without a password
+#%wheel ALL=(ALL) NOPASSWD: ALL
+
+## Uncomment to allow members of group sudo to execute any command
+# %sudo	ALL=(ALL) ALL
+
+## Uncomment to allow any user to run sudo if they know the password
+## of the user they are running the command as (root by default).
+# Defaults targetpw  # Ask for the password of the target user
+# ALL ALL=(ALL) ALL  # WARNING: only use this together with 'Defaults targetpw'
+
+## Read drop-in files from /etc/sudoers.d
+## (the '#' here does not indicate a comment)
+#includedir /etc/sudoers.d
+
+

plasma/package_list/base_obarun

@@ -76,7 +76,6 @@ ntpd-66serv
 sshd-66serv
 
 dbus-66serv
-consolekit-66serv
 networkmanager-66serv
 wpa_supplicant-66serv
 xdg-user-dirs-66serv

plasma/package_list/desktop

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

plasma/pacman.conf

@@ -116,5 +116,3 @@ Include = /etc/pacman.d/mirrorlist
 
 #[multilib]
 #Include = /etc/pacman.d/mirrorlist
-
-

plasma/rootfs/etc/X11/Xwrapper.config

 needs_root_rights = yes
-

plasma/rootfs/etc/obarun/install.conf

@@ -24,9 +24,15 @@ 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"
 

plasma/rootfs/etc/skel/.scandir

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

plasma/rootfs/etc/skel/.xinitrc

-#!/usr/bin/sh
-
-exec 1>$HOME/xinit.log
-exec 2>&1
-
-if [ -d /etc/X11/xinit/xinitrc.d ] ; then
- for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
-  [ -x "$f" ] && . "$f"
- done
- unset f
-fi
-
-(.scandir &) &
-sleep 01
-66-all -v3 up
-exec ck-launch-session dbus-launch startkde