diff --git a/profiles/ManuSurface/setup.sh b/profiles/ManuSurface/setup.sh index 2794df40..55355297 100755 --- a/profiles/ManuSurface/setup.sh +++ b/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/OS/PopOS/install.sh"; -source "../../scripts/Devices/SurfaceBook2/Setup/install.sh"; -source "../../scripts/Software/Collections/school.sh"; -INSTALL_FONTS=1 source "../../scripts/Config/UserProfile/school.sh"; +source "../../scripts/PopOS/Scripts/preinstall.sh"; +source "../../scripts/PopOS/OS/install.sh"; +source "../../scripts/Debian/Devices/SurfaceBook2/Setup/install.sh"; +source "../../scripts/PopOS/Software/Collections/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; diff --git a/profiles/PopOSLive/setup.sh b/profiles/PopOSLive/setup.sh index 41783afb..c34026ff 100755 --- a/profiles/PopOSLive/setup.sh +++ b/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/OS/PopOS/install.sh"; -source "../../scripts/Software/Collections/personal.sh"; -INSTALL_FONTS=1 source "../../scripts/Config/UserProfile/personal.sh"; +source "../../scripts/PopOS/Scripts/prepare.sh"; +source "../../scripts/PopOS/OS/install.sh"; +source "../../scripts/PopOS/Software/Collections/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; diff --git a/scripts/OS/Arch/partition.sh b/scripts/Arch/OS/partition.sh similarity index 95% rename from scripts/OS/Arch/partition.sh rename to scripts/Arch/OS/partition.sh index 59bde2b3..49d70e80 100755 --- a/scripts/OS/Arch/partition.sh +++ b/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)}')"; diff --git a/scripts/OS/Arch/setup.sh b/scripts/Arch/OS/setup.sh similarity index 93% rename from scripts/OS/Arch/setup.sh rename to scripts/Arch/OS/setup.sh index 8769e0eb..9fc87122 100755 --- a/scripts/OS/Arch/setup.sh +++ b/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; diff --git a/scripts/Software/Arch/GRUB/install.sh b/scripts/Arch/Software/GRUB/install.sh similarity index 82% rename from scripts/Software/Arch/GRUB/install.sh rename to scripts/Arch/Software/GRUB/install.sh index 4bc9443f..1e4e3679 100755 --- a/scripts/Software/Arch/GRUB/install.sh +++ b/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; diff --git a/scripts/Config/EasyEffects/SurfaceBook2/Default.json b/scripts/Common/Config/EasyEffects/SurfaceBook2/Default.json similarity index 100% rename from scripts/Config/EasyEffects/SurfaceBook2/Default.json rename to scripts/Common/Config/EasyEffects/SurfaceBook2/Default.json diff --git a/scripts/Config/EasyEffects/SurfaceBook2/install.sh b/scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh similarity index 100% rename from scripts/Config/EasyEffects/SurfaceBook2/install.sh rename to scripts/Common/Config/EasyEffects/SurfaceBook2/install.sh diff --git a/scripts/Config/Fonts/MicrosoftFonts/install.sh b/scripts/Common/Config/Fonts/MicrosoftFonts/install.sh similarity index 100% rename from scripts/Config/Fonts/MicrosoftFonts/install.sh rename to scripts/Common/Config/Fonts/MicrosoftFonts/install.sh diff --git a/scripts/Config/Fonts/NerdFont/install.sh b/scripts/Common/Config/Fonts/NerdFont/install.sh similarity index 100% rename from scripts/Config/Fonts/NerdFont/install.sh rename to scripts/Common/Config/Fonts/NerdFont/install.sh diff --git a/scripts/Software/Common/GRUB/setup.sh b/scripts/Common/Config/GRUB/setup.sh old mode 100755 new mode 100644 similarity index 100% rename from scripts/Software/Common/GRUB/setup.sh rename to scripts/Common/Config/GRUB/setup.sh diff --git a/scripts/Config/GnomeExtensions/install.sh b/scripts/Common/Config/GnomeExtensions/install.sh similarity index 100% rename from scripts/Config/GnomeExtensions/install.sh rename to scripts/Common/Config/GnomeExtensions/install.sh diff --git a/scripts/Config/UserProfile/personal.sh b/scripts/Common/Config/UserProfile/personal.sh similarity index 50% rename from scripts/Config/UserProfile/personal.sh rename to scripts/Common/Config/UserProfile/personal.sh index f446468b..b2116b2b 100755 --- a/scripts/Config/UserProfile/personal.sh +++ b/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 "../../Software/Oh My Posh/install.sh"; - fi + source "../Fonts/NerdFont/install.sh"; + fi; + source "../../Software/Oh My Posh/install.sh"; popd > /dev/null; } & -# Microsoft Windows Fonts -source "../../Config/Fonts/MicrosoftFonts/install.sh"; +if [ ! -z "$INSTALL_FONTS" ] +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; diff --git a/scripts/Config/UserProfile/school.sh b/scripts/Common/Config/UserProfile/school.sh similarity index 100% rename from scripts/Config/UserProfile/school.sh rename to scripts/Common/Config/UserProfile/school.sh diff --git a/scripts/Config/git/git-auf-deutsch/install.sh b/scripts/Common/Config/git/git-auf-deutsch/install.sh similarity index 100% rename from scripts/Config/git/git-auf-deutsch/install.sh rename to scripts/Common/Config/git/git-auf-deutsch/install.sh diff --git a/scripts/Config/git/setup/install.sh b/scripts/Common/Config/git/setup/install.sh similarity index 100% rename from scripts/Config/git/setup/install.sh rename to scripts/Common/Config/git/setup/install.sh diff --git a/scripts/Config/rclone/InstallSync.sh b/scripts/Common/Config/rclone/InstallSync.sh similarity index 100% rename from scripts/Config/rclone/InstallSync.sh rename to scripts/Common/Config/rclone/InstallSync.sh diff --git a/scripts/Scripts/choose-disk.sh b/scripts/Common/Scripts/choose-disk.sh similarity index 100% rename from scripts/Scripts/choose-disk.sh rename to scripts/Common/Scripts/choose-disk.sh diff --git a/scripts/Software/Godot/install.sh b/scripts/Common/Software/Godot/install.sh similarity index 100% rename from scripts/Software/Godot/install.sh rename to scripts/Common/Software/Godot/install.sh diff --git a/scripts/Software/JetBrains/install-toolbox.sh b/scripts/Common/Software/JetBrains/install-toolbox.sh similarity index 100% rename from scripts/Software/JetBrains/install-toolbox.sh rename to scripts/Common/Software/JetBrains/install-toolbox.sh diff --git a/scripts/Software/Node.js/install.sh b/scripts/Common/Software/Node.js/install.sh similarity index 100% rename from scripts/Software/Node.js/install.sh rename to scripts/Common/Software/Node.js/install.sh diff --git a/scripts/Software/Oh My Posh/install.sh b/scripts/Common/Software/Oh My Posh/install.sh similarity index 100% rename from scripts/Software/Oh My Posh/install.sh rename to scripts/Common/Software/Oh My Posh/install.sh diff --git a/scripts/Software/Woodpecker CLI/install.sh b/scripts/Common/Software/Woodpecker CLI/install.sh similarity index 100% rename from scripts/Software/Woodpecker CLI/install.sh rename to scripts/Common/Software/Woodpecker CLI/install.sh diff --git a/scripts/Software/tea/install.sh b/scripts/Common/Software/tea/install.sh similarity index 100% rename from scripts/Software/tea/install.sh rename to scripts/Common/Software/tea/install.sh diff --git a/scripts/Devices/Surface/LinuxSurface/install.sh b/scripts/Debian/Devices/Surface/LinuxSurface/install.sh similarity index 100% rename from scripts/Devices/Surface/LinuxSurface/install.sh rename to scripts/Debian/Devices/Surface/LinuxSurface/install.sh diff --git a/scripts/Devices/SurfaceBook2/Camera/install.sh b/scripts/Debian/Devices/SurfaceBook2/Camera/install.sh similarity index 100% rename from scripts/Devices/SurfaceBook2/Camera/install.sh rename to scripts/Debian/Devices/SurfaceBook2/Camera/install.sh diff --git a/scripts/Devices/SurfaceBook2/SecureBoot/install.sh b/scripts/Debian/Devices/SurfaceBook2/SecureBoot/install.sh similarity index 100% rename from scripts/Devices/SurfaceBook2/SecureBoot/install.sh rename to scripts/Debian/Devices/SurfaceBook2/SecureBoot/install.sh diff --git a/scripts/Devices/SurfaceBook2/SecureBoot/openssl.cnf b/scripts/Debian/Devices/SurfaceBook2/SecureBoot/openssl.cnf similarity index 100% rename from scripts/Devices/SurfaceBook2/SecureBoot/openssl.cnf rename to scripts/Debian/Devices/SurfaceBook2/SecureBoot/openssl.cnf diff --git a/scripts/Devices/SurfaceBook2/SecureBoot/sign-modules.sh b/scripts/Debian/Devices/SurfaceBook2/SecureBoot/sign-modules.sh similarity index 100% rename from scripts/Devices/SurfaceBook2/SecureBoot/sign-modules.sh rename to scripts/Debian/Devices/SurfaceBook2/SecureBoot/sign-modules.sh diff --git a/scripts/Devices/SurfaceBook2/Setup/install.sh b/scripts/Debian/Devices/SurfaceBook2/Setup/install.sh similarity index 58% rename from scripts/Devices/SurfaceBook2/Setup/install.sh rename to scripts/Debian/Devices/SurfaceBook2/Setup/install.sh index 220de3da..519f7b48 100755 --- a/scripts/Devices/SurfaceBook2/Setup/install.sh +++ b/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 "../../SurfaceBook2/SecureBoot/install.sh"; +source "../Camera/install.sh"; +# source "../SecureBoot/install.sh"; popd > /dev/null; diff --git a/scripts/Software/Brave/install-beta.sh b/scripts/Debian/Software/Brave/install-beta.sh similarity index 100% rename from scripts/Software/Brave/install-beta.sh rename to scripts/Debian/Software/Brave/install-beta.sh diff --git a/scripts/Software/Brave/install-extensions.sh b/scripts/Debian/Software/Brave/install-extensions.sh similarity index 100% rename from scripts/Software/Brave/install-extensions.sh rename to scripts/Debian/Software/Brave/install-extensions.sh diff --git a/scripts/Software/Brave/install-nightly.sh b/scripts/Debian/Software/Brave/install-nightly.sh similarity index 100% rename from scripts/Software/Brave/install-nightly.sh rename to scripts/Debian/Software/Brave/install-nightly.sh diff --git a/scripts/Software/Brave/install-stable.sh b/scripts/Debian/Software/Brave/install-stable.sh similarity index 100% rename from scripts/Software/Brave/install-stable.sh rename to scripts/Debian/Software/Brave/install-stable.sh diff --git a/scripts/Software/Google Chrome/install.sh b/scripts/Debian/Software/Google Chrome/install.sh similarity index 100% rename from scripts/Software/Google Chrome/install.sh rename to scripts/Debian/Software/Google Chrome/install.sh diff --git a/scripts/Software/Java/install.sh b/scripts/Debian/Software/Java/install.sh similarity index 100% rename from scripts/Software/Java/install.sh rename to scripts/Debian/Software/Java/install.sh diff --git a/scripts/Software/Python/install.sh b/scripts/Debian/Software/Python/install.sh similarity index 100% rename from scripts/Software/Python/install.sh rename to scripts/Debian/Software/Python/install.sh diff --git a/scripts/Software/Python/pyenv.sh b/scripts/Debian/Software/Python/pyenv.sh similarity index 100% rename from scripts/Software/Python/pyenv.sh rename to scripts/Debian/Software/Python/pyenv.sh diff --git a/scripts/Software/Python/setup.sh b/scripts/Debian/Software/Python/setup.sh similarity index 100% rename from scripts/Software/Python/setup.sh rename to scripts/Debian/Software/Python/setup.sh diff --git a/scripts/Software/VSCodium/install.sh b/scripts/Debian/Software/VSCodium/install.sh similarity index 100% rename from scripts/Software/VSCodium/install.sh rename to scripts/Debian/Software/VSCodium/install.sh diff --git a/scripts/Software/Virtual Machine Manager/install.sh b/scripts/Debian/Software/Virtual Machine Manager/install.sh similarity index 100% rename from scripts/Software/Virtual Machine Manager/install.sh rename to scripts/Debian/Software/Virtual Machine Manager/install.sh diff --git a/scripts/Software/Visual Studio Code/install.sh b/scripts/Debian/Software/Visual Studio Code/install.sh similarity index 100% rename from scripts/Software/Visual Studio Code/install.sh rename to scripts/Debian/Software/Visual Studio Code/install.sh diff --git a/scripts/Software/cloudflared/install.sh b/scripts/Debian/Software/cloudflared/install.sh similarity index 100% rename from scripts/Software/cloudflared/install.sh rename to scripts/Debian/Software/cloudflared/install.sh diff --git a/scripts/Software/common-apt/install.sh b/scripts/Debian/Software/common-apt/install.sh similarity index 100% rename from scripts/Software/common-apt/install.sh rename to scripts/Debian/Software/common-apt/install.sh diff --git a/scripts/Software/git/flow.sh b/scripts/Debian/Software/git/flow.sh similarity index 100% rename from scripts/Software/git/flow.sh rename to scripts/Debian/Software/git/flow.sh diff --git a/scripts/Software/git/install.sh b/scripts/Debian/Software/git/install.sh similarity index 100% rename from scripts/Software/git/install.sh rename to scripts/Debian/Software/git/install.sh diff --git a/scripts/Software/git/lfs.sh b/scripts/Debian/Software/git/lfs.sh similarity index 100% rename from scripts/Software/git/lfs.sh rename to scripts/Debian/Software/git/lfs.sh diff --git a/scripts/Software/logo-ls/install.sh b/scripts/Debian/Software/logo-ls/install.sh similarity index 100% rename from scripts/Software/logo-ls/install.sh rename to scripts/Debian/Software/logo-ls/install.sh diff --git a/scripts/Software/rclone/install.sh b/scripts/Debian/Software/rclone/install.sh similarity index 100% rename from scripts/Software/rclone/install.sh rename to scripts/Debian/Software/rclone/install.sh diff --git a/scripts/Software/rclone/rclone@.service b/scripts/Debian/Software/rclone/rclone@.service similarity index 100% rename from scripts/Software/rclone/rclone@.service rename to scripts/Debian/Software/rclone/rclone@.service diff --git a/scripts/PopOS/Collections/personal.sh b/scripts/PopOS/Collections/personal.sh new file mode 100755 index 00000000..51f1465f --- /dev/null +++ b/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; diff --git a/scripts/Software/Collections/school.sh b/scripts/PopOS/Collections/school.sh similarity index 69% rename from scripts/Software/Collections/school.sh rename to scripts/PopOS/Collections/school.sh index 625f9d1c..8607abd9 100755 --- a/scripts/Software/Collections/school.sh +++ b/scripts/PopOS/Collections/school.sh @@ -2,8 +2,8 @@ pushd "${BASH_SOURCE%/*}" > /dev/null; source "./personal.sh"; -source "../Java/install.sh"; -source "../cloudflared/install.sh"; +source "../../Debian/Software/Java/install.sh"; +source "../../Debian/Software/cloudflared/install.sh"; # Install other flatpaks flatpak install -y flathub com.github.xournalpp.xournalpp; diff --git a/scripts/OS/PopOS/install.sh b/scripts/PopOS/OS/install.sh old mode 100755 new mode 100644 similarity index 54% rename from scripts/OS/PopOS/install.sh rename to scripts/PopOS/OS/install.sh index aeb326e3..76120af9 --- a/scripts/OS/PopOS/install.sh +++ b/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; diff --git a/scripts/Scripts/postinstall.sh b/scripts/PopOS/Scripts/postinstall.sh similarity index 100% rename from scripts/Scripts/postinstall.sh rename to scripts/PopOS/Scripts/postinstall.sh diff --git a/scripts/Scripts/prepare.sh b/scripts/PopOS/Scripts/preinstall.sh similarity index 100% rename from scripts/Scripts/prepare.sh rename to scripts/PopOS/Scripts/preinstall.sh diff --git a/scripts/Software/Collections/personal.sh b/scripts/Software/Collections/personal.sh deleted file mode 100755 index 3ff5aea8..00000000 --- a/scripts/Software/Collections/personal.sh +++ /dev/null @@ -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;