From: W. Trevor King Date: Thu, 9 May 2013 17:21:34 +0000 (+0000) Subject: Convert XSession from fluxbox to the more traditional Xfce4 X-Git-Url: http://git.tremily.us/?p=catalyst-swc.git;a=commitdiff_plain;h=2479738fc89067e68c39fe11d67ca14260c9f7f5 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 4cc5044..75bac81 100755 --- 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 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 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 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 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 index 0000000..b5c5d03 --- /dev/null +++ b/overlays/default/home/swc/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spec/default-livecd-stage1-i686-2013.1.spec b/spec/default-livecd-stage1-i686-2013.1.spec index 7bd8f81..588d2c3 100644 --- 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 7d45d2a..75db352 100644 --- 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