From 01636418751a39c43f7b35ff43f4923061362f50 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Mon, 7 Feb 2022 04:18:16 +0100
Subject: [PATCH] progress

---
 etc/de/plasma  | 2 +-
 etc/gfx/amd    | 3 +++
 etc/gfx/intel  | 3 +++
 etc/gfx/nvidia | 3 +++
 etc/x11        | 3 +++
 main.sh        | 6 +++++-
 6 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 etc/x11

diff --git a/etc/de/plasma b/etc/de/plasma
index abba5ae..4162715 100644
--- a/etc/de/plasma
+++ b/etc/de/plasma
@@ -1,5 +1,5 @@
 packages() {
-	addpkg sddm kde5
+	addpkg "sddm" "kde5"
 }
 
 config() {
diff --git a/etc/gfx/amd b/etc/gfx/amd
index e69de29..84c1079 100644
--- a/etc/gfx/amd
+++ b/etc/gfx/amd
@@ -0,0 +1,3 @@
+packages() {
+	addpkg "xf86-video-amdgpu"
+}
\ No newline at end of file
diff --git a/etc/gfx/intel b/etc/gfx/intel
index e69de29..95d7285 100644
--- a/etc/gfx/intel
+++ b/etc/gfx/intel
@@ -0,0 +1,3 @@
+packages() {
+	addpkg "xf86-video-intel"
+}
\ No newline at end of file
diff --git a/etc/gfx/nvidia b/etc/gfx/nvidia
index e69de29..79aa1fd 100644
--- a/etc/gfx/nvidia
+++ b/etc/gfx/nvidia
@@ -0,0 +1,3 @@
+packages() {
+	addpkg "nvidia"
+}
\ No newline at end of file
diff --git a/etc/x11 b/etc/x11
new file mode 100644
index 0000000..955f7cf
--- /dev/null
+++ b/etc/x11
@@ -0,0 +1,3 @@
+packages() {
+	addpkg "xorg-minimal" "xorg-apps"
+}
\ No newline at end of file
diff --git a/main.sh b/main.sh
index 7d94733..8573b40 100644
--- a/main.sh
+++ b/main.sh
@@ -186,6 +186,9 @@ de() {
 		. ./etc/gfx/$DE
 		packages
 		reset packages
+		. ./etc/x11
+		packages
+		reset packages
 	fi
 }
 
@@ -225,7 +228,7 @@ do_chroot() {
 	if ! [ "$DE" == "minimal" ]; then
 		cp ./etc/gfx/$GFX ${target}/tmp/vinstaller/run
 		cp ./etc/soundsystem/$SOUNDSYSTEM ${target}/tmp/vinstaller/run
-		cp ./etc/gfx/$DE ${target}/tmp/vinstaller/run
+		cp ./etc/de/$DE ${target}/tmp/vinstaller/run
 	fi
 	
 	echo "USERNAME=$USERNAME" > ${target}/tmp/vinstaller/vars
@@ -257,6 +260,7 @@ hostname
 base
 bootloader
 de
+printing 
 do_partition
 do_install
 do_chroot
\ No newline at end of file