Add xfce, plank, wallpaper configs and support

resources/InstallResources/xfce-config/lightdm/lightdm-gtk-greeter.conf

@@ -0,0 +1,6 @@
+[greeter]
+background = /usr/share/images/desktop-base/default
+theme-name = Numix
+-xft-hintstyle = 
+icon-theme-name = Paper
+

resources/InstallResources/xfce-config/panel/default.xml

@@ -0,0 +1,48 @@
+<?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=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="4"/>
+        <value type="int" value="15"/>
+        <value type="int" value="6"/>
+        <value type="int" value="16"/>
+        <value type="int" value="17"/>
+        <value type="int" value="5"/>
+        <value type="int" value="2"/>
+      </property>
+    </property>
+  </property>
+  <property name="plugins" type="empty">
+    <property name="plugin-1" type="string" value="applicationsmenu">
+      <property name="show-menu-icons" type="bool" value="true"/>
+      <property name="show-button-title" type="bool" value="true"/>
+    </property>
+    <property name="plugin-2" type="string" value="actions"/>
+    <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="plugin-6" type="string" value="systray">
+      <property name="names-visible" type="array">
+        <value type="string" value="vlc"/>
+        <value type="string" value="xfce4-power-manager"/>
+        <value type="string" value="wicd-client.py"/>
+      </property>
+    </property>
+    <property name="plugin-16" type="string" value="pulseaudio">
+      <property name="enable-keyboard-shortcuts" type="bool" value="true"/>
+    </property>
+    <property name="plugin-17" type="string" value="power-manager-plugin"/>
+  </property>
+</channel>

resources/InstallResources/xfce-config/plank/plank.dconf

@@ -0,0 +1,21 @@
+[dock1]
+icon-size=42
+show-dock-item=false
+position='bottom'
+dock-items=['xfcalendar.dockitem', 'firefox-esr.dockitem']
+unhide-delay=0
+items-alignment='center'
+theme='Default'
+hide-mode='none'
+pinned-only=false
+auto-pinning=true
+alignment='center'
+zoom-percent=150
+hide-delay=0
+zoom-enabled=false
+monitor=''
+lock-items=false
+tooltips-enabled=true
+pressure-reveal=false
+offset=0
+current-workspace-only=false

resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-power-manager" version="1.0">
+  <property name="xfce4-power-manager" type="empty">
+    <property name="power-button-action" type="empty"/>
+    <property name="brightness-switch-restore-on-exit" type="int" value="0"/>
+    <property name="brightness-switch" type="int" value="0"/>
+    <property name="brightness-on-battery" type="uint" value="9"/>
+    <property name="brightness-level-on-battery" type="uint" value="100"/>
+    <property name="dpms-on-battery-off" type="uint" value="15"/>
+    <property name="dpms-on-battery-sleep" type="uint" value="14"/>
+    <property name="blank-on-battery" type="int" value="10"/>
+    <property name="blank-on-ac" type="int" value="0"/>
+    <property name="dpms-on-ac-sleep" type="uint" value="29"/>
+    <property name="dpms-on-ac-off" type="uint" value="30"/>
+    <property name="inactivity-on-battery" type="uint" value="30"/>
+    <property name="brightness-level-on-ac" type="uint" value="100"/>
+  </property>
+</channel>

resources/InstallResources/xfce-config/xfce-perchannel-xml/xsettings.xml

@@ -0,0 +1,46 @@
+<!--
+  Default values for the X settings registry as described in
+  http://www.freedesktop.org/wiki/Specifications/XSettingsRegistry
+-->
+
+<?xml version="1.0" encoding="UTF-8"?>
+<channel name="xsettings" version="1.0">
+  <property name="Net" type="empty">
+    <property name="ThemeName" type="string" value="Numix"/>
+    <property name="IconThemeName" type="string" value="Paper"/>
+    <property name="DoubleClickTime" type="int" value="400"/>
+    <property name="DoubleClickDistance" type="int" value="5"/>
+    <property name="DndDragThreshold" type="int" value="8"/>
+    <property name="CursorBlink" type="bool" value="true"/>
+    <property name="CursorBlinkTime" type="int" value="1200"/>
+    <property name="SoundThemeName" type="string" value="default"/>
+    <property name="EnableEventSounds" type="bool" value="false"/>
+    <property name="EnableInputFeedbackSounds" type="bool" value="false"/>
+  </property>
+  <property name="Xft" type="empty">
+    <property name="DPI" type="empty"/>
+    <property name="Antialias" type="int" value="-1"/>
+    <property name="Hinting" type="int" value="-1"/>
+    <property name="HintStyle" type="string" value="hintnone"/>
+    <property name="RGBA" type="string" value="none"/>
+    <!-- <property name="Lcdfilter" type="string" value="none"/> -->
+  </property>
+  <property name="Gtk" type="empty">
+    <property name="CanChangeAccels" type="bool" value="false"/>
+    <property name="ColorPalette" type="string" value="black:white:gray50:red:purple:blue:light blue:green:yellow:orange:lavender:brown:goldenrod4:dodger blue:pink:light green:gray10:gray30:gray75:gray90"/>
+    <property name="FontName" type="string" value="Sans 10"/>
+    <property name="IconSizes" type="string" value=""/>
+    <property name="KeyThemeName" type="string" value=""/>
+    <property name="ToolbarStyle" type="string" value="icons"/>
+    <property name="ToolbarIconSize" type="int" value="3"/>
+    <!-- <property name="IMPreeditStyle" type="string" value=""/> -->
+    <!-- <property name="IMStatusStyle" type="string" value=""/> -->
+    <!-- <property name="IMModule" type="string" value=""/> -->
+    <property name="MenuImages" type="bool" value="true"/>
+    <property name="ButtonImages" type="bool" value="true"/>
+    <property name="MenuBarAccel" type="string" value="F10"/>
+    <property name="CursorThemeName" type="string" value=""/>
+    <property name="CursorThemeSize" type="int" value="0"/>
+    <property name="DecorationLayout" type="string" value="close,maximize,minimize:menu"/>
+  </property>
+</channel>

scripts/InstallScripts/InstallPackages.sh

@@ -3,7 +3,7 @@
 DIR=/InstallResources
 
 while true; do
-    read -p "install (X)fce4 or (L)xqt: " XL
+    read -p "install (X)fce4 or (L)xqt, if unsure choose (X)fce4: " XL
     case $XL in
         [Xx]* ) DE=xfce; break;;
         [Ll]* ) DE=lxqt; break;;
@@ -13,14 +13,28 @@ done
 
 locale-gen
 #Install shared packages
-apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils xserver-xorg-input-synaptics mousepad vlc
+apt install -y xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils xserver-xorg-input-synaptics mousepad vlc dconf-tools
 apt install -y wicd-daemon wicd wicd-curses wicd-gtk
 
-[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme
+[ "$DE" = "xfce" ] && apt install -y xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies numix-gtk-theme plank
 [ "$DE" = "lxqt" ] && apt install -y lxqt
 
 #Install packages not in an apt repo
 [ "$DE" = "xfce" ] && dpkg -i $DIR/xfce-themes/*
+#Copy in xfce4 default settings
+[ "$DE" = "xfce" ] && rm /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml && rm /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+[ "$DE" = "xfce" ] && cp $DIR/xfce-config/xfce-perchannel-xml/* /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/
+[ "$DE" = "xfce" ] && cp $DIR/xfce-config/panel/* /etc/xdg/xfce4/panel/
+#Copy in lightdm/light greeter settings
+[ "$DE" = "xfce" ] && rm /etc/lightdm/lightdm-gtk-greeter.conf
+[ "$DE" = "xfce" ] && cp $DIR/xfce-config/lightdm/* /etc/lightdm/
+#Copy in wallpapers
+[ "$DE" = "xfce" ] && rm /usr/share/images/desktop-base/default && cp $DIR/wallpapers/* /usr/share/images/desktop-base/
+#Load in Plank settings
+[ "$DE" = "xfce" ] && cat $DIR/xfce-config/plank/plank.dconf | dconf load /net/launchpad/plank/docks/
+
+
+
 
 #Copy in acpi, pulse audio, trackpad settings, funtion key settings
 cp -rf $DIR/default.pa /etc/pulse/default.pa

scripts/buildDebianFs.sh

@@ -92,7 +92,7 @@ chroot $outmnt apt-get autoremove --purge
 chroot $outmnt apt-get clean
 
 #Download the packages to be installed by Install.sh: TODO: potentially dpkg-reconfigure locales?
-chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt wicd-daemon wicd wicd-curses wicd-gtk xserver-xorg-input-synaptics crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme
+chroot $outmnt apt-get install -y -d xorg acpi-support lightdm tasksel dpkg librsvg2-common xorg xserver-xorg-input-libinput alsa-utils anacron avahi-daemon eject iw libnss-mdns xdg-utils lxqt wicd-daemon wicd wicd-curses wicd-gtk xserver-xorg-input-synaptics crda xfce4 dbus-user-session system-config-printer tango-icon-theme xfce4-power-manager xfce4-terminal xfce4-goodies mousepad vlc libutempter0 xterm numix-gtk-theme dconf-tools
 
 #Cleanup hosts
 rm -rf $outmnt/etc/hosts #This is what https://wiki.debian.org/EmDebian/CrossDebootstrap suggests