Refactor the directory structure

profiles/ManuSurface/setup.sh

@@ -3,14 +3,14 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 # Set Hostname
 sudo hostnamectl set-hostname ManuSurface;
 
-source "../../scripts/Scripts/prepare.sh";
+source "../../scripts/PopOS/Scripts/preinstall.sh";
-source "../../scripts/OS/PopOS/install.sh";
+source "../../scripts/PopOS/OS/install.sh";
-source "../../scripts/Devices/SurfaceBook2/Setup/install.sh";
+source "../../scripts/Debian/Devices/SurfaceBook2/Setup/install.sh";
-source "../../scripts/Software/Collections/school.sh";
+source "../../scripts/PopOS/Software/Collections/school.sh";
-INSTALL_FONTS=1 source "../../scripts/Config/UserProfile/school.sh";
+INSTALL_FONTS=1 source "../../scripts/Common/Config/UserProfile/school.sh";
 
 # Install equalizer
-source "../../scripts/Config/EasyEffects/SurfaceBook2/install.sh";
+source "../../scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh";
 
-source "../../scripts/Scripts/postinstall.sh";
+source "../../scripts/PopOS/Scripts/postinstall.sh";
 popd > /dev/null;

profiles/PopOSLive/setup.sh

@@ -3,10 +3,10 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 # Set Hostname
 sudo hostnamectl set-hostname ManuPopOSLive;
-source "../../scripts/Scripts/prepare.sh";
+source "../../scripts/PopOS/Scripts/prepare.sh";
-source "../../scripts/OS/PopOS/install.sh";
+source "../../scripts/PopOS/OS/install.sh";
-source "../../scripts/Software/Collections/personal.sh";
+source "../../scripts/PopOS/Software/Collections/personal.sh";
-INSTALL_FONTS=1 source "../../scripts/Config/UserProfile/personal.sh";
+INSTALL_FONTS=1 source "../../scripts/Common/Config/UserProfile/personal.sh";
 
-source "../../scripts/Scripts/postinstall.sh";
+source "../../scripts/PopOS/Scripts/postinstall.sh";
 popd > /dev/null;

scripts/Arch/OS/partition.sh

@@ -1,6 +1,6 @@
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
-source "../../Scripts/choose-disk.sh";
+source "../../Common/Scripts/choose-disk.sh";
 ARCH_DISK="${ARCH_DISK}";
 memory="$(cat /proc/meminfo | awk -F " " '/^MemTotal/ { print $2 }')";
 swapSize="$(echo "$memory" | awk '{ print int(($1 / 1024 / 1024 4) + 0.5)}')";

scripts/Arch/OS/setup.sh

@@ -33,7 +33,7 @@ dir="$(realpath ../../..)";
 scriptRoot="$(realpath --relative-to "$dir" "$(pwd)")";
 tempDir="/root/$(basename "$dir")";
 cp -r "$dir" "$ARCH_MOUNT_ROOT/root/";
-arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/$scriptRoot/../../Software/Arch/GRUB/install.sh";
+arch-chroot "$ARCH_MOUNT_ROOT" bash "$tempDir/$scriptRoot/../Software/GRUB/install.sh";
 arch-chroot "$ARCH_MOUNT_ROOT" rm -rf "$tempDir";
 
 popd > /dev/null;

scripts/Arch/Software/GRUB/install.sh

@@ -4,6 +4,6 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 EFI_BOOT_DIR="${EFI_BOOT_DIR:-"/boot"}";
 BOOTLOADER_ID=${BOOTLOADER_ID:-"GRUB"};
 pacman --noconfirm -Syu grub efibootmgr;
-. ../../Common/GRUB/setup.sh;
+. ../../../Common/Config/GRUB/setup.sh;
 
 popd > /dev/null;

scripts/Common/Config/UserProfile/personal.sh

@@ -10,24 +10,27 @@ cloudRoot="$configRoot/rclone";
 # Sync clouds
 {
     pushd "$dir" > /dev/null;
-    gnome-terminal --tab --wait -- /bin/bash "../../Config/rclone/InstallSync.sh" nextcloud Nextcloud;
+    gnome-terminal --tab --wait -- /bin/bash "../rclone/InstallSync.sh" nextcloud Nextcloud;
 
     if [ ! -z "$INSTALL_FONTS" ]
     then
         # Install fonts
-        source "../../Config/Fonts/NerdFont/install.sh";
+        source "../Fonts/NerdFont/install.sh";
-        source "../../Software/Oh My Posh/install.sh";
+    fi;
-    fi
 
+    source "../../Software/Oh My Posh/install.sh";
     popd > /dev/null;
 } &
 
-# Microsoft Windows Fonts
+if [ ! -z "$INSTALL_FONTS" ]
-source "../../Config/Fonts/MicrosoftFonts/install.sh";
+then
+    # Microsoft Windows Fonts
+    source "../Fonts/MicrosoftFonts/install.sh";
+fi;
 
 # Git Config
-source "../../Config/git/setup/install.sh";
+source "../git/setup/install.sh";
 
 # Troll Stuff
-source "../../Config/git/git-auf-deutsch/install.sh";
+source "../git/git-auf-deutsch/install.sh";
 popd > /dev/null;

scripts/Debian/Devices/SurfaceBook2/Setup/install.sh

@@ -3,6 +3,6 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 # Install surface-linux
 source "../../Surface/LinuxSurface/install.sh";
-source "../../SurfaceBook2/Camera/install.sh";
+source "../Camera/install.sh";
-# source "../../SurfaceBook2/SecureBoot/install.sh";
+# source "../SecureBoot/install.sh";
 popd > /dev/null;

scripts/PopOS/Collections/personal.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+pushd "${BASH_SOURCE%/*}" > /dev/null;
+
+source "../../Debian/Software/rclone/install.sh";
+
+# Install Brave
+source "../../Debian/Software/Brave/install-stable.sh";
+source "../../Debian/Software/Brave/install-beta.sh";
+source "../../Debian/Software/Brave/install-nightly.sh";
+source "../../Debian/Software/Brave/install-extensions.sh";
+source "../../Debian/Software/Google Chrome/install.sh";
+
+# Install further software
+source "../../Debian/Software/git/install.sh";
+source "../../Debian/Software/logo-ls/install.sh";
+source "../../Debian/Software/VSCodium/install.sh";
+source "../../Debian/Software/Visual Studio Code/install.sh";
+source "../../Common/Software/Node.js/install.sh";
+source "../../Debian/Software/Python/install.sh";
+source "../../Common/Software/tea/install.sh";
+source "../../Common/Software/Godot/install.sh";
+source "../../Debian/Software/Virtual Machine Manager/install.sh";
+source "../../Common/Software/Woodpecker CLI/install.sh";
+
+# Install General Packages from APT
+source "../../Debian/Software/common-apt/install.sh";
+
+# Install other flatpaks
+flatpak install -y flathub com.bitwarden.desktop;
+flatpak install -y flathub org.signal.Signal;
+flatpak install -y flathub com.usebottles.bottles;
+flatpak install -y flathub com.mattjakeman.ExtensionManager;
+flatpak install -y flathub com.github.wwmm.easyeffects;
+flatpak install -y flathub ch.threema.threema-web-desktop;
+flatpak install -y flathub app.ytmdesktop.ytmdesktop;
+flatpak install -y flathub com.github.tchx84.Flatseal;
+popd > /dev/null;

scripts/PopOS/Collections/school.sh

@@ -2,8 +2,8 @@
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 source "./personal.sh";
 
-source "../Java/install.sh";
+source "../../Debian/Software/Java/install.sh";
-source "../cloudflared/install.sh";
+source "../../Debian/Software/cloudflared/install.sh";
 
 # Install other flatpaks
 flatpak install -y flathub com.github.xournalpp.xournalpp;

scripts/PopOS/OS/install.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 pushd "${BASH_SOURCE%/*}" > /dev/null;
-source "../../Config/GnomeExtensions/install.sh";
+source "../../Common/Config/GnomeExtensions/install.sh";
 popd > /dev/null;

scripts/Software/Collections/personal.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-pushd "${BASH_SOURCE%/*}" > /dev/null;
-
-source "../../Software/rclone/install.sh";
-
-# Install Brave
-source "../../Software/Brave/install-stable.sh";
-source "../../Software/Brave/install-beta.sh";
-source "../../Software/Brave/install-nightly.sh";
-source "../../Software/Brave/install-extensions.sh";
-source "../../Software/Google Chrome/install.sh";
-
-# Install further software
-source "../../Software/git/install.sh";
-source "../../Software/logo-ls/install.sh";
-source "../../Software/VSCodium/install.sh";
-source "../../Software/Visual Studio Code/install.sh";
-source "../../Software/Node.js/install.sh";
-source "../../Software/Python/install.sh";
-source "../../Software/tea/install.sh";
-source "../../Software/Godot/install.sh";
-source "../../Software/Virtual Machine Manager/install.sh";
-source "../../Software/Woodpecker CLI/install.sh";
-
-# Install General Packages from APT
-source "../../Software/common-apt/install.sh";
-
-# Install other flatpaks
-flatpak install -y flathub com.bitwarden.desktop;
-flatpak install -y flathub org.signal.Signal;
-flatpak install -y flathub com.usebottles.bottles;
-flatpak install -y flathub com.mattjakeman.ExtensionManager;
-flatpak install -y flathub com.github.wwmm.easyeffects;
-flatpak install -y flathub ch.threema.threema-web-desktop;
-flatpak install -y flathub app.ytmdesktop.ytmdesktop;
-flatpak install -y flathub com.github.tchx84.Flatseal;
-popd > /dev/null;