From 87ab763161860d9865f9c6ceb127372c28ec4f3b Mon Sep 17 00:00:00 2001
From: fhdk <fh@manjaro.org>
Date: Fri, 24 Aug 2018 09:52:52 +0200
Subject: [PATCH] [openbox] v18 update

---
 community/.gitignore                          |  1 +
 community/openbox/Packages-Desktop            | 24 +++++++-------
 community/openbox/live-overlay/etc/issue      | 14 +-------
 .../etc/skel/.config/openbox/menu.xml         | 33 +------------------
 .../etc/skel/.config/openbox/rc.xml           |  2 +-
 community/openbox/profile.conf                |  2 +-
 6 files changed, 16 insertions(+), 60 deletions(-)
 create mode 100644 community/.gitignore
 mode change 100644 => 120000 community/openbox/live-overlay/etc/issue

diff --git a/community/.gitignore b/community/.gitignore
new file mode 100644
index 0000000..a5b3c63
--- /dev/null
+++ b/community/.gitignore
@@ -0,0 +1 @@
+/openbox-core/
diff --git a/community/openbox/Packages-Desktop b/community/openbox/Packages-Desktop
index c15084d..52b9b37 100644
--- a/community/openbox/Packages-Desktop
+++ b/community/openbox/Packages-Desktop
@@ -2,24 +2,23 @@
 ##### OPENBOX MINIMAL/FULL PROFILE
 
 #---------=> media player
->extra audacious-gtk3
 >extra deadbeef
 >extra smplayer
 >extra smplayer-skins
 >extra smplayer-themes
 
 #---------=> sound support
->extra alsa-firmware
->extra alsa-utils
->extra alsa-plugins
+alsa-firmware
+alsa-utils
+alsa-plugins
 
 #---------=> media controls/codecs/plugins
->extra ffmpeg
->extra pamixer
->extra pavucontrol
->extra playerctl
->extra pulseaudio
->extra pulseaudio-alsa
+ffmpeg
+pamixer
+pavucontrol
+playerctl
+pulseaudio
+pulseaudio-alsa
 
 #---------=> graphic applications
 >extra gcolor2
@@ -105,7 +104,7 @@ unzip
 
 #---------=> disk utilities
 >extra timeshift
->extra clonezilla
+clonezilla
 >extra gnome-disk-utility
 gparted
 >extra mintstick
@@ -149,9 +148,9 @@ manjaro-openbox-scripts
 # theme, icons, cursors, wallpapers
 adapta-maia-theme
 manjaro-openbox-adapta-maia
-manjaro-openbox-wallpapers-18.0
 papirus-maia-icon-theme
 manjaro-wallpapers-18.0
+manjaro-zsh-config
 xcursor-breeze
 
 
@@ -166,7 +165,6 @@ ttf-icomoon-icons
 ttf-material-icons
 ttf-polybar-icons
 ttf-roboto
-manjaro-zsh-config
 
 #---------=> network
 network-manager-applet
diff --git a/community/openbox/live-overlay/etc/issue b/community/openbox/live-overlay/etc/issue
deleted file mode 100644
index 75720d4..0000000
--- a/community/openbox/live-overlay/etc/issue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-Manjaro Live ISO (\l) - \s-\r \m
-
-
-
-                 # Welcome to Manjaro #
-
-
-            login for the live environment:
-                   user     'manjaro'
-                   password 'manjaro'
-
-
diff --git a/community/openbox/live-overlay/etc/issue b/community/openbox/live-overlay/etc/issue
new file mode 120000
index 0000000..c519805
--- /dev/null
+++ b/community/openbox/live-overlay/etc/issue
@@ -0,0 +1 @@
+../../../../shared/manjaro/live-overlay/etc/issue
\ No newline at end of file
diff --git a/community/openbox/live-overlay/etc/skel/.config/openbox/menu.xml b/community/openbox/live-overlay/etc/skel/.config/openbox/menu.xml
index fccad5b..f5038e2 100644
--- a/community/openbox/live-overlay/etc/skel/.config/openbox/menu.xml
+++ b/community/openbox/live-overlay/etc/skel/.config/openbox/menu.xml
@@ -99,11 +99,6 @@
                 <command>xfce4-appearance-settings</command>
             </action>
         </item>
-        <item label="Add/Remove Software">
-            <action name="Execute">
-                <command>pamac-manager</command>
-            </action>
-        </item>
         <item label="Screen Layout">
             <action name="Execute">
                 <command>arandr</command>
@@ -115,22 +110,6 @@
             </action>
         </item>
     </menu>
-    <separator/>
-    <item label="Panel Chooser">
-        <action name="Execute">
-            <command>manjaro-panel-chooser</command>
-        </action>
-    </item>
-    <item label="Wallpaper">
-        <action name="Execute">
-            <command>pcmanfm --desktop-pref</command>
-        </action>
-    </item>
-    <item label="Rofi Theme">
-        <action name="Execute">
-            <command>rofi-theme-selector</command>
-        </action>
-    </item>
 </menu>
 
 <menu id="root-menu" label="Openbox 3">
@@ -142,7 +121,7 @@
     </item>
     <item label="Calamares Installer">
         <action name="Execute">
-            <command>sudo calamares</command>
+            <command>calamares polkit</command>
         </action>
     </item>
     <item label="Architect Installer">
@@ -156,21 +135,11 @@
             <command>termite</command>
         </action>
     </item>
-    <item label="Pcman FM">
-        <action name="Execute">
-            <command>pcmanfm</command>
-        </action>
-    </item>
     <item label="Midnight Commander">
         <action name="Execute">
             <command>termite -e mc</command>
         </action>
     </item>
-    <item label="Midori Browser">
-        <action name="Execute">
-            <command>midori https://manjaro.org</command>
-        </action>
-    </item>
     <separator/>
     <menu id="disk-utilities"/>
     <menu id="screenshot"/>
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 8a24fd1..6c8dbf8 100644
--- a/community/openbox/live-overlay/etc/skel/.config/openbox/rc.xml
+++ b/community/openbox/live-overlay/etc/skel/.config/openbox/rc.xml
@@ -452,7 +452,7 @@
     </keybind>
     <keybind key="W-e">
       <action name="Execute">
-        <command>subl3</command>
+        <command>xed</command>
       </action>
     </keybind>
     <keybind key="C-A-m">
diff --git a/community/openbox/profile.conf b/community/openbox/profile.conf
index 48bdfe0..7bbc677 100644
--- a/community/openbox/profile.conf
+++ b/community/openbox/profile.conf
@@ -33,7 +33,7 @@ geoip="true"
 
 # unset defaults to given values
 # names must match systemd service names
-enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'NetworkManager' 'ntpd' 'org.cups-cupsd')
+enable_systemd=('avahi-daemon' 'bluetooth' 'cronie' 'NetworkManager' 'systemd-timesyncd' 'org.cups-cupsd')
 disable_systemd=('pacman-init')
 
 # the same workgroup name if samba is used