diff --git a/jwm/customizeChroot b/jwm/customizeChroot index 00d996cfe2e2c2547e9219ea1e692230b9bb74bd..cad5d3f62473587e48b75d5a7d861ba365a9da1d 100755 --- a/jwm/customizeChroot +++ b/jwm/customizeChroot @@ -52,17 +52,12 @@ custo_once create_log_user config_66(){ - # 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_66 diff --git a/jwm/package_list/base_X b/jwm/package_list/base_X index ba69d9e2b91304816f48748c3377aa7c61efed9a..18d0237d4cf5ff589516cedd8f722ad582b1225e 100644 --- a/jwm/package_list/base_X +++ b/jwm/package_list/base_X @@ -13,7 +13,6 @@ mesa mesa-vdpau libva-mesa-driver opencl-mesa -xf86-input-libinput xorg-font-utils xorg-fonts-100dpi xorg-xev @@ -27,17 +26,18 @@ xcb-util-renderutil ## driver for xorg #------------------ -#xf86-input-keyboard -#xf86-input-mouse -#xf86-input-synaptics -#xf86-input-vmmouse -#xf86-input-void +xf86-input-libinput +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 +xf86-video-ati +xf86-video-dummy +xf86-video-fbdev +xf86-video-intel +xf86-video-nouveau +xf86-video-openchrome +xf86-video-vesa +xf86-video-voodoo diff --git a/jwm/package_list/desktop b/jwm/package_list/desktop index a321fe6abfbb279a66edd323509f0dd9b4f2423f..29d6631c7543cd2ac7778110380cad9aea207535 100644 --- a/jwm/package_list/desktop +++ b/jwm/package_list/desktop @@ -48,7 +48,6 @@ gvfs gvfs-smb hexchat imagemagick -lxrandr midori parole polkit-gnome diff --git a/jwm/pacman.conf b/jwm/pacman.conf index 959a868d9fb0e7f307601cdf815f4f9ec3f6533b..1355ea873619c9e1b351d3d375c7b9bbaa30f7f7 100644 --- a/jwm/pacman.conf +++ b/jwm/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 diff --git a/jwm/rootfs/etc/pacman.conf b/jwm/rootfs/etc/pacman.conf deleted file mode 100644 index c65cccb481e98e1f179b8a38b96291778aa24f00..0000000000000000000000000000000000000000 --- a/jwm/rootfs/etc/pacman.conf +++ /dev/null @@ -1,116 +0,0 @@ -# -# /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 - - diff --git a/jwm/rootfs/etc/skel/.config/jwm/menu b/jwm/rootfs/etc/skel/.config/jwm/menu index 072b1f3c37405db720dd06ab816d9d0a313455b5..215355d7c42f2aa2f263f7225390fbc57d6e640e 100644 --- a/jwm/rootfs/etc/skel/.config/jwm/menu +++ b/jwm/rootfs/etc/skel/.config/jwm/menu @@ -17,7 +17,6 @@ <Menu icon="gnome-system" label="System configuration"> <Program icon="preferences-desktop-theme" label="Themes">lxappearance</Program> <Program icon="gnome-settings-sound" label="Sound Card">asoundconf-gtk</Program> - <Program icon="video-display" label="Screen resolution">lxrandr</Program> <Program icon="display" label="Screen disposition">arandr</Program> </Menu> <Separator/> diff --git a/minimal/customizeChroot b/minimal/customizeChroot index 51dddb1bc2a623c4c49b630897cd41e6927fac66..b63352013d7ad0467225116e114ca0b270507d2a 100755 --- a/minimal/customizeChroot +++ b/minimal/customizeChroot @@ -45,11 +45,8 @@ custo_once() { ############################## only modifie this script after this line ############################ config(){ - # creation of the live/ to avoid crash - mkdir -p -m1777 /run/66 out_action "Enable dhcpd service" 66-enable -v3 dhcpcd - rm -rf /run/66 } custo_once config diff --git a/minimal/pacman.conf b/minimal/pacman.conf index 959a868d9fb0e7f307601cdf815f4f9ec3f6533b..1355ea873619c9e1b351d3d375c7b9bbaa30f7f7 100644 --- a/minimal/pacman.conf +++ b/minimal/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 diff --git a/minimal/rootfs/etc/pacman.conf b/minimal/rootfs/etc/pacman.conf deleted file mode 100644 index c65cccb481e98e1f179b8a38b96291778aa24f00..0000000000000000000000000000000000000000 --- a/minimal/rootfs/etc/pacman.conf +++ /dev/null @@ -1,116 +0,0 @@ -# -# /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 - - diff --git a/openbox/customizeChroot b/openbox/customizeChroot index 44ae2cfa0fbaf386d5c40dba9a20a323b292bb82..fe30e36db16bddeac7f6f602b12d244346094a7b 100755 --- a/openbox/customizeChroot +++ b/openbox/customizeChroot @@ -53,17 +53,12 @@ custo_once create_log_user config_66(){ - # 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_66 diff --git a/openbox/package_list/base_X b/openbox/package_list/base_X index 4b1801823b38d5dd42f6c9ba62457341107d818a..fba545144c140f1a73150d4daf82c23350bdde9f 100644 --- a/openbox/package_list/base_X +++ b/openbox/package_list/base_X @@ -13,8 +13,6 @@ mesa mesa-vdpau libva-mesa-driver opencl-mesa -xf86-input-libinput -xorg-bdftopcf xorg-font-utils xorg-fonts-100dpi xorg-xev @@ -23,21 +21,24 @@ 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-input-libinput +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 -#xf86-video-ati -#xf86-video-dummy -#xf86-video-fbdev -#xf86-video-intel -#xf86-video-nouveau -#xf86-video-openchrome -#xf86-video-vesa -#xf86-video-voodoo diff --git a/openbox/package_list/desktop b/openbox/package_list/desktop index 2ac4b5297d7631db19460f6320666695b3fc0b32..282ad5b492fbe54697ab600cf0f73965532643cb 100644 --- a/openbox/package_list/desktop +++ b/openbox/package_list/desktop @@ -52,7 +52,6 @@ gvfs gvfs-smb hexchat imagemagick -lxrandr midori parole polkit-gnome diff --git a/openbox/pacman.conf b/openbox/pacman.conf index 959a868d9fb0e7f307601cdf815f4f9ec3f6533b..1355ea873619c9e1b351d3d375c7b9bbaa30f7f7 100644 --- a/openbox/pacman.conf +++ b/openbox/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 diff --git a/openbox/rootfs/etc/pacman.conf b/openbox/rootfs/etc/pacman.conf deleted file mode 100644 index c65cccb481e98e1f179b8a38b96291778aa24f00..0000000000000000000000000000000000000000 --- a/openbox/rootfs/etc/pacman.conf +++ /dev/null @@ -1,116 +0,0 @@ -# -# /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 - - diff --git a/plasma/customizeChroot b/plasma/customizeChroot index 5b7d468fabd2aa188b5a2721d3a8dcab7160f2f6..3d9e8ebc7877068913af060176e1e1d2977e7b16 100755 --- a/plasma/customizeChroot +++ b/plasma/customizeChroot @@ -9,36 +9,36 @@ # 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 + + 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 + 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 + return + fi unset _tmp } @@ -46,24 +46,31 @@ custo_once() { create_log_user(){ - out_action "add ${NEWUSER} at log group" - gpasswd -a "$NEWUSER" log + 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 "Enable dbus,consolekit,sddm,networkmanager,wpa_supplicant and ntpd on tree root" - 66-enable -v3 dbus ntpd consolekit sddm networkmanager 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 + + out_action "Create and 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 and set flag default on tree [desktop]" + 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 "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" + } custo_once config_66 diff --git a/plasma/package_list/base_obarun b/plasma/package_list/base_obarun index fa6b1e94b11af2bad46ef0e063da808f6c737ca1..cb273ed4d2a990379cdcbda57e4ef84ee9ee23d9 100644 --- a/plasma/package_list/base_obarun +++ b/plasma/package_list/base_obarun @@ -62,16 +62,17 @@ p7zip boot-66serv root-66tree -sddm-66serv + +ntpd-66serv +sshd-66serv + dbus-66serv -consolekit-66serv networkmanager-66serv +wpa_supplicant-66serv +xdg-user-dirs-66serv +consolekit-66serv +# sddm-66serv # dhcpcd-66serv # dmraid-66serv # nfs-utils-66serv -# ntpd-66serv -# sshd-66serv -# syslogds6-66serv -# wpa_supplicant-66serv -# xdg-user-dirs-66serv diff --git a/plasma/package_list/desktop b/plasma/package_list/desktop index 217c18ae0cda1834493b983ce1347a7b7a84544e..a63796413e4c4ea70f1df32d5f7e1e0062ca28d8 100644 --- a/plasma/package_list/desktop +++ b/plasma/package_list/desktop @@ -39,52 +39,99 @@ user-manager ## kde applications #------------------- -# amarok -# ark -# digikam +# kmouth + +# kcron +# kshutdown +# ksystemlog + # dolphin -# |- ffmpegthumbs -# |- kde-cli-tools -# |- kdegraphics-thumbnailers -# |- dolphin-plugins +# |_ffmpegthumbs +# |_kdegraphics-thumbnailers +# |_dolphin-plugins +# kate +# kdialog +# keditbookmarks +# kfind +# |_mlocate +# khelpcenter +# konqueror +# |_kdesu +# |_tidy +# konsole +# |_keditbookmarks +# krename +# krusader +# kwrite +# yakuake + +# kmahjongg +# kpatience + +# gwenview +# |_kamera +# |_kimageformats +# |_kipi-plugins +# |_qt5-imageformats +# kcolorchooser +# kdegraphics-thumbnailers +# kolourpaint +# okular +# |_ebook-tools +# skanlite +# spectacle +# svgpart + +# digikam +# |_hugin # dragon # elisa -# falkon -# gwenview # juk # k3b -# kaddressbook -# kaffeine -# kalarm -# kate +# |_cdparanoia +# |_cdrdao +# |_transcode +# |_vcdimager +# kamoso # kaudiocreator -# kbackup -# kcalc -# kcolorchooser # kdenlive -# kdf -# kget -# kleopatra -# kmahjongg -# kmail +# |_dvdauthor +# |_dvgrab +# |_ffmpeg +# |_vlc +# kaffeine # kmix # kmplayer -# kompare -# konsole -# konversation -# kpatience +# kwave +# |_opus + +# kget +# krdc # krfb -# krename -# krusader -# kshutdown -# ksnapshot + +# akregator +# falkon +# konversation +# kaddressbook +# kalarm +# kleopatra +# kmail +# knotes +# kontact +# korganizer + +# ark +# filelight +# kbackup +# kcalc +# kcharselect +# kdf +# kfloppy +# ktimer # kwalletmanager -# kwave -# okular # partitionmanager -# skanlite -# spectacle -# yakuake +# print-manager +# sweeper #------------------- ## Qt5 applications @@ -92,6 +139,15 @@ user-manager # psi # quassel-monolithic +# simplescreenrecorder +# obs-studio + +#--------------------- +## Other applications +#--------------------- + +# firefox +# thunderbird #-------- ## fonts diff --git a/plasma/pacman.conf b/plasma/pacman.conf index 959a868d9fb0e7f307601cdf815f4f9ec3f6533b..1355ea873619c9e1b351d3d375c7b9bbaa30f7f7 100644 --- a/plasma/pacman.conf +++ b/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 diff --git a/plasma/rootfs/etc/pacman.conf b/plasma/rootfs/etc/pacman.conf deleted file mode 100644 index c65cccb481e98e1f179b8a38b96291778aa24f00..0000000000000000000000000000000000000000 --- a/plasma/rootfs/etc/pacman.conf +++ /dev/null @@ -1,116 +0,0 @@ -# -# /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 - - diff --git a/xfce4/customizeChroot b/xfce4/customizeChroot index aea7b92f348fa1b09291bcd2e2bf889fcb5f0b9f..d62785c4efea725ff6e3afc83e3716feec44ac15 100755 --- a/xfce4/customizeChroot +++ b/xfce4/customizeChroot @@ -53,17 +53,12 @@ custo_once create_log_user config_66(){ - # creation of the live/ to avoid crash - mkdir -p -m1777 /run/66 out_action "Enable dbus,networkmanager, consolekit and ntpd on tree root" 66-enable -v3 dbus ntpd consolekit networkmanager - # 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_66 diff --git a/xfce4/package_list/base_X b/xfce4/package_list/base_X index ba69d9e2b91304816f48748c3377aa7c61efed9a..fba545144c140f1a73150d4daf82c23350bdde9f 100644 --- a/xfce4/package_list/base_X +++ b/xfce4/package_list/base_X @@ -13,7 +13,6 @@ mesa mesa-vdpau libva-mesa-driver opencl-mesa -xf86-input-libinput xorg-font-utils xorg-fonts-100dpi xorg-xev @@ -27,17 +26,19 @@ xcb-util-renderutil ## driver for xorg #------------------ -#xf86-input-keyboard -#xf86-input-mouse -#xf86-input-synaptics -#xf86-input-vmmouse -#xf86-input-void +xf86-input-libinput +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 -#xf86-video-ati -#xf86-video-dummy -#xf86-video-fbdev -#xf86-video-intel -#xf86-video-nouveau -#xf86-video-openchrome -#xf86-video-vesa -#xf86-video-voodoo diff --git a/xfce4/package_list/desktop b/xfce4/package_list/desktop index c7e2324e8797dd28881c6d7dab98a9e8103a5b53..cb35d60b61deaea36bf7d85219ec67373f567640 100644 --- a/xfce4/package_list/desktop +++ b/xfce4/package_list/desktop @@ -62,7 +62,6 @@ gvfs gvfs-smb hexchat imagemagick -lxrandr midori parole polkit-gnome diff --git a/xfce4/pacman.conf b/xfce4/pacman.conf index 959a868d9fb0e7f307601cdf815f4f9ec3f6533b..1355ea873619c9e1b351d3d375c7b9bbaa30f7f7 100644 --- a/xfce4/pacman.conf +++ b/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 diff --git a/xfce4/rootfs/etc/pacman.conf b/xfce4/rootfs/etc/pacman.conf deleted file mode 100644 index c65cccb481e98e1f179b8a38b96291778aa24f00..0000000000000000000000000000000000000000 --- a/xfce4/rootfs/etc/pacman.conf +++ /dev/null @@ -1,116 +0,0 @@ -# -# /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 - -