Refactor directory structure

devices/ManuSurface/setup.sh

@@ -1,80 +0,0 @@
-#!/bin/bash
-dir="${BASH_SOURCE%/*}"
-popOSRoot="$dir/../../scripts/PopOS"
-softwareRoot="$popOSRoot/software"
-cloudRoot="$popOSRoot/cloud-sync"
-
-# Set Hostname
-sudo hostnamectl set-hostname ManuSurface
-
-# Preparation
-sudo apt update
-sudo apt upgrade -y
-sudo apt install dbus-x11
-
-# Install gnome extensions
-source "$softwareRoot/gnome-extensions.sh"
-
-# Sync clouds
-source "$softwareRoot/rclone/install.sh"
-
-{
-    gnome-terminal --tab --wait -- /bin/bash -c "source '$cloudRoot/nextcloud.sh'"
-
-    # Install fonts
-    source "$popOSRoot/custom-fonts.sh"
-    source "$softwareRoot/oh-my-posh.sh"
-} &
-
-# Install surface-linux
-source "$popOSRoot/linux-surface.sh"
-source "$popOSRoot/camera.sh"
-# source "$popOSRoot/secure-boot/install.sh"
-
-# Install Brave
-source "$softwareRoot/brave.sh"
-source "$softwareRoot/brave-extensions.sh"
-source "$softwareRoot/brave-beta.sh"
-source "$softwareRoot/brave-nightly.sh"
-source "$softwareRoot/chrome.sh"
-
-# Install further software
-source "$softwareRoot/logo-ls.sh"
-source "$softwareRoot/codium.sh"
-source "$softwareRoot/code.sh"
-source "$softwareRoot/nodejs.sh"
-source "$softwareRoot/java.sh"
-source "$softwareRoot/tea.sh"
-source "$softwareRoot/godot.sh"
-source "$softwareRoot/virt-manager.sh"
-source "$softwareRoot/woodpecker-cli.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 "$popOSRoot/windows-fonts.sh"
-
-# Install JetBrains Stuff
-source "$softwareRoot/jetbrains-toolbox.sh"
-
-# Install equalizer
-source "$popOSRoot/equalizer/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/apt-packages.sh"
-
-# Troll Stuff
-source "$softwareRoot/git-auf-deutsch.sh"

profiles/ManuSurface/setup.sh

@@ -0,0 +1,82 @@
+#!/bin/bash
+dir="${BASH_SOURCE%/*}"
+scriptRoot="$dir/../../scripts"
+deviceRoot="$scriptRoot/Devices"
+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 -c "source '$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"
+
+# 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"

scripts/Config/rclone/InstallSync.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+provider=$1;
+dirname=$2;
+serviceName=rclone@$provider:$dirname;
+
+echo "Please create a remote called \`$1\`";
+rclone config;
+
+mkdir -p ~/$dirname;
+
+systemctl --user enable $serviceName
+systemctl --user daemon-reload
+systemctl --user start $serviceName

scripts/Config/rclone/NextcloudSync/install.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+source "${BASH_SOURCE%/*}/../InstallSync.sh" nextcloud Nextcloud;

scripts/Devices/SurfaceBook2/Camera/install.sh

@@ -8,6 +8,7 @@ sudo apt install -y \
     qtbase5-dev libqt5core5a libqt5gui5 libqt5widgets5 qttools5-dev-tools \
     libtiff-dev libevent-dev libyaml-dev \
     gstreamer1.0-tools libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
+
 git clone https://git.libcamera.org/libcamera/libcamera.git
 cd libcamera
 meson build -Dpipelines=uvcvideo,vimc,ipu3 -Dipas=vimc,ipu3 -Dprefix=/usr -Dgstreamer=enabled

scripts/PopOS/cloud-sync/base.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-provider=$1
-dirname=$2
-serviceName=rclone@$provider:$dirname
-
-echo "Please create a remote named $1"
-rclone config
-
-mkdir -p ~/$dirname
-
-systemctl --user enable $serviceName
-systemctl --user daemon-reload
-systemctl --user start $serviceName

scripts/PopOS/cloud-sync/nextcloud.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-source "${BASH_SOURCE%/*}/base.sh" nextcloud Nextcloud