From f5fd85b9f57a71227c6f1f83bbf85dda7bcc7e16 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Tue, 20 Feb 2018 17:53:49 -0800
Subject: [PATCH] Update menus

---
 home/.config/openbox/autostart       |  2 +-
 home/.config/openbox/environment     |  9 ++++-----
 home/.config/openbox/menu-static.xml |  2 ++
 home/.config/openbox/menu.xml        | 10 ++++++----
 home/.config/openbox/rc.xml          |  2 ++
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/home/.config/openbox/autostart b/home/.config/openbox/autostart
index a8313ef6..318f5fea 100644
--- a/home/.config/openbox/autostart
+++ b/home/.config/openbox/autostart
@@ -23,7 +23,7 @@ lxpolkit &
 # Required for xfce settings to work
 xfsettingsd &
 
-# set user shortcuts for file managers
+# Side shortcuts for file managers
 xdg-user-dirs-gtk-update &
 
 $HOME/.config/keypack &
diff --git a/home/.config/openbox/environment b/home/.config/openbox/environment
index 5dfaaa95..600d7606 100644
--- a/home/.config/openbox/environment
+++ b/home/.config/openbox/environment
@@ -1,12 +1,11 @@
-#
-# User-specific variables should be placed in $HOME/.config/openbox/environment
-#
+# environment
+# vim:ft=sh
 
 # To set your language for displaying messages and time/date formats, use the following:
 #LANG=en_US.UTF8
 
 ## GNOME Keyring
-export $(gnome-keyring-daemon --start --components=pkcs11,secrets)
+export "$(gnome-keyring-daemon --start --components=pkcs11,secrets)"
 
 # xdg-open applications
 export XDG_CURRENT_DESKTOP=XFCE
@@ -14,5 +13,5 @@ export DE="xfce"
 
 # D-bus with openbox
 if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-    eval `dbus-launch --sh-syntax --exit-with-session`
+    eval "$(dbus-launch --sh-syntax --exit-with-session)"
 fi
diff --git a/home/.config/openbox/menu-static.xml b/home/.config/openbox/menu-static.xml
index bbd965ed..b703db4b 100644
--- a/home/.config/openbox/menu-static.xml
+++ b/home/.config/openbox/menu-static.xml
@@ -197,3 +197,5 @@
     </item>
   </menu>
 </openbox_menu>
+<!-- vim:sw=2
+-->
diff --git a/home/.config/openbox/menu.xml b/home/.config/openbox/menu.xml
index 813203ee..392f7fe5 100644
--- a/home/.config/openbox/menu.xml
+++ b/home/.config/openbox/menu.xml
@@ -2,15 +2,15 @@
 <openbox_menu xmlns="http://openbox.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://openbox.org/  file:///usr/share/openbox/menu.xsd">
   <menu id="root-menu" label="Openbox 3">
     <separator label="ArchLabs"/>
-    <menu execute="al-terminalemulators-pipemenu" id="TerminalPipeMenu" label="Terminal"/>
-    <menu execute="al-filemanagers-pipemenu" id="FileManagerPipeMenu" label="File Manager"/>
+    <menu execute="al-terminal-pipemenu" id="TerminalPipeMenu" label="Terminal"/>
+    <menu execute="al-files-pipemenu" id="FilePipeMenu" label="File Manager"/>
     <menu execute="al-browsers-pipemenu" id="BrowserPipeMenu" label="Web Browser"/>
     <menu execute="al-editors-pipemenu" id="EditorPipeMenu" label="Text Editor"/>
     <separator/>
     <menu execute="al-office-pipemenu" id="OfficePipeMenu" label="Office"/>
     <menu execute="al-media-pipemenu" id="MediaPipeMenu" label="Multimedia"/>
     <menu execute="al-graphics-pipemenu" id="GraphicPipeMenu" label="Graphics"/>
-    <menu id="WebandMail" label="Web & Mail">
+    <menu id="AccessoriesMenu" label="Accessories">
       <menu execute="al-mail-pipemenu" id="MailPipeMenu" label="Mail"/>
       <menu execute="al-messaging-pipemenu" id="MessagingPipeMenu" label="Messaging"/>
       <menu execute="al-filesharing-pipemenu" id="FilesharingPipeMenu" label="File Sharing"/>
@@ -83,7 +83,7 @@
           <action name="Reconfigure"/>
         </item>
         <item label="Openbox Restart">
-          <action name="Restart"/>
+            <action name="Restart"/>
         </item>
       </menu>
       <menu execute="al-compositor" id="CompositingPipeMenu" label="Compositor"/>
@@ -108,3 +108,5 @@
     </item>
   </menu>
 </openbox_menu>
+<!-- vim:sw=2
+-->
diff --git a/home/.config/openbox/rc.xml b/home/.config/openbox/rc.xml
index e6b9e0d6..20ac0afb 100644
--- a/home/.config/openbox/rc.xml
+++ b/home/.config/openbox/rc.xml
@@ -742,3 +742,5 @@
     </application>
   </applications>
 </openbox_config>
+<!-- vim:sw=2
+-->