Update .gitignore

.gitignore

@@ -1,5 +1,4 @@
-*.iso
-*.img
-*.qcow*
-windvn-*/
-output/
+/*.iso
+/*.img
+/windvn-*/
+/output/

modlists/hardware-proprietary

@@ -1,2 +1,3 @@
 sources-proprietary
+firmware-proprietary-prereq
 firmware-proprietary

mods/firmware-proprietary-prereq/data/chroot

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -e
+apt-get -y install python3-apt

mods/firmware-proprietary/data/chroot

@@ -1,13 +1,20 @@
-#!/bin/bash
-set -e
-function sfp {
-	packages=""
-	while read p; do
-		IFS=" " read -ra packageinfo <<< "$p"
-		if [[ "${packageinfo[0]}" == *firmware* ]]; then
-			packages="$packages ${packageinfo[0]}"
-		fi
-	done <<<$(apt-cache search "$1")
-	echo "$packages"
-}
-echo "WDVN_PACKAGES=\"\$WDVN_PACKAGES firmware-linux firmware-misc-nonfree amd64-microcode intel-microcode $(sfp wireless) $(sfp wifi) $(sfp net) $(sfp nic)\"" >"/chroot-out"
+#!/usr/bin/env bash
+cat << EOF | debconf-set-selections
+firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
+EOF
+
+cat << EOF | debconf-set-selections
+firmware-ivtv firmware-ivtv/license/accepted boolean true
+EOF
+
+python3 << EOF
+import apt
+cache = apt.Cache()
+ofile = open("/chroot-out","w",encoding="utf-8")
+ofile.write('WDVN_PACKAGES="$WDVN_PACKAGES')
+for package in cache:
+	if package.candidate.origins[0].component == "non-free-firmware":
+		ofile.write(" " + package.name)
+ofile.write('"')
+ofile.close()
+EOF

mods/graphical-xfce4/data/etc/skel/.config/autostart/Lock screen on standby.desktop

@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=0.9.4
-Type=Application
-Name=Lock screen on standby
-Comment=
-Exec=wdvn-lock
-OnlyShowIn=XFCE;
-RunHook=4
-StartupNotify=false
-Terminal=false
-Hidden=false
-

mods/graphical-xfce4/data/etc/skel/.config/autostart/lockscreen.desktop

@@ -4,7 +4,7 @@ Version=0.9.4
 Type=Application
 Name=lockscreen
 Comment=
-Exec=xautolock -time 15 -corners 0-00 -locker wdvn-lock
+Exec=bash -c 'xset s 900 5; XSECURELOCK_BLANK_DPMS_STATE="off" XSECURELOCK_SHOW_DATETIME=1 XSECURELOCK_DATETIME_FORMAT="%%A - %%d.%%m.%%Y, %%H:%%M:%%S" XSECURELOCK_DISCARD_FIRST_KEYPRESS=0 XSECURELOCK_BLANK_TIMEOUT=5 XSECURELOCK_AUTH_TIMEOUT=20 xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock'
 OnlyShowIn=XFCE;
 RunHook=0
 StartupNotify=false

mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml

@@ -50,7 +50,7 @@
       <property name="HomePage" type="string" value="exo-open --launch WebBrowser"/>
       <property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
       <property name="override" type="bool" value="true"/>
-      <property name="&lt;Super&gt;l" type="string" value="wdvn-lock"/>
+      <property name="&lt;Super&gt;l" type="string" value="xset s activate"/>
       <property name="&lt;Super&gt;x" type="string" value="exo-open --launch TerminalEmulator"/>
       <property name="&lt;Alt&gt;F1" type="string" value="xfce4-popup-whiskermenu"/>
     </property>

mods/graphical-xfce4/data/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml

@@ -3,7 +3,7 @@
 <channel name="xfce4-session" version="1.0">
   <property name="general" type="empty">
     <property name="FailsafeSessionName" type="empty"/>
-    <property name="LockCommand" type="string" value="wdvn-lock"/>
+    <property name="LockCommand" type="string" value="xset s activate"/>
     <property name="SessionName" type="string" value="Default"/>
     <property name="SaveOnExit" type="bool" value="false"/>
   </property>

mods/graphical-xfce4/data/usr/local/bin/wdvn-lock

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-XSECURELOCK_BLANK_DPMS_STATE="off" XSECURELOCK_SHOW_DATETIME=1 XSECURELOCK_DATETIME_FORMAT="%A - %d.%m.%Y, %H:%M:%S" XSECURELOCK_DISCARD_FIRST_KEYPRESS=0 XSECURELOCK_BLANK_TIMEOUT=5 XSECURELOCK_AUTH_TIMEOUT=20 xsecurelock

mods/graphical-xfce4/modscript

@@ -1,2 +1,2 @@
 #!/bin/bash
-export WDVN_PACKAGES_DL="$WDVN_PACKAGES_DL xinit xorg xfce4 xfce4-*-plugin xfce4-power-manager gvfs gvfs-backends gvfs-fuse unifont scrot xclip netsurf-gtk xautolock xsecurelock qt5-style-plugins alsa-utils network-manager-gnome xfce4-terminal mousepad synaptic catfish galculator celluloid gpicview xpdf unrar-free engrampa blueman xscreensaver- lightdm-"
+export WDVN_PACKAGES_DL="$WDVN_PACKAGES_DL xinit xorg xfce4 xfce4-*-plugin xfce4-power-manager gvfs gvfs-backends gvfs-fuse unifont scrot xclip netsurf-gtk x11-xserver-utils xss-lock xsecurelock qt5-style-plugins alsa-utils network-manager-gnome xfce4-terminal mousepad synaptic catfish galculator celluloid gpicview xpdf unrar-free engrampa blueman xscreensaver- lightdm-"

mods/packages-apply/data/chroot

@@ -1,8 +1,5 @@
 #!/bin/bash
 set -e
-cat << EOF | debconf-set-selections
-firmware-ipw2x00 firmware-ipw2x00/license/accepted boolean true
-EOF
 apt-get --error-on=any -y update
 apt-get -y upgrade
 apt-get -y install $WDVN_PACKAGES_INTERACTIVE

mods/setnet/data/chroot

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+command -v wget >/dev/null
+WGET_INSTALL="$?"
+set -e
+
+if [ "$WGET_INSTALL" = "1" ]; then
+	apt-get -y install wget
+fi
+
+wget "https://pkgmaster.devuan.org/devuan/pool/main/s/setnet/setnet_0.4.0-1_all.deb"
+apt-get -y install "./setnet_0.4.0-1_all.deb"
+rm "./setnet_0.4.0-1_all.deb"
+
+if [ "$WGET_INSTALL" = "1" ]; then
+	apt-get -y remove --purge --auto-remove wget
+fi

mods/setnet/data/usr/local/share/applications/setnet_sh.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=setnet.sh
+Comment=Configure Networking (LAN/WiFi)
+Exec=x-terminal-emulator -e "sudo setnet.sh"
+Icon=preferences-system-network
+Path=
+Terminal=false
+StartupNotify=false
+Categories=Settings;HardwareSettings;

shell

@@ -9,4 +9,5 @@ export WDVN_PID="$BASHPID"
 export PATH="$(dirname "$(realpath -s "$BASH_SOURCE")")/path:$PATH"
 source "wdvn-env-i386"
 export WDVN_FULLNAME=
+export DEBIAN_FRONTEND="noninteractive"
 export PS1="\[\033[0;35m\]\$(wdvn-name)\[\033[0m\]:\[\033[0;37m\]\$(basename -- \$PWD)\[\033[0m\]> "