Merge branch 'dev-eric' into dev

jwm/package_list/base_obarun

@@ -19,6 +19,7 @@ nano
 obarun-keyring
 obarun-zsh
 oblibs
+obnews
 p7zip
 s6
 s6-linux-utils
@@ -26,6 +27,7 @@ s6-portable-utils
 s6-rc
 skalibs
 sudo
+testdisk
 unrar
 unzip
 vi
@@ -39,6 +41,6 @@ zsh-completions
 boot-66serv
 root-66tree
 dhcpcd-66serv
-
-
-
+dmraid-66serv
+wpa_supplicant-66serv
+# nfs-utils-66serv

jwm/package_list/base_utilities

@@ -12,6 +12,20 @@
 syslinux
 gptfdisk
 
+#--------------------
+## uefi boot manager
+#--------------------
+
+refind-efi
+
+#---------------------
+## partitioning tools
+#---------------------
+
+gptfdisk
+parted
+cfdisk
+
 #------------------
 ## console browser
 #------------------
@@ -26,17 +40,14 @@ btrfs-progs
 crda
 dmraid
 dosfstools 
-libinput
-nfs-utils
+# nfs-utils
 ntfs-3g
-parted 
 perl-file-mimeinfo 
 python
-refind-efi
-udisks2
 usb_modeswitch
 wget 
 wireless_tools 
+wgetpaste 
 wpa_supplicant
 
 #-------------------

jwm/package_list/desktop

@@ -22,12 +22,10 @@ gsimplecal
 dbus-66serv
 connmand-66serv
 consolekit-66serv
-dmraid-66serv
 ntpd-66serv
-wpa_supplicant-66serv
 xdg-user-dirs-66serv
-nfs-utils-66serv
 cupsd-66serv
+haveged-66serv
 
 #-----------
 ## Applications

jwm/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"
 

minimal/package_list/base_obarun

@@ -19,6 +19,7 @@ nano
 obarun-keyring
 obarun-zsh
 oblibs
+obnews
 p7zip
 s6
 s6-linux-utils
@@ -26,6 +27,7 @@ s6-portable-utils
 s6-rc
 skalibs
 sudo
+testdisk
 unrar
 unzip
 vi
@@ -39,6 +41,6 @@ zsh-completions
 boot-66serv
 root-66tree
 dhcpcd-66serv
-
-
-
+dmraid-66serv
+wpa_supplicant-66serv
+# nfs-utils-66serv

minimal/package_list/base_utilities

@@ -12,6 +12,20 @@
 syslinux
 gptfdisk
 
+#--------------------
+## uefi boot manager
+#--------------------
+
+refind-efi
+
+#---------------------
+## partitioning tools
+#---------------------
+
+gptfdisk
+parted
+cfdisk
+
 #------------------
 ## console browser
 #------------------
@@ -26,17 +40,14 @@ btrfs-progs
 crda
 dmraid
 dosfstools 
-libinput
-#nfs-utils
+# nfs-utils
 ntfs-3g
-parted 
 perl-file-mimeinfo 
 python
-refind-efi
-udisks2
 usb_modeswitch
 wget 
 wireless_tools 
+wgetpaste 
 wpa_supplicant
 
 #-------------------
@@ -46,7 +57,6 @@ wpa_supplicant
 obarun-install
 obarun-install-themes
 pacopts
-obnews
 
 #-------------------
 ## fonts

minimal/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"