Added custom backgrounds, Setup auto wifi

LICENSE

@@ -1,7 +1,3 @@
-- `*`: GNU GPL-3.0
-- `config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160`.svg: (c) 2018 Alex Makas, GNU GPL-3.0
-- `config/includes.chroot/usr/share/backgrounds/homeworld-darker-3840x2160.png, config/bootloaders/*/splash.png, config/includes.chroot/boot/grub/splash.png`: (c) 2020 Juliette Taka, CC-BY-SA-4.0 or GNU GPL-2.0
-
 The ISO image resulting from the build includes software packages under
 various licenses. See `README/COPYING/AUTHORS/LICENSE/COPYRIGHT` files in
 `/usr/share/doc/` on the installed system for licenses of each software package.

Makefile

@@ -5,6 +5,8 @@ list: #Shows this list
 	@echo The following options are available
 	@grep '^[^#[:space:]].*:' Makefile | grep -v := | sed -e "s/:[^|]*#/: /g"
 
+prep_buildenv: #Preperation for build (setting file permissons, etc)
+	chmod 600 config/includes.chroot/etc/NetworkManager/system-connections/*.nmconnection
 
 install_buildenv: # Install packages required to build the image
 	sudo apt -y install live-build make build-essential wget git unzip colordiff apt-transport-https rename ovmf rsync python3-venv gnupg apt-utils cpio
@@ -13,7 +15,7 @@ download_extra: #For downloading extra's for iso (not needed/tested)
 	make -f Makefile.extra
 
 #Add 'download_extra' to build without third party software/dotfiles (not needed/tested)
-build: install_buildenv build_amd64 build_i386 clean_env #Runs build for all architectures
+build: prep_buildenv install_buildenv build_amd64 build_i386 clean_env #Runs build for all architectures
 
 build_amd64: #Build iso for amd64
 	rm -f Custom-image-amd64.iso

config/bootloaders/grub-pc/grub.cfg

@@ -1,4 +1,5 @@
 set default=0
+set timeout=5
 
 loadfont $prefix/dejavu-bold-16.pf2
 loadfont $prefix/dejavu-bold-14.pf2
@@ -29,11 +30,13 @@ play 960 440 1 0 4 440 1
 
 
 menuentry "Live system " {
+    echo "Loading ${1}... Please wait...".
     linux KERNEL_LIVE APPEND_LIVE locales=en_US.UTF-8
     initrd INITRD_LIVE
 }
 
 menuentry "Live system (ToRam)" {
+    echo "Loading ${1}... Please wait...".
     linux KERNEL_LIVE APPEND_LIVE toram locales=en_US.UTF-8
     initrd INITRD_LIVE
 }

config/bootloaders/isolinux/isolinux.cfg

@@ -1,4 +1,3 @@
 include menu.cfg
 default vesamenu.c32
-prompt 0
+prompt 0
-timeout 0

config/bootloaders/isolinux/live.cfg.in

@@ -1,42 +0,0 @@
-menu hshift 0
-menu width 82
-
-menu title dlc 3.0.0 - Boot menu
-include stdmenu.cfg
-
-label live-@FLAVOUR@
-        menu label ^Live (@FLAVOUR@) (English)
-        menu default
-        linux @LINUX@
-        initrd @INITRD@
-        append @APPEND_LIVE@ locales=en_US.UTF-8
-
-menu begin advanced
-	menu title Advanced options
-	include stdmenu.cfg
-
-	label live-@FLAVOUR@-failsafe
-		menu label ^Live (@FLAVOUR@ failsafe)
-		linux @LINUX@
-		initrd @INITRD@
-		append @APPEND_LIVE_FAILSAFE@
-
-	label install
-		menu label ^Install (text mode)
-		linux /install/vmlinuz
-		initrd /install/initrd.gz
-		append vga=788 @APPEND_INSTALL@ --- quiet
-
-	label hdt
-		menu label ^Hardware Detection Tool (HDT)
-		com32 hdt.c32
-
-	label memtest
-		menu label ^Memory Diagnostic Tool (memtest86+)
-		linux /live/memtest
-
-	label mainmenu
-		menu label ^Back..
-		menu exit
-
-menu end

config/bootloaders/isolinux/menu.cfg

@@ -1,17 +1,18 @@
+timeout 100
 menu hshift 0
 menu width 82
 
 menu title Gui-minimal-testing
 include stdmenu.cfg
 
-label live-amd64
+label live
         menu label ^Live system
         menu default
         linux /live/vmlinuz
         initrd /live/initrd.img
         append boot=live config locales=en_US.UTF-8
 
-label live-amd64-r
+label live-ram
         menu label ^Live system (ToRam)
         linux /live/vmlinuz
         initrd /live/initrd.img
@@ -21,16 +22,12 @@ menu begin advanced
 	menu title Advanced options
 	include stdmenu.cfg
 
-	label live-amd64-failsafe
+	label live-failsafe
 		menu label ^Live (amd64 failsafe)
 		linux /live/vmlinuz
 		initrd /live/initrd.img
 		append boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=788
 
-	label memtest
-		menu label ^Memory Diagnostic Tool (memtest86+)
-		linux /live/memtest
-
 	label mainmenu
 		menu label ^Back..
 		menu exit

config/hooks/normal/0091-UpdateNetworkManagerPerms.chroot

@@ -0,0 +1,3 @@
+#!/bin/bash
+#Set perrmissons for saved networks in NetworkManager
+chmod 600 /etc/NetworkManager/system-connections/*.nmconnection

config/hooks/normal/0091-remove-unwanted-icons.hook.chroot

@@ -0,0 +1,9 @@
+#!/bin/bash
+#Hide mail button in application menu
+sed -i -e 's/OnlyShowIn/NotShowIn/g' /usr/share/applications/xfce4-mail-reader.desktop
+
+#Hide 'Thunar bulk rename' button in application menu
+echo "NotShowIn=XFCE;" >> /usr/share/applications/thunar-bulk-rename.desktop
+
+#Hide 'Thunar bulk rename' button in application menu
+echo "NotShowIn=XFCE;" >> /usr/share/applications/display-im6.q16.desktop

config/hooks/normal/0350-update-default-services-status.hook.chroot

@@ -1,17 +0,0 @@
-#!/bin/bash
-echo "I: running $0"
-
-disabled_services="avahi-daemon.service openvpn.service rsync.service ssh.service nmbd.service smbd.service libvirtd.service libvirt-guests.service"
-enabled_services="bluetooth.service fancontrol.service laptop-mode.service ntp.service preload.service smartmontools.service rsyslog.service lm-sensors.service hddtemp.service haveged.service"
-
-for service in $disabled_services; do
-	echo "Disabling $service"
-	systemctl disable "$service" || true
-	systemctl stop "$service" || true
-done
-
-for service in $enabled_services; do
-	echo "Enabling $service"
-	systemctl enable "$service".service || true
-	systemctl start "$service".service || true
-done

config/hooks/normal/0350-update-default-services-status.hook.chroot.disabled

@@ -0,0 +1,17 @@
+#!/bin/bash
+echo "I: running $0"
+
+#disabled_services=""
+#enabled_services=""
+
+#for service in $disabled_services; do
+#	echo "Disabling $service"
+#	systemctl disable "$service" || true
+#	systemctl stop "$service" || true
+#done
+
+#for service in $enabled_services; do
+#	echo "Enabling $service"
+#	systemctl enable "$service".service || true
+#	systemctl start "$service".service || true
+done

config/includes.chroot/etc/NetworkManager/system-connections/Template.nmconnection

@@ -0,0 +1,26 @@
+[connection]
+id=TestAP
+uuid=8049632e-b8ae-4fea-b397-c35f410754d1
+type=wifi
+permissions=user:user:;
+
+[wifi]
+mac-address-blacklist=
+mode=infrastructure
+ssid=TestAO
+
+[wifi-security]
+auth-alg=open
+key-mgmt=wpa-psk
+psk=MyNicePassword123
+
+[ipv4]
+dns-search=
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+dns-search=
+method=auto
+
+[proxy]

config/includes.chroot/etc/lightdm/lightdm-gtk-greeter.conf

@@ -45,7 +45,7 @@
 #  transition-duration = overrides default value
 #
 [greeter]
-background = /usr/share/backgrounds/homeworld-darker-3840x2160.png
+background = /opt/custom/CustomBG.png
 user-background = false
 theme-name = Adwaita-dark
 icon-theme-name = Adwaita

config/includes.chroot/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml

@@ -4,19 +4,19 @@
   <property name="backdrop" type="empty">
     <property name="screen0" type="empty">
       <property name="monitor0" type="empty">
-        <property name="image-path" type="string" value="/usr/share/backgrounds/homeworld-darker-3840x2160.png"/>
+        <property name="image-path" type="string" value="/opt/custom/CustomBG.png"/>
         <property name="image-show" type="bool" value="true"/>
-        <property name="last-single-image" type="string" value="/usr/share/backgrounds/homeworld-darker-3840x2160.png"/>
+        <property name="last-single-image" type="string" value="/opt/custom/CustomBG.png"/>
         <property name="backdrop-cycle-enable" type="bool" value="true"/>
         <property name="backdrop-cycle-timer" type="uint" value="600"/>
         <property name="image-style" type="int" value="5"/>
         <property name="workspace0" type="empty">
           <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/homeworld-darker-3840x2160.png"/>
+          <property name="last-image" type="string" value="/opt/custom/CustomBG.png"/>
         </property>
         <property name="workspace1" type="empty">
           <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/backgrounds/homeworld-darker-3840x2160.png"/>
+          <property name="last-image" type="string" value="/opt/custom/CustomBG.png"/>
         </property>
       </property>
     </property>

config/includes.chroot/usr/share/backgrounds/futureprototype-darker-4096x2160.svg

@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="4096"
-   height="2160"
-   viewBox="0 0 1083.7333 571.50002"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="wallpaper-4096x2160.svg"
-   inkscape:export-filename="C:\Users\xine\Documents\2018-debian-buster\futurePrototype\futurePrototype-wallpaper-02-4096x2160.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#b20eb2"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.43353634"
-     inkscape:cx="1772.5157"
-     inkscape:cy="231.75614"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     showborder="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1143"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-page="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-global="false"
-     inkscape:object-paths="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-others="true"
-     showguides="false" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="back"
-     style="display:inline">
-    <rect
-       inkscape:export-ydpi="96"
-       inkscape:export-xdpi="96"
-       y="0"
-       x="0"
-       height="571.5"
-       width="1083.7333"
-       id="rect1009"
-       style="display:inline;opacity:1;fill:#2a2d37;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.98096466;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new"
-       inkscape:export-filename="C:\Users\xine\Documents\2018-debian-buster\futurePrototype-source\desktop-wallpaper\png\wallpaper-4096x2160.png" />
-  </g>
-  <g
-     inkscape:label="buster"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,274.50001)"
-     style="display:inline">
-    <g
-       id="g850"
-       inkscape:export-filename="C:\Users\xine\Documents\2018-debian-buster\futurePrototype-source\desktop-wallpaper\png\wallpaper-4096x2160.png"
-       inkscape:export-xdpi="96"
-       inkscape:export-ydpi="96">
-      <path
-         transform="matrix(0.26458333,0,0,0.26458333,0,-274.50001)"
-         inkscape:connector-curvature="0"
-         id="rect6945"
-         d="m 4096,213.4043 c -181.398,49.84648 -356.9629,122.70831 -521.1699,217.33398 -280.0429,161.37687 -528.7374,387.17968 -702.1231,667.63472 -173.3857,280.4551 -268.7325,616.7129 -247.5468,949.6875 2.3768,37.3559 6.2014,74.6656 10.748,111.9395 H 4096 Z"
-         style="display:inline;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:26.38474846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new" />
-      <path
-         transform="matrix(0.26458333,0,0,0.26458333,0,-274.50001)"
-         inkscape:connector-curvature="0"
-         id="rect1009-3"
-         d="m 4062.6191,1015.5117 c -99.5265,-0.085 -196.6509,12.7657 -290.2636,38.3731 -198.726,54.3595 -381.6278,166.2091 -538.1075,333.832 C 3055.83,1578.8404 2912.7906,1843.693 2814.5645,2160 H 4096 V 1016.043 c -11.155,-0.3314 -22.2841,-0.5218 -33.3809,-0.5313 z"
-         style="display:inline;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:26.38474846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new" />
-      <path
-         sodipodi:nodetypes="csssccssccccc"
-         inkscape:connector-curvature="0"
-         id="rect6824"
-         d="m 1629.8184,0 c -90.8566,137.17997 -158.1081,289.98136 -196.1153,450.0957 -29.9677,126.24631 -42.5685,257.0985 -86.873,379.05469 -22.1522,60.97809 -52.3846,119.56156 -94.2129,169.1543 -41.8283,49.59271 -95.7277,89.95811 -157.2793,110.46291 -58.3878,19.4507 -121.98209,20.5153 -182.38673,8.7363 C 852.54654,1105.725 795.10069,1081.4887 741.33203,1051.5488 633.79472,991.66914 540.39745,909.26708 435.01953,845.66406 303.28246,766.15145 153.18345,717.73529 0,703.61133 V 2160 h 4096 l -2e-4,-2160 z"
-         style="display:inline;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:26.38474846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new"
-         transform="matrix(0.26458333,0,0,0.26458333,0,-274.50001)" />
-      <path
-         inkscape:connector-curvature="0"
-         id="rect6875"
-         d="m 2980.1582,94.371094 c -310.3353,-0.787389 -620.7967,81.515716 -892.498,238.085936 -224.6687,129.46711 -424.1877,310.62161 -563.2891,535.62109 -139.1014,224.99948 -215.5942,494.76828 -198.5977,761.90238 11.0104,173.0494 60.2189,344.848 41.6328,517.1914 -0.4617,4.2812 -0.9765,8.5581 -1.5234,12.8281 H 4096 V 495.32227 c -1.1582,-0.93757 -2.3083,-1.88572 -3.4688,-2.82032 -280.792,-226.14051 -625.7729,-364.44268 -979.4941,-392.679684 -44.215,-3.529626 -88.5454,-5.338694 -132.8789,-5.451172 z"
-         style="display:inline;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:26.38474846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new"
-         transform="matrix(0.26458333,0,0,0.26458333,0,-274.50001)" />
-      <path
-         transform="matrix(0.26458333,0,0,0.26458333,0,-274.50001)"
-         inkscape:connector-curvature="0"
-         id="rect6840"
-         d="m 3131.8008,1240.3203 c -206.0267,-0.081 -412.0023,32.5252 -607.25,98.4473 C 2106.4691,1479.9258 1739.9267,1776.6323 1524.2246,2160 H 4096 v -660.1211 c -46.9581,-27.6701 -95.1308,-53.2934 -144.3906,-76.7109 -255.0478,-121.2466 -537.4758,-182.7374 -819.8086,-182.8477 z"
-         style="display:inline;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:26.38474846;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new" />
-      <path
-         sodipodi:nodetypes="cccccccsscc"
-         inkscape:connector-curvature="0"
-         id="rect6831"
-         d="m 201.57064,-274.50001 c -59.50544,41.03786 -96.04816,143.75354 -49.31765,204.466707 28.96227,34.740607 124.88358,22.289386 116.56482,81.279915 -5.83416,47.811626 23.42057,110.378938 61.44848,143.126948 72.49429,66.64872 141.31456,64.35723 233.94718,55.68375 106.98566,-10.57677 217.94537,-30.28748 322.72016,4.85305 58.44363,17.39381 113.68707,45.39844 162.38007,82.08962 8.9188,-20.07147 -95.2243,-128.1934 -132.8661,-177.66382 -25.79515,-33.901047 -156.81148,-185.463177 -296.19092,-316.62217 -23.88689,-22.47807 -69.39444,-77.214 -92.86571,-77.214 z"
-         style="display:inline;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.98096466;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new" />
-      <path
-         sodipodi:nodetypes="ccccccssc"
-         inkscape:connector-curvature="0"
-         id="rect6834"
-         d="M 0,-257.14758 V 296.99998 H 915.53481 C 929.42435,202.41422 886.96698,93.287011 794.56467,54.980584 692.79396,13.343476 578.64554,57.25018 476.34252,17.279761 421.66235,1.2559597 362.47488,-33.12403 351.30822,-93.878903 c -4.05099,-35.686387 -42.72504,-63.856167 -74.36559,-58.787477 -52.85192,8.46667 -49.22915,48.66914 -141.82849,51.1401 C 69.787089,-99.783066 18.291006,-195.34546 0,-257.14758 Z"
-         style="display:inline;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.98096466;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new" />
-      <path
-         sodipodi:nodetypes="cccccsssssc"
-         inkscape:connector-curvature="0"
-         id="rect6828"
-         d="m 88.215286,85.414205 c -2.702105,-0.0026 -5.407353,0.04133 -8.1163,0.13642 C 52.526755,86.518523 25.202344,92.981051 0,104.19703 V 296.915 c 218.55761,0.19124 437.30603,-2e-5 655.86384,-2e-5 2.66756,-10.68399 4.27509,-21.63138 4.73975,-32.63472 1.29953,-30.77316 -6.29613,-61.8709 -21.63641,-88.57959 C 623.62693,148.99199 600.59291,126.76072 573.35724,112.37689 525.27739,86.984746 467.89607,87.009325 413.89567,93.364617 359.89524,99.719909 306.02306,111.80293 251.75931,108.35646 196.75429,104.86291 143.15807,85.468207 88.215286,85.414205 Z"
-         style="display:inline;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.98096466;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;enable-background:new" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="swirl"
-     style="display:inline" />
-</svg>

config/package-lists/system.list.chroot

@@ -74,6 +74,7 @@ apparmor-profiles
 apparmor-utils
 libpam-tmpdir
 sudo
+dbus-x11
 
 #Section: Time
 chrony