From 76bcd511da8ca73773a1e57b4860d62e64648415 Mon Sep 17 00:00:00 2001
From: Ambrose Chua <ambrose@hey.com>
Date: Sun, 1 Aug 2021 15:46:22 +0800
Subject: [PATCH] Add zip, 7zip to pwn

---
 .config/fontconfig/fonts.conf | 114 +++++++++++++++++-----------------
 .config/yadm/bootstrap        |   5 +-
 2 files changed, 61 insertions(+), 58 deletions(-)

diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index c593f46..9a956a5 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -1,58 +1,60 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
 <fontconfig>
-	<its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
-		<its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
-	</its:rules>
-
-	<description>Set preferable fonts for Latin</description>
-	<alias>
-		<family>serif</family>
-		<prefer>
-			<family>IBM Plex Serif</family>
-			<family>Bitstream Vera Serif</family>
-			<family>DejaVu Serif</family>
-			<family>Times New Roman</family>
-			<family>Thorndale AMT</family>
-			<family>Luxi Serif</family>
-			<family>Nimbus Roman No9 L</family>
-			<family>Nimbus Roman</family>
-			<family>Times</family>
-		</prefer>
-	</alias>
-	<alias>
-		<family>sans-serif</family>
-		<prefer>
-			<family>IBM Plex Sans</family>
-			<family>Bitstream Vera Sans</family>
-			<family>DejaVu Sans</family>
-			<family>Verdana</family>
-			<family>Arial</family>
-			<family>Albany AMT</family>
-			<family>Luxi Sans</family>
-			<family>Nimbus Sans L</family>
-			<family>Nimbus Sans</family>
-			<family>Helvetica</family>
-			<family>Lucida Sans Unicode</family>
-			<family>BPG Glaho International</family> <!-- lat,cyr,arab,geor -->
-			<family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai -->
-		</prefer>
-	</alias>
-	<alias>
-		<family>monospace</family>
-		<prefer>
-			<family>Fira Code</family>
-			<family>Bitstream Vera Sans Mono</family>
-			<family>DejaVu Sans Mono</family>
-			<family>Inconsolata</family>
-			<family>Andale Mono</family>
-			<family>Courier New</family>
-			<family>Cumberland AMT</family>
-			<family>Luxi Mono</family>
-			<family>Nimbus Mono L</family>
-			<family>Nimbus Mono</family>
-			<family>Nimbus Mono PS</family>
-			<family>Courier</family>
-		</prefer>
-	</alias>
+ <its:rules version="1.0" xmlns:its="http://www.w3.org/2005/11/its">
+  <its:translateRule selector="/fontconfig/*[not(self::description)]" translate="no"/>
+ </its:rules>
+ <description>Set preferable fonts for Latin</description>
+ <alias>
+  <family>serif</family>
+  <prefer>
+   <family>IBM Plex Serif</family>
+   <family>Bitstream Vera Serif</family>
+   <family>DejaVu Serif</family>
+   <family>Times New Roman</family>
+   <family>Thorndale AMT</family>
+   <family>Luxi Serif</family>
+   <family>Nimbus Roman No9 L</family>
+   <family>Nimbus Roman</family>
+   <family>Times</family>
+  </prefer>
+ </alias>
+ <alias>
+  <family>sans-serif</family>
+  <prefer>
+   <family>IBM Plex Sans</family>
+   <family>Bitstream Vera Sans</family>
+   <family>DejaVu Sans</family>
+   <family>Verdana</family>
+   <family>Arial</family>
+   <family>Albany AMT</family>
+   <family>Luxi Sans</family>
+   <family>Nimbus Sans L</family>
+   <family>Nimbus Sans</family>
+   <family>Helvetica</family>
+   <family>Lucida Sans Unicode</family>
+   <family>BPG Glaho International</family>
+   <!-- lat,cyr,arab,geor -->
+   <family>Tahoma</family>
+   <!-- lat,cyr,greek,heb,arab,thai -->
+  </prefer>
+ </alias>
+ <alias>
+  <family>monospace</family>
+  <prefer>
+   <family>Fira Code</family>
+   <family>Bitstream Vera Sans Mono</family>
+   <family>DejaVu Sans Mono</family>
+   <family>Inconsolata</family>
+   <family>Andale Mono</family>
+   <family>Courier New</family>
+   <family>Cumberland AMT</family>
+   <family>Luxi Mono</family>
+   <family>Nimbus Mono L</family>
+   <family>Nimbus Mono</family>
+   <family>Nimbus Mono PS</family>
+   <family>Courier</family>
+  </prefer>
+ </alias>
+ <dir>~/.fonts</dir>
 </fontconfig>
diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 55a86e6..0fdb3da 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -394,7 +394,8 @@ if $desktopbase; then
 			;;
 	esac
 	case $ID in
-		fedora|debian|ubuntu) packages_add adwaita-qt;;
+		debian|ubuntu) packages_add adwaita-qt;;
+		fedora) packages_add adwaita-qt5;;
 	esac
 
 	# desktopbase: Final packages installation
@@ -489,7 +490,7 @@ if $pwn; then
 		alpine|fedora|debian|ubuntu|macos) packages_add radare2 testdisk socat nasm john binutils;;
 	esac
 	case $ID in
-		alpine|fedora|debian|ubuntu) packages_add file squashfs-tools strace;;
+		alpine|fedora|debian|ubuntu) packages_add file squashfs-tools strace zip unzip p7zip;;
 		macos) packages_add squashfs;;
 	esac
 	case $ID in