From 7964b4a7391cbd53a9b98c1b06df599e4edd587c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 7 Feb 2022 17:16:45 +0100
Subject: [PATCH] progress

---
 etc/base |   2 +-
 main.sh  | 122 -------------------------------------------------------
 2 files changed, 1 insertion(+), 123 deletions(-)

diff --git a/etc/base b/etc/base
index fbfbf2a..70185a9 100644
--- a/etc/base
+++ b/etc/base
@@ -1,5 +1,5 @@
 packages() {
-	addpkg base-system lvm2 cryptsetup htop wireguard-tools sudo neovim
+	addpkg base-system lvm2 cryptsetup htop wireguard-tools sudo neovim xtools
 }
 
 config() {
diff --git a/main.sh b/main.sh
index 0f9f7f2..3b7ebb0 100644
--- a/main.sh
+++ b/main.sh
@@ -176,63 +176,6 @@ base() {
 	reset packages
 }
 
-gfx() {
-	for i in $(find ./etc/gfx/ -type f); do
-		gfx+=("$(basename $i)")
-	done
-	if [ "${#gfx[@]}" -gt "1" ]; then
-		header "GFX"
-		multiplechoice "${gfx[@]}"
-		GFX=$output
-	elif [ "${#gfx[@]}" -eq "1" ]; then
-		GFX=${gfx[0]}
-	fi
-	if ! [ "${#gfx[@]}" -eq "0" ]; then
-		. ./etc/gfx/$GFX
-		packages
-		reset packages
-		cp ./etc/gfx/$GFX $tmp_target
-	fi
-}
-
-soundsystem() {
-	for i in $(find ./etc/soundsystem/ -type f); do
-		soundsystem+=("$(basename $i)")
-	done
-	if [ "${#soundsystem[@]}" -gt "1" ]; then
-		header "Soundsystem"
-		multiplechoice "${soundsystem[@]}"
-		SOUNDSYSTEM=$output
-	elif [ "${#soundsystem[@]}" -eq "1" ]; then
-		SOUNDSYSTEM=${soundsystem[0]}
-	fi
-	if ! [ "${#soundsystem[@]}" -eq "0" ]; then
-		. ./etc/soundsystem/$SOUNDSYSTEM
-		packages
-		reset packages
-		cp ./etc/soundsystem/$SOUNDSYSTEM $tmp_target
-	fi
-}
-
-xserver() {
-	for i in $(find ./etc/xserver/ -type f); do
-		xserver+=("$(basename $i)")
-	done
-	if [ "${#xserver[@]}" -gt "1" ]; then
-		header "Windowsystem"
-		multiplechoice "${xserver[@]}"
-		XSERVER=$output
-	elif [ "${#xserver[@]}" -eq "1" ]; then
-		XSERVER=${xserver[0]}
-	fi
-	if ! [ "${#xserver[@]}" -eq "0" ]; then
-		. ./etc/xserver/$XSERVER
-		packages
-		reset packages
-		cp ./etc/xserver/$XSERVER $tmp_target
-	fi
-}
-
 profile() {
 	for i in $(find ./etc/profile/ -type f|sort -r); do
 		profile+=("$(basename $i)")
@@ -261,32 +204,6 @@ profile() {
 	fi
 }
 
-printing() {
-	for i in $(find ./etc/printing/ -type f); do
-		printing+=("$(basename $i)")
-	done
-	if [ "${#printing[@]}" -ge "1" ]; then
-		header "Printing"
-		if yesno "Do you want printing?" "n"; then
-			if [ "${#printing[@]}" -gt "1" ]; then
-				multiplechoice "${printing[@]}"
-				PRINTING=$output
-			elif [ "${#printing[@]}" -eq "1" ]; then
-				PRINTING=${printing[0]}
-			fi
-			. ./etc/printing/$PRINTING
-			packages
-			reset packages
-			cp ./etc/printing/$PRINTING $tmp_target
-		fi
-	fi
-
-
-	if [ "$output" == "yes" ]; then
-		addpkg cups
-	fi
-}
-
 lang() {
 	header "Sprache"
 	multiplechoice "de" "en"
@@ -296,45 +213,6 @@ lang() {
 	fi
 }
 
-bootloader() {
-	for i in $(find ./etc/bootloader/ -type f); do
-		bootloader+=("$(basename $i)")
-	done
-	if [ "${#bootloader[@]}" -gt "1" ]; then
-		header "Bootloader"
-		multiplechoice "${bootloader[@]}"
-		BOOTLOADER=$output
-	elif [ "${#bootloader[@]}" -eq "1" ]; then
-		BOOTLOADER=${bootloader[0]}
-	fi
-	if ! [ "${#bootloader[@]}" -eq "0" ]; then
-		. ./etc/bootloader/$BOOTLOADER
-		packages
-		reset packages
-		cp ./etc/bootloader/$BOOTLOADER $tmp_target
-	fi
-
-}
-
-network() {
-	for i in $(find ./etc/network/ -type f); do
-		network+=("$(basename $i)")
-	done
-	if [ "${#network[@]}" -gt "1" ]; then
-		header "Networkmanager"
-		multiplechoice "${network[@]}"
-		NETWORK=$output
-	elif [ "${#network[@]}" -eq "1" ]; then
-		NETWORK=${network[0]}
-	fi
-	if ! [ "${#network[@]}" -eq "0" ]; then
-		. ./etc/network/$NETWORK
-		packages
-		reset packages
-		cp ./etc/network/$NETWORK $tmp_target
-	fi
-}
-
 packages() {
 	WHICH="$1"
 	for i in $(find ./etc/${WHICH}/ -type f); do