Merge remote-tracking branch 'upstream/dev' into dev

scripts/wk/clone/ddrescue.py

@@ -168,6 +168,7 @@ class BlockPair():
       map_name += f'_{source.raw_details["label"]}'
     map_name = map_name.replace(' ', '_')
     map_name = map_name.replace('/', '_')
+    map_name = map_name.replace('\\', '_')
     if destination.is_dir():
       # Imaging
       self.map_path = pathlib.Path(f'{destination}/Image_{map_name}.map')

setup/build_linux

@@ -131,10 +131,12 @@ function update_live_env() {
   7z e -aoa "$TEMP_DIR/wimboot.zip" -o"$PROFILE_DIR/syslinux/wimboot" 'wimboot*/LICENSE.txt' 'wimboot*/README.txt' 'wimboot*/wimboot'
 
   # Boot config (UEFI)
-  cp  "/usr/share/refind/refind_x64.efi" "$PROFILE_DIR/EFI/boot/bootx64.efi"
+  curl -Lo "$TEMP_DIR/refind.zip" "https://sourceforge.net/projects/refind/files/latest/download"
+  7z x -aoa "$TEMP_DIR/refind.zip" -o"$TEMP_DIR/refind"
   cp "$ROOT_DIR/images/rEFInd.png" "$PROFILE_DIR/EFI/boot/rEFInd.png"
-  rsync -aI "/usr/share/refind/drivers_x64/" "$PROFILE_DIR/EFI/boot/drivers_x64/"
+  cp "$TEMP_DIR/refind"/refind*/"refind/refind_x64.efi" "$PROFILE_DIR/EFI/boot/bootx64.efi"
-  rsync -aI "/usr/share/refind/icons/" "$PROFILE_DIR/EFI/boot/icons/" --exclude "/usr/share/refind/icons/svg"
+  rsync -aI "$TEMP_DIR/refind"/refind*/refind/drivers_x64/ "$PROFILE_DIR/EFI/boot/drivers_x64/"
+  rsync -aI "$TEMP_DIR/refind"/refind*/refind/icons/ "$PROFILE_DIR/EFI/boot/icons/"
   sed -i "s/%ARCHISO_LABEL%/${label}/" "$PROFILE_DIR/EFI/boot/refind.conf"
 
   # Memtest86
@@ -299,7 +301,9 @@ function install_deps() {
   echo "Installing dependencies..."
   packages=
   while read -r line; do
+    if ! echo "$line" | grep -Fq "#"; then
       packages="$packages $line"
+    fi
   done < "$ROOT_DIR/setup/linux/packages/dependencies"
   run_elevated pacman -Syu --needed --noconfirm $packages
 }

setup/linux/packages/aur

@@ -5,8 +5,7 @@ hfsprogs
 iwgtk
 mariadb-connector-c
 memtest86-efi
-mprime
+mprime-bin
-openbox-patched
 pipes.sh
 python-mariadb-connector
 python-smbus2

setup/linux/packages/base

@@ -53,7 +53,7 @@ memtest86-efi
 mesa-utils
 mkinitcpio
 mkinitcpio-archiso
-mprime
+mprime-bin
 mtools
 nano
 ncdu

setup/linux/packages/dependencies

@@ -1,42 +1,33 @@
+# WizardKit: Package dependencies
 archiso
-attr
 base-devel
-boost
-cmake
 curl
 dos2unix
-erofs-utils
 git
-gtk-doc
 gtk3
-hwloc
-imlib2
-intltool
-iwd
-json-glib
-lhasa
-libbsd
-libewf
-librsvg
-libsm
-libxcursor
-libxft
-libxinerama
-libxml2
-libxrandr
-ntfs-3g
-openssh
 p7zip
-pango
-perl-rename
 pv
-refind
-reiserfsprogs
-rsync
-scdoc
-startup-notification
-subversion
 syslinux
 tigervnc
-unzip
+
-wpa_supplicant
+# hardinfo-gtk3
+cmake
+
+# iwgtk
+gtk4
+meson
+qrencode
+scdoc
+
+# opensuperclone-git
+libusb-compat
+
+# smartmontools-svn
+subversion
+
+# udevil
+gettext
+intltool
+
+# wd719x-firmware
+lha

setup/linux/packages/gui

@@ -24,7 +24,7 @@ mpv
 noto-fonts
 noto-fonts-cjk
 numlockx
-openbox-patched
+openbox
 otf-font-awesome-4
 papirus-icon-theme
 qemu-guest-agent

setup/linux/profile_gui/airootfs/etc/skel/.config/openbox/rc.xml

@@ -42,8 +42,6 @@
                   'Active' - where the active window is -->
   </placement>
   <theme>
-    <!-- Enable openbox rounded edges -->
-    <cornerRadius menu="yes">4</cornerRadius>
     <name>Triste-Orange</name>
     <titleLayout>NLIMC</titleLayout>
     <!--

setup/linux/profile_gui/airootfs/etc/skel/.config/picom/picom.conf

@@ -16,6 +16,8 @@
 #log-level = "warn";
 
 # My Stuff
+corner-radius = 4;
+round-borders = true;
 opacity-rule = [
   "90:class_g = 'Alacritty' && !_NET_WM_STATE@:32a",
   "0:_NET_WM_STATE@[0]:32a *= '_NET_WM_STATE_HIDDEN'",