Skip to content
Snippets Groups Projects
Commit 7caa781e authored by jean-michel's avatar jean-michel
Browse files

Merge branch 'dev' into dev-jm

parents 695ec83c 881d7574
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 136 additions and 103 deletions
NEWS
+ 6
− 0
View file @ 7caa781e
Changelog for obarun-install-themes Changelog for obarun-install-themes
In 0.1.4
--------
- Plasma theme is now maintained by jean-michel
- Pacman.conf use new obarun repositories(obcore,obextra,observice)
In 0.1.1 In 0.1.1
-------- --------
......
jwm/customizeChroot
+ 2
− 7
View file @ 7caa781e
...@@ -52,17 +52,12 @@ custo_once create_log_user ...@@ -52,17 +52,12 @@ custo_once create_log_user
config_66(){ 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" out_action "Enable dbus,connmand, consolekit,wpa_supplicant and ntpd on tree root"
66-enable -v3 dbus ntpd consolekit connmand wpa_supplicant 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" out_action "Create tree graphics for ${NEWUSER}, enables and makes it current"
su "${NEWUSER}" -c "66-tree -v3 -Ecn graphics" su "${NEWUSER}" -c "66-tree -v3 -Ecn graphics"
out_action "Enable dbus-user and xdg-user-dirs on tree graphics" out_action "Enable xdg-user-dirs on tree graphics"
su "${NEWUSER}" -c "66-enable -v3 -t graphics dbus-user xdg-user-dirs" su "${NEWUSER}" -c "66-enable -v3 -t graphics xdg-user-dirs"
rm -rf /run/66
} }
custo_once config_66 custo_once config_66
......
jwm/package_list/base_X
+ 14
− 14
View file @ 7caa781e
...@@ -13,7 +13,6 @@ mesa ...@@ -13,7 +13,6 @@ mesa
mesa-vdpau mesa-vdpau
libva-mesa-driver libva-mesa-driver
opencl-mesa opencl-mesa
xf86-input-libinput
xorg-font-utils xorg-font-utils
xorg-fonts-100dpi xorg-fonts-100dpi
xorg-xev xorg-xev
...@@ -27,17 +26,18 @@ xcb-util-renderutil ...@@ -27,17 +26,18 @@ xcb-util-renderutil
## driver for xorg ## driver for xorg
#------------------ #------------------
#xf86-input-keyboard xf86-input-libinput
#xf86-input-mouse xf86-input-keyboard
#xf86-input-synaptics xf86-input-mouse
#xf86-input-vmmouse xf86-input-synaptics
#xf86-input-void xf86-input-vmmouse
xf86-input-void
#xf86-video-ati xf86-video-ati
#xf86-video-dummy xf86-video-dummy
#xf86-video-fbdev xf86-video-fbdev
#xf86-video-intel xf86-video-intel
#xf86-video-nouveau xf86-video-nouveau
#xf86-video-openchrome xf86-video-openchrome
#xf86-video-vesa xf86-video-vesa
#xf86-video-voodoo xf86-video-voodoo
jwm/package_list/base_obarun
+ 5
− 3
View file @ 7caa781e
...@@ -19,6 +19,7 @@ nano ...@@ -19,6 +19,7 @@ nano
obarun-keyring obarun-keyring
obarun-zsh obarun-zsh
oblibs oblibs
obnews
p7zip p7zip
s6 s6
s6-linux-utils s6-linux-utils
...@@ -26,6 +27,7 @@ s6-portable-utils ...@@ -26,6 +27,7 @@ s6-portable-utils
s6-rc s6-rc
skalibs skalibs
sudo sudo
testdisk
unrar unrar
unzip unzip
vi vi
...@@ -39,6 +41,6 @@ zsh-completions ...@@ -39,6 +41,6 @@ zsh-completions
boot-66serv boot-66serv
root-66tree root-66tree
dhcpcd-66serv dhcpcd-66serv
dmraid-66serv
wpa_supplicant-66serv
# nfs-utils-66serv
jwm/package_list/base_utilities
+ 15
− 6
View file @ 7caa781e
...@@ -12,6 +12,19 @@ ...@@ -12,6 +12,19 @@
syslinux syslinux
gptfdisk gptfdisk
#--------------------
## uefi boot manager
#--------------------
refind-efi
#---------------------
## partitioning tools
#---------------------
gptfdisk
parted
#------------------ #------------------
## console browser ## console browser
#------------------ #------------------
...@@ -26,17 +39,14 @@ btrfs-progs ...@@ -26,17 +39,14 @@ btrfs-progs
crda crda
dmraid dmraid
dosfstools dosfstools
libinput # nfs-utils
nfs-utils
ntfs-3g ntfs-3g
parted
perl-file-mimeinfo perl-file-mimeinfo
python python
refind-efi
udisks2
usb_modeswitch usb_modeswitch
wget wget
wireless_tools wireless_tools
wgetpaste
wpa_supplicant wpa_supplicant
#------------------- #-------------------
...@@ -46,7 +56,6 @@ wpa_supplicant ...@@ -46,7 +56,6 @@ wpa_supplicant
obarun-install obarun-install
obarun-install-themes obarun-install-themes
pacopts pacopts
obnews
#------------------- #-------------------
## fonts ## fonts
......
jwm/package_list/desktop
+ 1
− 4
View file @ 7caa781e
...@@ -22,12 +22,10 @@ gsimplecal ...@@ -22,12 +22,10 @@ gsimplecal
dbus-66serv dbus-66serv
connmand-66serv connmand-66serv
consolekit-66serv consolekit-66serv
dmraid-66serv
ntpd-66serv ntpd-66serv
wpa_supplicant-66serv
xdg-user-dirs-66serv xdg-user-dirs-66serv
nfs-utils-66serv
cupsd-66serv cupsd-66serv
haveged-66serv
#----------- #-----------
## Applications ## Applications
...@@ -48,7 +46,6 @@ gvfs ...@@ -48,7 +46,6 @@ gvfs
gvfs-smb gvfs-smb
hexchat hexchat
imagemagick imagemagick
lxrandr
midori midori
parole parole
polkit-gnome polkit-gnome
......
jwm/rootfs/etc/obarun/install.conf
+ 6
− 0
View file @ 7caa781e
...@@ -24,9 +24,15 @@ DEBUG=0 ...@@ -24,9 +24,15 @@ DEBUG=0
# git source of obarun-install package # git source of obarun-install package
GIT_ADDR="https://framagit.org/Obarun/obarun-install.git" 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 # git branch to use, if not set master is took by default
BRANCH="" 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 directory used during the installation
GPG_DIR="/var/lib/obarun/gnupg" GPG_DIR="/var/lib/obarun/gnupg"
......
jwm/rootfs/etc/skel/.config/jwm/menu
+ 0
− 1
View file @ 7caa781e
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
<Menu icon="gnome-system" label="System configuration"> <Menu icon="gnome-system" label="System configuration">
<Program icon="preferences-desktop-theme" label="Themes">lxappearance</Program> <Program icon="preferences-desktop-theme" label="Themes">lxappearance</Program>
<Program icon="gnome-settings-sound" label="Sound Card">asoundconf-gtk</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> <Program icon="display" label="Screen disposition">arandr</Program>
</Menu> </Menu>
<Separator/> <Separator/>
......
minimal/customizeChroot
+ 0
− 3
View file @ 7caa781e
...@@ -45,11 +45,8 @@ custo_once() { ...@@ -45,11 +45,8 @@ custo_once() {
############################## only modifie this script after this line ############################ ############################## only modifie this script after this line ############################
config(){ config(){
# creation of the live/ to avoid crash
mkdir -p -m1777 /run/66
out_action "Enable dhcpd service" out_action "Enable dhcpd service"
66-enable -v3 dhcpcd 66-enable -v3 dhcpcd
rm -rf /run/66
} }
custo_once config custo_once config
......
minimal/package_list/base_obarun
+ 5
− 3
View file @ 7caa781e
...@@ -19,6 +19,7 @@ nano ...@@ -19,6 +19,7 @@ nano
obarun-keyring obarun-keyring
obarun-zsh obarun-zsh
oblibs oblibs
obnews
p7zip p7zip
s6 s6
s6-linux-utils s6-linux-utils
...@@ -26,6 +27,7 @@ s6-portable-utils ...@@ -26,6 +27,7 @@ s6-portable-utils
s6-rc s6-rc
skalibs skalibs
sudo sudo
testdisk
unrar unrar
unzip unzip
vi vi
...@@ -39,6 +41,6 @@ zsh-completions ...@@ -39,6 +41,6 @@ zsh-completions
boot-66serv boot-66serv
root-66tree root-66tree
dhcpcd-66serv dhcpcd-66serv
dmraid-66serv
wpa_supplicant-66serv
# nfs-utils-66serv
minimal/package_list/base_utilities
+ 15
− 6
View file @ 7caa781e
...@@ -12,6 +12,19 @@ ...@@ -12,6 +12,19 @@
syslinux syslinux
gptfdisk gptfdisk
#--------------------
## uefi boot manager
#--------------------
refind-efi
#---------------------
## partitioning tools
#---------------------
gptfdisk
parted
#------------------ #------------------
## console browser ## console browser
#------------------ #------------------
...@@ -26,17 +39,14 @@ btrfs-progs ...@@ -26,17 +39,14 @@ btrfs-progs
crda crda
dmraid dmraid
dosfstools dosfstools
libinput # nfs-utils
#nfs-utils
ntfs-3g ntfs-3g
parted
perl-file-mimeinfo perl-file-mimeinfo
python python
refind-efi
udisks2
usb_modeswitch usb_modeswitch
wget wget
wireless_tools wireless_tools
wgetpaste
wpa_supplicant wpa_supplicant
#------------------- #-------------------
...@@ -46,7 +56,6 @@ wpa_supplicant ...@@ -46,7 +56,6 @@ wpa_supplicant
obarun-install obarun-install
obarun-install-themes obarun-install-themes
pacopts pacopts
obnews
#------------------- #-------------------
## fonts ## fonts
......
minimal/rootfs/etc/obarun/install.conf
+ 6
− 0
View file @ 7caa781e
...@@ -24,9 +24,15 @@ DEBUG=0 ...@@ -24,9 +24,15 @@ DEBUG=0
# git source of obarun-install package # git source of obarun-install package
GIT_ADDR="https://framagit.org/Obarun/obarun-install.git" 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 # git branch to use, if not set master is took by default
BRANCH="" 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 directory used during the installation
GPG_DIR="/var/lib/obarun/gnupg" GPG_DIR="/var/lib/obarun/gnupg"
......
openbox/customizeChroot
+ 2
− 8
View file @ 7caa781e
...@@ -44,7 +44,6 @@ custo_once() { ...@@ -44,7 +44,6 @@ custo_once() {
############################## only modifie this script after this line ############################ ############################## only modifie this script after this line ############################
create_log_user(){ create_log_user(){
out_action "add ${NEWUSER} at log group" out_action "add ${NEWUSER} at log group"
gpasswd -a "$NEWUSER" log gpasswd -a "$NEWUSER" log
...@@ -53,17 +52,12 @@ custo_once create_log_user ...@@ -53,17 +52,12 @@ custo_once create_log_user
config_66(){ 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" out_action "Enable dbus,connmand, consolekit,wpa_supplicant and ntpd on tree root"
66-enable -v3 dbus ntpd consolekit connmand wpa_supplicant 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" out_action "Create tree graphics for ${NEWUSER}, enables and makes it current"
su "${NEWUSER}" -c "66-tree -v3 -Ecn graphics" su "${NEWUSER}" -c "66-tree -v3 -Ecn graphics"
out_action "Enable dbus-user and xdg-user-dirs on tree graphics" out_action "Enable xdg-user-dirs on tree graphics"
su "${NEWUSER}" -c "66-enable -v3 -t graphics dbus-user xdg-user-dirs" su "${NEWUSER}" -c "66-enable -v3 -t graphics xdg-user-dirs"
rm -rf /run/66
} }
custo_once config_66 custo_once config_66
......
openbox/package_list/base_X
+ 16
− 15
View file @ 7caa781e
...@@ -13,8 +13,6 @@ mesa ...@@ -13,8 +13,6 @@ mesa
mesa-vdpau mesa-vdpau
libva-mesa-driver libva-mesa-driver
opencl-mesa opencl-mesa
xf86-input-libinput
xorg-bdftopcf
xorg-font-utils xorg-font-utils
xorg-fonts-100dpi xorg-fonts-100dpi
xorg-xev xorg-xev
...@@ -23,21 +21,24 @@ xorg-xprop ...@@ -23,21 +21,24 @@ xorg-xprop
xterm xterm
xcb-util-renderutil xcb-util-renderutil
#------------------ #------------------
## driver for xorg ## driver for xorg
#------------------ #------------------
#xf86-input-keyboard xf86-input-libinput
#xf86-input-mouse xf86-input-keyboard
#xf86-input-synaptics xf86-input-mouse
#xf86-input-vmmouse xf86-input-synaptics
#xf86-input-void 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
openbox/package_list/base_obarun
+ 5
− 3
View file @ 7caa781e
...@@ -19,6 +19,7 @@ nano ...@@ -19,6 +19,7 @@ nano
obarun-keyring obarun-keyring
obarun-zsh obarun-zsh
oblibs oblibs
obnews
p7zip p7zip
s6 s6
s6-linux-utils s6-linux-utils
...@@ -26,6 +27,7 @@ s6-portable-utils ...@@ -26,6 +27,7 @@ s6-portable-utils
s6-rc s6-rc
skalibs skalibs
sudo sudo
testdisk
unrar unrar
unzip unzip
vi vi
...@@ -39,6 +41,6 @@ zsh-completions ...@@ -39,6 +41,6 @@ zsh-completions
boot-66serv boot-66serv
root-66tree root-66tree
dhcpcd-66serv dhcpcd-66serv
dmraid-66serv
wpa_supplicant-66serv
# nfs-utils-66serv
openbox/package_list/base_utilities
+ 15
− 6
View file @ 7caa781e
...@@ -12,6 +12,19 @@ ...@@ -12,6 +12,19 @@
syslinux syslinux
gptfdisk gptfdisk
#--------------------
## uefi boot manager
#--------------------
refind-efi
#---------------------
## partitioning tools
#---------------------
gptfdisk
parted
#------------------ #------------------
## console browser ## console browser
#------------------ #------------------
...@@ -26,17 +39,14 @@ btrfs-progs ...@@ -26,17 +39,14 @@ btrfs-progs
crda crda
dmraid dmraid
dosfstools dosfstools
libinput # nfs-utils
#nfs-utils
ntfs-3g ntfs-3g
parted
perl-file-mimeinfo perl-file-mimeinfo
python python
refind-efi
udisks2
usb_modeswitch usb_modeswitch
wget wget
wireless_tools wireless_tools
wgetpaste
wpa_supplicant wpa_supplicant
#------------------- #-------------------
...@@ -46,7 +56,6 @@ wpa_supplicant ...@@ -46,7 +56,6 @@ wpa_supplicant
obarun-install obarun-install
obarun-install-themes obarun-install-themes
pacopts pacopts
obnews
#------------------- #-------------------
## fonts ## fonts
......
openbox/package_list/desktop
+ 0
− 3
View file @ 7caa781e
...@@ -27,10 +27,8 @@ gsimplecal ...@@ -27,10 +27,8 @@ gsimplecal
dbus-66serv dbus-66serv
connmand-66serv connmand-66serv
consolekit-66serv consolekit-66serv
dmraid-66serv
nfs-utils-66serv nfs-utils-66serv
ntpd-66serv ntpd-66serv
wpa_supplicant-66serv
xdg-user-dirs-66serv xdg-user-dirs-66serv
#----------- #-----------
...@@ -52,7 +50,6 @@ gvfs ...@@ -52,7 +50,6 @@ gvfs
gvfs-smb gvfs-smb
hexchat hexchat
imagemagick imagemagick
lxrandr
midori midori
parole parole
polkit-gnome polkit-gnome
......
openbox/rootfs/etc/obarun/install.conf
+ 6
− 0
View file @ 7caa781e
...@@ -24,9 +24,15 @@ DEBUG=0 ...@@ -24,9 +24,15 @@ DEBUG=0
# git source of obarun-install package # git source of obarun-install package
GIT_ADDR="https://framagit.org/Obarun/obarun-install.git" 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 # git branch to use, if not set master is took by default
BRANCH="" 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 directory used during the installation
GPG_DIR="/var/lib/obarun/gnupg" GPG_DIR="/var/lib/obarun/gnupg"
......
xfce4/customizeChroot
+ 2
− 7
View file @ 7caa781e
...@@ -53,17 +53,12 @@ custo_once create_log_user ...@@ -53,17 +53,12 @@ custo_once create_log_user
config_66(){ 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" out_action "Enable dbus,networkmanager, consolekit and ntpd on tree root"
66-enable -v3 dbus ntpd consolekit networkmanager 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" out_action "Create tree graphics for ${NEWUSER}, enables and makes it current"
su "${NEWUSER}" -c "66-tree -v3 -Ecn graphics" su "${NEWUSER}" -c "66-tree -v3 -Ecn graphics"
out_action "Enable dbus-user and xdg-user-dirs on tree graphics" out_action "Enable xdg-user-dirs on tree graphics"
su "${NEWUSER}" -c "66-enable -v3 -t graphics dbus-user xdg-user-dirs" su "${NEWUSER}" -c "66-enable -v3 -t graphics xdg-user-dirs"
rm -rf /run/66
} }
custo_once config_66 custo_once config_66
......
xfce4/package_list/base_X
+ 15
− 14
View file @ 7caa781e
...@@ -13,7 +13,6 @@ mesa ...@@ -13,7 +13,6 @@ mesa
mesa-vdpau mesa-vdpau
libva-mesa-driver libva-mesa-driver
opencl-mesa opencl-mesa
xf86-input-libinput
xorg-font-utils xorg-font-utils
xorg-fonts-100dpi xorg-fonts-100dpi
xorg-xev xorg-xev
...@@ -27,17 +26,19 @@ xcb-util-renderutil ...@@ -27,17 +26,19 @@ xcb-util-renderutil
## driver for xorg ## driver for xorg
#------------------ #------------------
#xf86-input-keyboard xf86-input-libinput
#xf86-input-mouse xf86-input-keyboard
#xf86-input-synaptics xf86-input-mouse
#xf86-input-vmmouse xf86-input-synaptics
#xf86-input-void 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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment