Skip to content

Commit

Permalink
switch to xfce wm
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy Nicklas committed Apr 19, 2018
1 parent 42d7c04 commit a7baf8e
Show file tree
Hide file tree
Showing 9 changed files with 84 additions and 51 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Changed
- Switched from using Fluxbox to Xfce for the window manager.

## [0.2.0] - 2018-02-26
### Added
Expand Down
20 changes: 20 additions & 0 deletions template/config/menus/xfce-applications.menu
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">

<Menu>
<Name>Xfce</Name>

<DefaultAppDirs/>
<DefaultDirectoryDirs/>
<DefaultMergeDirs/>

<Include>
<All/>
</Include>

<Layout>
<Filename>firefox.desktop</Filename>
<Filename>xfce4-terminal.desktop</Filename>
<Filename>Thunar.desktop</Filename>
</Layout>
</Menu>
3 changes: 3 additions & 0 deletions template/config/xfce4/terminal/terminalrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Configuration]
CommandLoginShell=TRUE
FontName=DejaVu Sans Mono 11
44 changes: 44 additions & 0 deletions template/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?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"/>
<property name="panel-1" type="empty">
<property name="position" type="string" value="p=6;x=99;y=24"/>
<property name="position-locked" type="bool" value="true"/>
<property name="size" type="uint" value="48"/>
<property name="length" type="uint" value="100"/>
<property name="length-adjust" type="bool" value="false"/>
<property name="plugin-ids" type="array">
<value type="int" value="1"/>
<value type="int" value="3"/>
<value type="int" value="8"/>
<value type="int" value="4"/>
<value type="int" value="5"/>
</property>
<property name="mode" type="uint" value="0"/>
</property>
</property>
<property name="plugins" type="empty">
<property name="plugin-3" type="string" value="tasklist">
<property name="flat-buttons" type="bool" value="false"/>
<property name="show-handle" type="bool" value="true"/>
</property>
<property name="plugin-4" type="string" value="pager"/>
<property name="plugin-5" type="string" value="clock">
<property name="digital-format" type="string" value="%r"/>
<property name="mode" type="uint" value="2"/>
</property>
<property name="plugin-8" type="string" value="separator">
<property name="expand" type="bool" value="true"/>
<property name="style" type="uint" value="2"/>
</property>
<property name="plugin-1" type="string" value="applicationsmenu">
<property name="show-generic-names" type="bool" value="true"/>
<property name="show-menu-icons" type="bool" value="true"/>
<property name="button-icon" type="string" value="fedora-logo-icon"/>
<property name="show-tooltips" type="bool" value="true"/>
</property>
</property>
</channel>
6 changes: 0 additions & 6 deletions template/fluxbox.rc.erb

This file was deleted.

18 changes: 0 additions & 18 deletions template/fluxbox/keys

This file was deleted.

6 changes: 0 additions & 6 deletions template/fluxbox/menu

This file was deleted.

8 changes: 0 additions & 8 deletions template/fluxbox/overlay

This file was deleted.

28 changes: 15 additions & 13 deletions template/script.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,20 @@ module purge
cd "${HOME}"

#
# Launch Fluxbox
# Launch Xfce Window Manager and Panel
#

# Create Fluxbox root or it will override the below init file
(
umask 077
mkdir -p "${HOME}/.fluxbox"
)

# Start the Fluxbox window manager (it likes to crash on occassion, make it
# persistent)
(
until fluxbox -display "${DISPLAY}.0" -rc "<%= session.staged_root.join("fluxbox.rc") %>"; do
echo "Fluxbox crashed with exit code $?. Respawning..." >&2
sleep 1
done
export SEND_256_COLORS_TO_REMOTE=1
export XDG_CONFIG_HOME="<%= session.staged_root.join("config") %>"
export XDG_DATA_HOME="<%= session.staged_root.join("share") %>"
export XDG_CACHE_HOME="$(mktemp -d)"
module restore
set -x
xfwm4 --compositor=off --daemon --sm-client-disable
xsetroot -solid "#D3D3D3"
xfsettingsd --sm-client-disable
xfce4-panel --sm-client-disable
) &

#
Expand All @@ -37,7 +35,11 @@ module load <%= context.version %>
# Launch MATLAB
<%- if gpu -%>
module load intel/16.0.3 virtualgl
module list
set -x
vglrun matlab -desktop -nosoftwareopengl
<%- else -%>
module list
set -x
matlab -desktop
<%- end -%>

0 comments on commit a7baf8e

Please sign in to comment.