diff --git a/resources/InstallResources/wallpapers/1.JPG b/resources/InstallResources/wallpapers/1.JPG new file mode 100644 index 0000000..17b054c Binary files /dev/null and b/resources/InstallResources/wallpapers/1.JPG differ diff --git a/resources/InstallResources/wallpapers/10.JPG b/resources/InstallResources/wallpapers/10.JPG new file mode 100644 index 0000000..3e95983 Binary files /dev/null and b/resources/InstallResources/wallpapers/10.JPG differ diff --git a/resources/InstallResources/wallpapers/11.JPG b/resources/InstallResources/wallpapers/11.JPG new file mode 100644 index 0000000..c912a2d Binary files /dev/null and b/resources/InstallResources/wallpapers/11.JPG differ diff --git a/resources/InstallResources/wallpapers/12.JPG b/resources/InstallResources/wallpapers/12.JPG new file mode 100644 index 0000000..2db5be0 Binary files /dev/null and b/resources/InstallResources/wallpapers/12.JPG differ diff --git a/resources/InstallResources/wallpapers/13.JPG b/resources/InstallResources/wallpapers/13.JPG new file mode 100644 index 0000000..973bf26 Binary files /dev/null and b/resources/InstallResources/wallpapers/13.JPG differ diff --git a/resources/InstallResources/wallpapers/2.JPG b/resources/InstallResources/wallpapers/2.JPG new file mode 100644 index 0000000..be032f9 Binary files /dev/null and b/resources/InstallResources/wallpapers/2.JPG differ diff --git a/resources/InstallResources/wallpapers/3.jpg b/resources/InstallResources/wallpapers/3.jpg new file mode 100644 index 0000000..ed11fe5 Binary files /dev/null and b/resources/InstallResources/wallpapers/3.jpg differ diff --git a/resources/InstallResources/wallpapers/4.jpg b/resources/InstallResources/wallpapers/4.jpg new file mode 100644 index 0000000..b7b48c1 Binary files /dev/null and b/resources/InstallResources/wallpapers/4.jpg differ diff --git a/resources/InstallResources/wallpapers/5.JPG b/resources/InstallResources/wallpapers/5.JPG new file mode 100644 index 0000000..09af720 Binary files /dev/null and b/resources/InstallResources/wallpapers/5.JPG differ diff --git a/resources/InstallResources/wallpapers/6.JPG b/resources/InstallResources/wallpapers/6.JPG new file mode 100644 index 0000000..09b855d Binary files /dev/null and b/resources/InstallResources/wallpapers/6.JPG differ diff --git a/resources/InstallResources/wallpapers/7.jpg b/resources/InstallResources/wallpapers/7.jpg new file mode 100644 index 0000000..777924e Binary files /dev/null and b/resources/InstallResources/wallpapers/7.jpg differ diff --git a/resources/InstallResources/wallpapers/8.JPG b/resources/InstallResources/wallpapers/8.JPG new file mode 100644 index 0000000..0d58c01 Binary files /dev/null and b/resources/InstallResources/wallpapers/8.JPG differ diff --git a/resources/InstallResources/wallpapers/9.JPG b/resources/InstallResources/wallpapers/9.JPG new file mode 100644 index 0000000..92221ed Binary files /dev/null and b/resources/InstallResources/wallpapers/9.JPG differ diff --git a/resources/InstallResources/wallpapers/default b/resources/InstallResources/wallpapers/default new file mode 100644 index 0000000..83ef914 Binary files /dev/null and b/resources/InstallResources/wallpapers/default differ diff --git a/resources/InstallResources/xfce-config/lightdm/lightdm-gtk-greeter.conf b/resources/InstallResources/xfce-config/lightdm/lightdm-gtk-greeter.conf new file mode 100644 index 0000000..9d56da4 --- /dev/null +++ b/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 + diff --git a/resources/InstallResources/xfce-config/panel/default.xml b/resources/InstallResources/xfce-config/panel/default.xml new file mode 100644 index 0000000..517aa8c --- /dev/null +++ b/resources/InstallResources/xfce-config/panel/default.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/InstallResources/xfce-config/plank/plank.dconf b/resources/InstallResources/xfce-config/plank/plank.dconf new file mode 100644 index 0000000..95d655b --- /dev/null +++ b/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 diff --git a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml new file mode 100644 index 0000000..eb23e0e --- /dev/null +++ b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xfce4-power-manager.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/InstallResources/xfce-config/xfce-perchannel-xml/xsettings.xml b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xsettings.xml new file mode 100644 index 0000000..ffdddce --- /dev/null +++ b/resources/InstallResources/xfce-config/xfce-perchannel-xml/xsettings.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 4caea66..adea07c 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/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 diff --git a/scripts/buildDebianFs.sh b/scripts/buildDebianFs.sh index 21e2a01..4b0abd9 100755 --- a/scripts/buildDebianFs.sh +++ b/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