Convert XSession from fluxbox to the more traditional Xfce4

Xfce has a start menu, etc., while fluxbox has you right click on the
root window for all the silly stuff ;).

On Mon, Mar 18, 2013 at 07:38:30PM -0400, jon pipitone wrote:
> What about using Xfce as desktop environment? That might go along
> way to make this machine more usable.

The downside is that the ISO is now 767 MB, which means that we no
longer fit on a CD.  If you're using a 1 GB USB stick, you've still
got some breathing room though ;).

diff --git a/bin/fsscript.sh b/bin/fsscript.sh
index 4cc504449551a1622d63fda3aec2d6ebc77cfe63..75bac81da884620a9fcb0e72453f4f3467393345 100755 (executable)
--- a/bin/fsscript.sh
+++ b/bin/fsscript.sh
@@ -1,6 +1,14 @@
 #!/bin/bash
 
+# general tweaks
 echo 'source /etc/profile.d/nobeep.sh' >> /home/swc/.bashrc 
+
+# fluxbox tweaks
 mkdir /home/swc/.fluxbox
 su swc fluxbox-generate_menu
-chown -R swc.users /home/swc
+
+# xfce tweaks
+sed -i 's/TerminalEmulator=Terminal/TerminalEmulator=xterm/' /etc/xdg/xfce4/helpers.rc
+
+# make sure there are no root-owned files in ~swc
+chown -R swc:users /home/swc

diff --git a/overlays/default/home/swc/.config/xfce4/panel/launcher-10/13676829712.desktop b/overlays/default/home/swc/.config/xfce4/panel/launcher-10/13676829712.desktop
new file mode 100644 (file)
index 0000000..33160ea
--- /dev/null
+++ b/overlays/default/home/swc/.config/xfce4/panel/launcher-10/13676829712.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch FileManager %u
+Icon=system-file-manager
+StartupNotify=true
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/file;x-scheme-handler/trash;
+Name=File Manager
+Comment=Browse the file system
+X-XFCE-Source=file:///usr/share/applications/exo-file-manager.desktop

diff --git a/overlays/default/home/swc/.config/xfce4/panel/launcher-11/13676829713.desktop b/overlays/default/home/swc/.config/xfce4/panel/launcher-11/13676829713.desktop
new file mode 100644 (file)
index 0000000..b6be6b4
--- /dev/null
+++ b/overlays/default/home/swc/.config/xfce4/panel/launcher-11/13676829713.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch WebBrowser %u
+Icon=web-browser
+StartupNotify=true
+Terminal=false
+Categories=Network;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+X-XFCE-MimeType=x-scheme-handler/http;x-scheme-handler/https;
+Name=Web Browser
+Comment=Browse the web
+X-XFCE-Source=file:///usr/share/applications/exo-web-browser.desktop

diff --git a/overlays/default/home/swc/.config/xfce4/panel/launcher-12/13676829724.desktop b/overlays/default/home/swc/.config/xfce4/panel/launcher-12/13676829724.desktop
new file mode 100644 (file)
index 0000000..c795ef2
--- /dev/null
+++ b/overlays/default/home/swc/.config/xfce4/panel/launcher-12/13676829724.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Exec=xfce4-appfinder
+Icon=gtk-find
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=Utility;X-XFCE;
+Name=Application Finder
+Comment=Find and launch applications installed on your system
+X-XFCE-Source=file:///usr/share/applications/xfce4-appfinder.desktop

diff --git a/overlays/default/home/swc/.config/xfce4/panel/launcher-9/13676829711.desktop b/overlays/default/home/swc/.config/xfce4/panel/launcher-9/13676829711.desktop
new file mode 100644 (file)
index 0000000..25d9e41
--- /dev/null
+++ b/overlays/default/home/swc/.config/xfce4/panel/launcher-9/13676829711.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Exec=exo-open --launch TerminalEmulator
+Icon=utilities-terminal
+StartupNotify=true
+Terminal=false
+Categories=Utility;X-XFCE;X-Xfce-Toplevel;
+OnlyShowIn=XFCE;
+Name=Terminal Emulator
+Comment=Use the command line
+X-XFCE-Source=file:///usr/share/applications/exo-terminal-emulator.desktop

diff --git a/overlays/default/home/swc/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/overlays/default/home/swc/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
new file mode 100644 (file)
index 0000000..b5c5d03
--- /dev/null
+++ b/overlays/default/home/swc/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-panel" version="1.0">
+  <property name="configver" type="int" value="2"/>
+  <property name="panels" type="array">
+    <value type="int" value="1"/>
+    <value type="int" value="2"/>
+    <property name="panel-1" type="empty">
+      <property name="position" type="string" value="p=6;x=0;y=0"/>
+      <property name="length" type="uint" value="100"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="size" type="uint" value="30"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="1"/>
+        <value type="int" value="3"/>
+        <value type="int" value="15"/>
+        <value type="int" value="4"/>
+        <value type="int" value="5"/>
+        <value type="int" value="6"/>
+        <value type="int" value="2"/>
+      </property>
+    </property>
+    <property name="panel-2" type="empty">
+      <property name="position" type="string" value="p=10;x=0;y=0"/>
+      <property name="position-locked" type="bool" value="true"/>
+      <property name="plugin-ids" type="array">
+        <value type="int" value="7"/>
+        <value type="int" value="8"/>
+        <value type="int" value="9"/>
+        <value type="int" value="10"/>
+        <value type="int" value="11"/>
+        <value type="int" value="12"/>
+        <value type="int" value="13"/>
+        <value type="int" value="14"/>
+      </property>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-1" type="string" value="applicationsmenu"/>
+    <property name="plugin-2" type="string" value="actions">
+      <property name="appearance" type="uint" value="0"/>
+      <property name="invert-orientation" type="bool" value="false"/>
+      <property name="items" type="array">
+        <value type="string" value="-lock-screen"/>
+        <value type="string" value="-switch-user"/>
+        <value type="string" value="-separator"/>
+        <value type="string" value="-suspend"/>
+        <value type="string" value="-hibernate"/>
+        <value type="string" value="-separator"/>
+        <value type="string" value="+shutdown"/>
+        <value type="string" value="-restart"/>
+        <value type="string" value="-separator"/>
+        <value type="string" value="-logout"/>
+        <value type="string" value="-logout-dialog"/>
+      </property>
+    </property>
+    <property name="plugin-3" type="string" value="tasklist"/>
+    <property name="plugin-15" type="string" value="separator">
+      <property name="expand" type="bool" value="true"/>
+      <property name="style" type="uint" value="0"/>
+    </property>
+    <property name="plugin-4" type="string" value="pager"/>
+    <property name="plugin-5" type="string" value="clock">
+      <property name="mode" type="uint" value="2"/>
+      <property name="fuzziness" type="uint" value="0"/>
+      <property name="show-frame" type="bool" value="false"/>
+    </property>
+    <property name="plugin-6" type="string" value="systray"/>
+    <property name="plugin-7" type="string" value="showdesktop"/>
+    <property name="plugin-8" type="string" value="separator"/>
+    <property name="plugin-9" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="13676829711.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-10" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="13676829712.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-11" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="13676829713.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-12" type="string" value="launcher">
+      <property name="items" type="array">
+        <value type="string" value="13676829724.desktop"/>
+      </property>
+    </property>
+    <property name="plugin-13" type="string" value="separator"/>
+    <property name="plugin-14" type="string" value="directorymenu">
+      <property name="base-directory" type="string" value="/home/swc"/>
+    </property>
+  </property>
+</channel>

diff --git a/spec/default-livecd-stage1-i686-2013.1.spec b/spec/default-livecd-stage1-i686-2013.1.spec
index 7bd8f8127a0e15cd11716b01394a743e03916c88..588d2c393854925f752a9c451561e3ac9e3ec639 100644 (file)
--- a/spec/default-livecd-stage1-i686-2013.1.spec
+++ b/spec/default-livecd-stage1-i686-2013.1.spec
@@ -75,3 +75,4 @@ livecd/packages:
   x11-terms/eterm
   x11-terms/xterm
   x11-wm/fluxbox
+  xfce-base/xfce4-meta

diff --git a/spec/default-livecd-stage2-i686-2013.1.spec b/spec/default-livecd-stage2-i686-2013.1.spec
index 7d45d2a13988b737fb50389aa07ca52e9bc790c9..75db352c5b7379e6328198b5145b975810f4bfef 100644 (file)
--- a/spec/default-livecd-stage2-i686-2013.1.spec
+++ b/spec/default-livecd-stage2-i686-2013.1.spec
@@ -15,7 +15,7 @@ livecd/root_overlay: /var/tmp/catalyst/overlays/default/
 livecd/type: generic-livecd
 livecd/rcadd: syslog-ng|default vixie-cron|default
 livecd/rcdel: autoconfig|default
-livecd/xsession: fluxbox
+livecd/xsession: Xfce4
 livecd/users: swc
 livecd/volid: SWC (Gentoo) Linux 2013.1 x86
 boot/kernel: gentoo