From 22ae8d0adcc4a88c39e0287395571e7ef02ba4ad Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Mon, 23 Jan 2023 17:19:55 +0100 Subject: [PATCH] Split installation process into multiple files --- profiles/ManuSurface/setup.sh | 76 ++----------------- scripts/Config/UserProfile/personal.sh | 23 ++++++ scripts/Config/UserProfile/school.sh | 6 ++ scripts/Config/git/setup/install.sh | 3 + scripts/Devices/SurfaceBook2/Setup/install.sh | 8 ++ scripts/OS/PopOS/install.sh | 3 + scripts/Scripts/prepare.sh | 4 + scripts/Software/Collections/personal.sh | 40 ++++++++++ scripts/Software/Collections/school.sh | 9 +++ 9 files changed, 103 insertions(+), 69 deletions(-) create mode 100755 scripts/Config/UserProfile/personal.sh create mode 100755 scripts/Config/UserProfile/school.sh create mode 100755 scripts/Config/git/setup/install.sh create mode 100755 scripts/Devices/SurfaceBook2/Setup/install.sh create mode 100755 scripts/OS/PopOS/install.sh create mode 100755 scripts/Scripts/prepare.sh create mode 100755 scripts/Software/Collections/personal.sh create mode 100755 scripts/Software/Collections/school.sh diff --git a/profiles/ManuSurface/setup.sh b/profiles/ManuSurface/setup.sh index 83a65e76..2d1c7607 100755 --- a/profiles/ManuSurface/setup.sh +++ b/profiles/ManuSurface/setup.sh @@ -1,82 +1,20 @@ #!/bin/bash dir="${BASH_SOURCE%/*}"; scriptRoot="$dir/../../scripts"; +utilRoot="$scriptRoot/Scripts"; deviceRoot="$scriptRoot/Devices"; +osRoot="$scriptRoot/OS"; softwareRoot="$scriptRoot/Software"; configRoot="$scriptRoot/Config"; cloudRoot="$configRoot/rclone"; # Set Hostname sudo hostnamectl set-hostname ManuSurface; - -# Preparation -sudo apt update -sudo apt upgrade -y; -sudo apt install dbus-x11; - -# Install gnome extensions -source "$configRoot/GnomeExtensions/install.sh"; - -# Sync clouds -source "$softwareRoot/rclone/install.sh"; - -{ - gnome-terminal --tab --wait -- /bin/bash "$cloudRoot/NextcloudSync/install.sh"; - - # Install fonts - source "$configRoot/Fonts/NerdFont/install.sh"; - source "$softwareRoot/Oh My Posh/install.sh"; -} & - -# Install surface-linux -source "$deviceRoot/Surface/LinuxSurface/install.sh"; -source "$deviceRoot/SurfaceBook2/Camera/install.sh"; -# source "$deviceRoot/SurfaceBook2/SecureBoot/install.sh"; - -# Install Brave -source "$softwareRoot/Brave/install-stable.sh"; -source "$softwareRoot/Brave/install-beta.sh"; -source "$softwareRoot/Brave/install-nightly.sh"; -source "$softwareRoot/Brave/install-extensions.sh"; -source "$softwareRoot/Google Chrome/install.sh"; - -# Install further software -source "$softwareRoot/logo-ls/install.sh"; -source "$softwareRoot/VSCodium/install.sh"; -source "$softwareRoot/Visual Studio Code/install.sh"; -source "$softwareRoot/Node.js/install.sh"; -source "$softwareRoot/Java/install.sh"; -source "$softwareRoot/tea/install.sh"; -source "$softwareRoot/Godot/install.sh"; -source "$softwareRoot/Virtual Machine Manager/install.sh"; -source "$softwareRoot/Woodpecker CLI/install.sh"; - -# Install other flatpaks -flatpak install -y flathub com.bitwarden.desktop; -flatpak install -y flathub com.github.xournalpp.xournalpp; -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; - -# Microsoft Windows Fonts -source "$configRoot/Fonts/MicrosoftFonts/install.sh"; - -# Install JetBrains Stuff -source "$softwareRoot/JetBrains/install-toolbox.sh"; +source "$utilRoot/prepare.sh"; +source "$osRoot/PopOS/install.sh"; +source "$deviceRoot/SurfaceBook2/Setup/install.sh"; +source "$softwareRoot/Collections/school.sh"; +source "$configRoot/UserProfile/school.sh"; # Install equalizer source "$configRoot/EasyEffects/SurfaceBook2/install.sh"; - -# Git config -git config --global user.name "Manuel Thalmann"; -git config --global user.email "m@nuth.ch"; - -# Install General Packages from APT -source "$softwareRoot/common-apt/install.sh"; - -# Troll Stuff -source "$configRoot/git/git-auf-deutsch/install.sh"; diff --git a/scripts/Config/UserProfile/personal.sh b/scripts/Config/UserProfile/personal.sh new file mode 100755 index 00000000..95110191 --- /dev/null +++ b/scripts/Config/UserProfile/personal.sh @@ -0,0 +1,23 @@ +#!/bin/bash +dir="${BASH_SOURCE%/*}"; +scriptRoot="$dir/../.."; +softwareRoot="$scriptRoot/Software"; +configRoot="$scriptRoot/Config"; + +# Sync clouds +{ + gnome-terminal --tab --wait -- /bin/bash "$cloudRoot/NextcloudSync/install.sh"; + + # Install fonts + source "$configRoot/Fonts/NerdFont/install.sh"; + source "$softwareRoot/Oh My Posh/install.sh"; +} & + +# Microsoft Windows Fonts +source "$configRoot/Fonts/MicrosoftFonts/install.sh"; + +# Git Config +source "$configRoot/git/setup/install.sh"; + +# Troll Stuff +source "$configRoot/git/git-auf-deutsch/install.sh"; diff --git a/scripts/Config/UserProfile/school.sh b/scripts/Config/UserProfile/school.sh new file mode 100755 index 00000000..71976ff9 --- /dev/null +++ b/scripts/Config/UserProfile/school.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# Install JetBrains Stuff +dir="${BASH_SOURCE%/*}"; +softwareRoot="$dir/../../Software"; +source "$dir/personal.sh"; +source "$softwareRoot/JetBrains/install-toolbox.sh"; diff --git a/scripts/Config/git/setup/install.sh b/scripts/Config/git/setup/install.sh new file mode 100755 index 00000000..e8612cdd --- /dev/null +++ b/scripts/Config/git/setup/install.sh @@ -0,0 +1,3 @@ +#!/bin/bash +git config --global user.name "Manuel Thalmann"; +git config --global user.email "m@nuth.ch"; diff --git a/scripts/Devices/SurfaceBook2/Setup/install.sh b/scripts/Devices/SurfaceBook2/Setup/install.sh new file mode 100755 index 00000000..c414fc46 --- /dev/null +++ b/scripts/Devices/SurfaceBook2/Setup/install.sh @@ -0,0 +1,8 @@ +#!/bin/bash +dir="${BASH_SOURCE%/*}"; +deviceRoot="$dir/../.."; + +# Install surface-linux +source "$deviceRoot/Surface/LinuxSurface/install.sh"; +source "$deviceRoot/SurfaceBook2/Camera/install.sh"; +# source "$deviceRoot/SurfaceBook2/SecureBoot/install.sh"; diff --git a/scripts/OS/PopOS/install.sh b/scripts/OS/PopOS/install.sh new file mode 100755 index 00000000..6c73baa5 --- /dev/null +++ b/scripts/OS/PopOS/install.sh @@ -0,0 +1,3 @@ +#!/bin/bash +dir="${BASH_SOURCE%/*}"; +source "$dir/../../Config/GnomeExtensions/install.sh"; diff --git a/scripts/Scripts/prepare.sh b/scripts/Scripts/prepare.sh new file mode 100755 index 00000000..e8321617 --- /dev/null +++ b/scripts/Scripts/prepare.sh @@ -0,0 +1,4 @@ +#!/bin/bash +sudo apt update +sudo apt upgrade -y; +sudo apt install dbus-x11; diff --git a/scripts/Software/Collections/personal.sh b/scripts/Software/Collections/personal.sh new file mode 100755 index 00000000..a4c0cec1 --- /dev/null +++ b/scripts/Software/Collections/personal.sh @@ -0,0 +1,40 @@ +#!/bin/bash +dir="${BASH_SOURCE%/*}"; +scriptRoot="$dir/../.."; +utilRoot="$scriptRoot/Scripts"; +deviceRoot="$scriptRoot/Devices"; +softwareRoot="$scriptRoot/Software"; +configRoot="$scriptRoot/Config"; +cloudRoot="$configRoot/rclone"; + +source "$softwareRoot/rclone/install.sh"; + +# Install Brave +source "$softwareRoot/Brave/install-stable.sh"; +source "$softwareRoot/Brave/install-beta.sh"; +source "$softwareRoot/Brave/install-nightly.sh"; +source "$softwareRoot/Brave/install-extensions.sh"; +source "$softwareRoot/Google Chrome/install.sh"; + +# Install further software +source "$softwareRoot/logo-ls/install.sh"; +source "$softwareRoot/VSCodium/install.sh"; +source "$softwareRoot/Visual Studio Code/install.sh"; +source "$softwareRoot/Node.js/install.sh"; +source "$softwareRoot/tea/install.sh"; +source "$softwareRoot/Godot/install.sh"; +source "$softwareRoot/Virtual Machine Manager/install.sh"; +source "$softwareRoot/Woodpecker CLI/install.sh"; + +# Install General Packages from APT +source "$softwareRoot/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; diff --git a/scripts/Software/Collections/school.sh b/scripts/Software/Collections/school.sh new file mode 100755 index 00000000..667e4b3a --- /dev/null +++ b/scripts/Software/Collections/school.sh @@ -0,0 +1,9 @@ +#!/bin/bash +dir="${BASH_SOURCE%/*}"; +softwareRoot="$dir/.."; +source "$dir/personal.sh"; + +source "$softwareRoot/Java/install.sh"; + +# Install other flatpaks +latpak install -y flathub com.github.xournalpp.xournalpp;