From ca4ce1cc536fd88f7594a2f141f6d4aa7cf31ee4 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <fh@manjaro.org>
Date: Thu, 12 Mar 2020 12:40:22 +0100
Subject: [PATCH] [openbox] small adjustments

---
 community/openbox/Packages-Desktop                        | 5 ++++-
 community/openbox/desktop-overlay/etc/lxdm/lxdm.conf      | 6 +++---
 .../live-overlay/etc/skel/.config/openbox/autostart       | 4 ++--
 .../openbox/live-overlay/etc/skel/.config/openbox/rc.xml  | 5 +----
 community/openbox/profile.conf                            | 8 +++++---
 shared/Packages-Mhwd                                      | 4 ++--
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop
index 603cd13..1a2d9cf 100644
--- a/community/openbox/Packages-Desktop
+++ b/community/openbox/Packages-Desktop
@@ -24,6 +24,7 @@ manjaro-pacbang-gtk-theme
 manjaro-pacbang-lxdm-theme
 manjaro-pacbang-wallpapers
 manjaro-zsh-config
+moka-icon-theme
 terminus-font
 ttf-dejavu
 ttf-font-awesome
@@ -64,6 +65,7 @@ xfce4-power-manager
 mc
 
 ## disk utilities
+gnome-disk-utility
 gparted
 mintstick
 timeshift
@@ -87,6 +89,7 @@ upower
 alsa-firmware
 alsa-utils
 alsa-plugins
+pavucontrol
 volumeicon
 
 ## connect packages
@@ -106,12 +109,12 @@ whois
 
 ## network
 firewalld
-python-pyqt5  # dep of firewall-applet
 network-manager-applet
 networkmanager
 networkmanager-dmenu
 networkmanager-openvpn
 openresolv
+python-pyqt5  # dep of firewall-applet
 
 ## core
 arandr
diff --git a/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf b/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf
index 69b282f..0b636e6 100644
--- a/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf
+++ b/community/openbox/desktop-overlay/etc/lxdm/lxdm.conf
@@ -37,7 +37,7 @@ theme=PacBang
 gtk_theme=PacBang
 
 ## background of the greeter
-bg=/usr/share/backgrounds/PacBang/lunix/RedManjaroWall-3840x2160(image_by_lunix).jpg
+bg=/usr/share/backgrounds/PacBang/lunix/PacBang_3840x2160(by_Lunix).png
 
 ## if hide time
 hide_time=0
@@ -46,10 +46,10 @@ hide_time=0
 bottom_pane=1
 
 ## if show language select control
-lang=1
+lang=0
 
 ## if show keyboard layout select control
-keyboard=1
+keyboard=0
 
 ## if transparent panel
 transparent_pane=1
diff --git a/community/openbox/live-overlay/etc/skel/.config/openbox/autostart b/community/openbox/live-overlay/etc/skel/.config/openbox/autostart
index 9ab149a..dc41d4c 100644
--- a/community/openbox/live-overlay/etc/skel/.config/openbox/autostart
+++ b/community/openbox/live-overlay/etc/skel/.config/openbox/autostart
@@ -4,14 +4,14 @@ sleep 0.5; xfsettingsd &
 ### compositor
 sleep 1; manjaro-compositor --start &
 
-sleep 1; pcmanfm --desktop &
+sleep 1; nitrogen --restore &
 
 ### launch tint2 and polybar
 sleep 1; manjaro-tint2-session &
 sleep 1; polybar -c ~/.config/polybar/config openbox-bar &
 
 ### launch conky
-manjaro-conky-session &
+sleeep 1; conky -c ~/.config/conky/PacBang.conkyrc &
 
 ## skippy
 sleep 1; skippy-xd --config ~/.config/skippy-xd/skippy-xd.rc --start-daemon &
diff --git a/community/openbox/live-overlay/etc/skel/.config/openbox/rc.xml b/community/openbox/live-overlay/etc/skel/.config/openbox/rc.xml
index 32159fe..71e4a0a 100644
--- a/community/openbox/live-overlay/etc/skel/.config/openbox/rc.xml
+++ b/community/openbox/live-overlay/etc/skel/.config/openbox/rc.xml
@@ -61,13 +61,10 @@
     </font>
   </theme>
   <desktops>
-    <number>4</number>
+    <number>1</number>
     <firstdesk>0</firstdesk>
     <names>
       <name>1</name>
-      <name>2</name>
-      <name>3</name>
-      <name>4</name>
     </names>
     <popupTime>800</popupTime>
   </desktops>
diff --git a/community/openbox/profile.conf b/community/openbox/profile.conf
index b4723f2..11f51ab 100644
--- a/community/openbox/profile.conf
+++ b/community/openbox/profile.conf
@@ -12,10 +12,10 @@ displaymanager="lxdm"
 autologin="true"
 
 ## nonfree mhwd drivers
-#nonfree_mhwd="false"
+nonfree_mhwd="false"
 
 # use extra packages as defined in pkglist to activate a full profile
-#extra="true"
+extra="true"
 
 # use calamares office installer
 #office_installer="false"
@@ -39,7 +39,9 @@ addgroups="lp,network,power,sys,wheel"
 
 # unset defaults to given values
 # names must match systemd service names
-# enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager' 'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
+# enable_systemd=(
+#   'avahi-daemon' 'bluetooth' 'cronie' 'ModemManager' 'NetworkManager'
+#   'org.cups.cupsd' 'tlp' 'tlp-sleep' 'haveged' 'ufw' 'apparmor' 'snapd.apparmor' 'snapd')
 enable_systemd=('firewalld' 'NetworkManager' 'haveged' 'systemd-timesyncd')
 disable_systemd=('pacman-init' 'systemd-rfkill.service' 'systemd-rfkill.socket')
 
diff --git a/shared/Packages-Mhwd b/shared/Packages-Mhwd
index ebdc252..f6eb09b 100644
--- a/shared/Packages-Mhwd
+++ b/shared/Packages-Mhwd
@@ -1,6 +1,6 @@
 ## The following is only temp for 18.1-rc7
->extra libreoffice-still
->extra freeoffice
+>office libreoffice-still
+>office freeoffice
 
 ## Normal MHWD package list