From 1b6f8e5f64eea38d5e972f3ed989b897f94e6e72 Mon Sep 17 00:00:00 2001
From: eichehome <eichehome@gmx.de>
Date: Sat, 11 Dec 2021 19:35:28 +0100
Subject: [PATCH] Mod.sh in base.sh integriert

---
 base.sh | 25 +++++++++++++++++++++++++
 mod.sh  | 24 ------------------------
 2 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 mod.sh

diff --git a/base.sh b/base.sh
index 048d44b..46d4b7a 100644
--- a/base.sh
+++ b/base.sh
@@ -37,6 +37,31 @@ systemctl enable firewalld
 systemctl enable acpid
 systemctl enable iwd
 
+sed -i 's/MODULES=()/MODULES=(amdgpu)/' /etc/mkinitcpio.conf
+# sed -i 's/MODULES=()/MODULES=(nvidia)/' /etc/mkinitcpio.conf
+# sed -i 's/MODULES=()/MODULES=(i915)/' /etc/mkinitcpio.conf
+
+mkinitcpio -p linux
+# mkinitcpio -p linux-lts
+
+bootctl install # be aware of Problems by dualbooting
+
+# Bootloaderconfig
+sed -i 's/#\(timeout\)\s[0-9]/\1 5/' /boot/loader/loader.conf
+sed -i 's/#\(console\)/\1/' /boot/loader/loader.conf
+sed -i 's/keep/max/' /boot/loader/loader.conf
+sed -i 's/\(default\s\).*/\1arch.conf/' /boot/loader/loader.conf
+
+# Entry
+echo "title     Arch Linux" >> /boot/loader/entries/arch.conf
+echo "linux     /vmlinuz-linux" >> /boot/loader/entries/arch.conf
+# AMD
+echo "initrd    /amd-ucode.img" >> /boot/loader/entries/arch.conf
+# Intel
+# echo "initrd    /intel-ucode.img" >> /boot/loader/entries/arch.conf
+echo "initrd    /initramfs-linux.img" >> /boot/loader/entries/arch.conf
+echo 'options   root="LABLE=arch" rw' >> /boot/loader/entries/arch.conf
+
 # Systemd-networkd (for wlan0)
 echo "[Match]" >> /etc/systemd/network/25-wireless.network
 echo "Name=wlan0" >> /etc/systemd/network/25-wireless.network
diff --git a/mod.sh b/mod.sh
deleted file mode 100644
index b0e9d2b..0000000
--- a/mod.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-sed -i 's/MODULES=()/MODULES=(amdgpu)/' /etc/mkinitcpio.conf
-# sed -i 's/MODULES=()/MODULES=(nvidia)/' /etc/mkinitcpio.conf
-# sed -i 's/MODULES=()/MODULES=(i915)/' /etc/mkinitcpio.conf
-
-mkinitcpio -p linux
-# mkinitcpio -p linux-lts
-
-bootctl install # be aware of Problems by dualbooting
-
-# Bootloaderconfig
-sed -i 's/#\(timeout\)\s[0-9]/\1 5/' /boot/loader/loader.conf
-sed -i 's/#\(console\)/\1/' /boot/loader/loader.conf
-sed -i 's/keep/max/' /boot/loader/loader.conf
-sed -i 's/\(default\s\).*/\1arch.conf/' /boot/loader/loader.conf
-
-# Entry
-echo "title	Arch Linux" >> /boot/loader/entries/arch.conf
-echo "linux	/vmlinuz-linux" >> /boot/loader/entries/arch.conf
-# AMD
-echo "initrd	/amd-ucode.img" >> /boot/loader/entries/arch.conf
-# Intel
-# echo "initrd    /intel-ucode.img" >> /boot/loader/entries/arch.conf
-echo "initrd	/initramfs-linux.img" >> /boot/loader/entries/arch.conf
-echo 'options	root="LABLE=arch" rw' >> /boot/loader/entries/arch.conf