From 4ef9594b883853684ddd81f92b9caf121029a93e Mon Sep 17 00:00:00 2001 From: Manuel Thalmann Date: Mon, 23 Jan 2023 14:19:26 +0100 Subject: [PATCH] Refactor directory structure --- devices/ManuSurface/setup.sh | 80 ------------------ .../ManuSurface/ManuSurfaceSetup.md | 0 profiles/ManuSurface/setup.sh | 82 +++++++++++++++++++ .../EasyEffects/SurfaceBook2}/Default.json | 0 .../EasyEffects/SurfaceBook2}/install.sh | 0 .../Fonts/MicrosoftFonts/install.sh} | 0 .../Fonts/NerdFont/install.sh} | 0 .../GnomeExtensions/install.sh} | 0 .../git/git-auf-deutsch/install.sh} | 0 scripts/Config/rclone/InstallSync.sh | 13 +++ .../Config/rclone/NextcloudSync/install.sh | 2 + .../Surface/LinuxSurface/install.sh} | 0 .../SurfaceBook2/Camera/install.sh} | 1 + .../SurfaceBook2/SecureBoot}/install.sh | 0 .../SurfaceBook2/SecureBoot}/openssl.cnf | 0 .../SurfaceBook2/SecureBoot}/sign-modules.sh | 0 scripts/PopOS/cloud-sync/base.sh | 13 --- scripts/PopOS/cloud-sync/nextcloud.sh | 2 - .../Brave/install-beta.sh} | 0 .../Brave/install-extensions.sh} | 0 .../Brave/install-nightly.sh} | 0 .../Brave/install-stable.sh} | 0 .../godot.sh => Software/Godot/install.sh} | 0 .../Google Chrome/install.sh} | 0 .../java.sh => Software/Java/install.sh} | 0 .../JetBrains/install-toolbox.sh} | 0 .../nodejs.sh => Software/Node.js/install.sh} | 0 .../Oh My Posh/install.sh} | 0 .../software => Software/Python}/pyenv.sh | 0 .../python.sh => Software/Python/setup.sh} | 0 .../VSCodium/install.sh} | 0 .../Virtual Machine Manager/install.sh} | 0 .../Visual Studio Code/install.sh} | 0 .../Woodpecker CLI/install.sh} | 0 .../common-apt/install.sh} | 0 .../logo-ls/install.sh} | 0 .../software => Software}/rclone/install.sh | 0 .../rclone/rclone@.service | 0 .../tea.sh => Software/tea/install.sh} | 0 39 files changed, 98 insertions(+), 95 deletions(-) delete mode 100755 devices/ManuSurface/setup.sh rename {devices => profiles}/ManuSurface/ManuSurfaceSetup.md (100%) create mode 100755 profiles/ManuSurface/setup.sh rename scripts/{PopOS/equalizer => Config/EasyEffects/SurfaceBook2}/Default.json (100%) rename scripts/{PopOS/equalizer => Config/EasyEffects/SurfaceBook2}/install.sh (100%) rename scripts/{PopOS/windows-fonts.sh => Config/Fonts/MicrosoftFonts/install.sh} (100%) rename scripts/{PopOS/custom-fonts.sh => Config/Fonts/NerdFont/install.sh} (100%) rename scripts/{PopOS/software/gnome-extensions.sh => Config/GnomeExtensions/install.sh} (100%) rename scripts/{PopOS/software/git-auf-deutsch.sh => Config/git/git-auf-deutsch/install.sh} (100%) create mode 100755 scripts/Config/rclone/InstallSync.sh create mode 100644 scripts/Config/rclone/NextcloudSync/install.sh rename scripts/{PopOS/linux-surface.sh => Devices/Surface/LinuxSurface/install.sh} (100%) rename scripts/{PopOS/camera.sh => Devices/SurfaceBook2/Camera/install.sh} (99%) rename scripts/{PopOS/secure-boot => Devices/SurfaceBook2/SecureBoot}/install.sh (100%) rename scripts/{PopOS/secure-boot => Devices/SurfaceBook2/SecureBoot}/openssl.cnf (100%) rename scripts/{PopOS/secure-boot => Devices/SurfaceBook2/SecureBoot}/sign-modules.sh (100%) delete mode 100755 scripts/PopOS/cloud-sync/base.sh delete mode 100755 scripts/PopOS/cloud-sync/nextcloud.sh rename scripts/{PopOS/software/brave-beta.sh => Software/Brave/install-beta.sh} (100%) rename scripts/{PopOS/software/brave-extensions.sh => Software/Brave/install-extensions.sh} (100%) rename scripts/{PopOS/software/brave-nightly.sh => Software/Brave/install-nightly.sh} (100%) rename scripts/{PopOS/software/brave.sh => Software/Brave/install-stable.sh} (100%) rename scripts/{PopOS/software/godot.sh => Software/Godot/install.sh} (100%) rename scripts/{PopOS/software/chrome.sh => Software/Google Chrome/install.sh} (100%) rename scripts/{PopOS/software/java.sh => Software/Java/install.sh} (100%) rename scripts/{PopOS/software/jetbrains-toolbox.sh => Software/JetBrains/install-toolbox.sh} (100%) rename scripts/{PopOS/software/nodejs.sh => Software/Node.js/install.sh} (100%) rename scripts/{PopOS/software/oh-my-posh.sh => Software/Oh My Posh/install.sh} (100%) rename scripts/{PopOS/software => Software/Python}/pyenv.sh (100%) rename scripts/{PopOS/software/python.sh => Software/Python/setup.sh} (100%) rename scripts/{PopOS/software/codium.sh => Software/VSCodium/install.sh} (100%) rename scripts/{PopOS/software/virt-manager.sh => Software/Virtual Machine Manager/install.sh} (100%) rename scripts/{PopOS/software/code.sh => Software/Visual Studio Code/install.sh} (100%) rename scripts/{PopOS/software/woodpecker-cli.sh => Software/Woodpecker CLI/install.sh} (100%) rename scripts/{PopOS/software/apt-packages.sh => Software/common-apt/install.sh} (100%) rename scripts/{PopOS/software/logo-ls.sh => Software/logo-ls/install.sh} (100%) rename scripts/{PopOS/software => Software}/rclone/install.sh (100%) rename scripts/{PopOS/software => Software}/rclone/rclone@.service (100%) rename scripts/{PopOS/software/tea.sh => Software/tea/install.sh} (100%) diff --git a/devices/ManuSurface/setup.sh b/devices/ManuSurface/setup.sh deleted file mode 100755 index 7dc29c91..00000000 --- a/devices/ManuSurface/setup.sh +++ /dev/null @@ -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" diff --git a/devices/ManuSurface/ManuSurfaceSetup.md b/profiles/ManuSurface/ManuSurfaceSetup.md similarity index 100% rename from devices/ManuSurface/ManuSurfaceSetup.md rename to profiles/ManuSurface/ManuSurfaceSetup.md diff --git a/profiles/ManuSurface/setup.sh b/profiles/ManuSurface/setup.sh new file mode 100755 index 00000000..7b17517f --- /dev/null +++ b/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" diff --git a/scripts/PopOS/equalizer/Default.json b/scripts/Config/EasyEffects/SurfaceBook2/Default.json similarity index 100% rename from scripts/PopOS/equalizer/Default.json rename to scripts/Config/EasyEffects/SurfaceBook2/Default.json diff --git a/scripts/PopOS/equalizer/install.sh b/scripts/Config/EasyEffects/SurfaceBook2/install.sh similarity index 100% rename from scripts/PopOS/equalizer/install.sh rename to scripts/Config/EasyEffects/SurfaceBook2/install.sh diff --git a/scripts/PopOS/windows-fonts.sh b/scripts/Config/Fonts/MicrosoftFonts/install.sh similarity index 100% rename from scripts/PopOS/windows-fonts.sh rename to scripts/Config/Fonts/MicrosoftFonts/install.sh diff --git a/scripts/PopOS/custom-fonts.sh b/scripts/Config/Fonts/NerdFont/install.sh similarity index 100% rename from scripts/PopOS/custom-fonts.sh rename to scripts/Config/Fonts/NerdFont/install.sh diff --git a/scripts/PopOS/software/gnome-extensions.sh b/scripts/Config/GnomeExtensions/install.sh similarity index 100% rename from scripts/PopOS/software/gnome-extensions.sh rename to scripts/Config/GnomeExtensions/install.sh diff --git a/scripts/PopOS/software/git-auf-deutsch.sh b/scripts/Config/git/git-auf-deutsch/install.sh similarity index 100% rename from scripts/PopOS/software/git-auf-deutsch.sh rename to scripts/Config/git/git-auf-deutsch/install.sh diff --git a/scripts/Config/rclone/InstallSync.sh b/scripts/Config/rclone/InstallSync.sh new file mode 100755 index 00000000..1bcff6bc --- /dev/null +++ b/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 diff --git a/scripts/Config/rclone/NextcloudSync/install.sh b/scripts/Config/rclone/NextcloudSync/install.sh new file mode 100644 index 00000000..d3f1c433 --- /dev/null +++ b/scripts/Config/rclone/NextcloudSync/install.sh @@ -0,0 +1,2 @@ +#!/bin/bash +source "${BASH_SOURCE%/*}/../InstallSync.sh" nextcloud Nextcloud; diff --git a/scripts/PopOS/linux-surface.sh b/scripts/Devices/Surface/LinuxSurface/install.sh similarity index 100% rename from scripts/PopOS/linux-surface.sh rename to scripts/Devices/Surface/LinuxSurface/install.sh diff --git a/scripts/PopOS/camera.sh b/scripts/Devices/SurfaceBook2/Camera/install.sh similarity index 99% rename from scripts/PopOS/camera.sh rename to scripts/Devices/SurfaceBook2/Camera/install.sh index 2c712fbf..a9d90553 100755 --- a/scripts/PopOS/camera.sh +++ b/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 diff --git a/scripts/PopOS/secure-boot/install.sh b/scripts/Devices/SurfaceBook2/SecureBoot/install.sh similarity index 100% rename from scripts/PopOS/secure-boot/install.sh rename to scripts/Devices/SurfaceBook2/SecureBoot/install.sh diff --git a/scripts/PopOS/secure-boot/openssl.cnf b/scripts/Devices/SurfaceBook2/SecureBoot/openssl.cnf similarity index 100% rename from scripts/PopOS/secure-boot/openssl.cnf rename to scripts/Devices/SurfaceBook2/SecureBoot/openssl.cnf diff --git a/scripts/PopOS/secure-boot/sign-modules.sh b/scripts/Devices/SurfaceBook2/SecureBoot/sign-modules.sh similarity index 100% rename from scripts/PopOS/secure-boot/sign-modules.sh rename to scripts/Devices/SurfaceBook2/SecureBoot/sign-modules.sh diff --git a/scripts/PopOS/cloud-sync/base.sh b/scripts/PopOS/cloud-sync/base.sh deleted file mode 100755 index 7f528952..00000000 --- a/scripts/PopOS/cloud-sync/base.sh +++ /dev/null @@ -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 diff --git a/scripts/PopOS/cloud-sync/nextcloud.sh b/scripts/PopOS/cloud-sync/nextcloud.sh deleted file mode 100755 index 8222ba8a..00000000 --- a/scripts/PopOS/cloud-sync/nextcloud.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -source "${BASH_SOURCE%/*}/base.sh" nextcloud Nextcloud diff --git a/scripts/PopOS/software/brave-beta.sh b/scripts/Software/Brave/install-beta.sh similarity index 100% rename from scripts/PopOS/software/brave-beta.sh rename to scripts/Software/Brave/install-beta.sh diff --git a/scripts/PopOS/software/brave-extensions.sh b/scripts/Software/Brave/install-extensions.sh similarity index 100% rename from scripts/PopOS/software/brave-extensions.sh rename to scripts/Software/Brave/install-extensions.sh diff --git a/scripts/PopOS/software/brave-nightly.sh b/scripts/Software/Brave/install-nightly.sh similarity index 100% rename from scripts/PopOS/software/brave-nightly.sh rename to scripts/Software/Brave/install-nightly.sh diff --git a/scripts/PopOS/software/brave.sh b/scripts/Software/Brave/install-stable.sh similarity index 100% rename from scripts/PopOS/software/brave.sh rename to scripts/Software/Brave/install-stable.sh diff --git a/scripts/PopOS/software/godot.sh b/scripts/Software/Godot/install.sh similarity index 100% rename from scripts/PopOS/software/godot.sh rename to scripts/Software/Godot/install.sh diff --git a/scripts/PopOS/software/chrome.sh b/scripts/Software/Google Chrome/install.sh similarity index 100% rename from scripts/PopOS/software/chrome.sh rename to scripts/Software/Google Chrome/install.sh diff --git a/scripts/PopOS/software/java.sh b/scripts/Software/Java/install.sh similarity index 100% rename from scripts/PopOS/software/java.sh rename to scripts/Software/Java/install.sh diff --git a/scripts/PopOS/software/jetbrains-toolbox.sh b/scripts/Software/JetBrains/install-toolbox.sh similarity index 100% rename from scripts/PopOS/software/jetbrains-toolbox.sh rename to scripts/Software/JetBrains/install-toolbox.sh diff --git a/scripts/PopOS/software/nodejs.sh b/scripts/Software/Node.js/install.sh similarity index 100% rename from scripts/PopOS/software/nodejs.sh rename to scripts/Software/Node.js/install.sh diff --git a/scripts/PopOS/software/oh-my-posh.sh b/scripts/Software/Oh My Posh/install.sh similarity index 100% rename from scripts/PopOS/software/oh-my-posh.sh rename to scripts/Software/Oh My Posh/install.sh diff --git a/scripts/PopOS/software/pyenv.sh b/scripts/Software/Python/pyenv.sh similarity index 100% rename from scripts/PopOS/software/pyenv.sh rename to scripts/Software/Python/pyenv.sh diff --git a/scripts/PopOS/software/python.sh b/scripts/Software/Python/setup.sh similarity index 100% rename from scripts/PopOS/software/python.sh rename to scripts/Software/Python/setup.sh diff --git a/scripts/PopOS/software/codium.sh b/scripts/Software/VSCodium/install.sh similarity index 100% rename from scripts/PopOS/software/codium.sh rename to scripts/Software/VSCodium/install.sh diff --git a/scripts/PopOS/software/virt-manager.sh b/scripts/Software/Virtual Machine Manager/install.sh similarity index 100% rename from scripts/PopOS/software/virt-manager.sh rename to scripts/Software/Virtual Machine Manager/install.sh diff --git a/scripts/PopOS/software/code.sh b/scripts/Software/Visual Studio Code/install.sh similarity index 100% rename from scripts/PopOS/software/code.sh rename to scripts/Software/Visual Studio Code/install.sh diff --git a/scripts/PopOS/software/woodpecker-cli.sh b/scripts/Software/Woodpecker CLI/install.sh similarity index 100% rename from scripts/PopOS/software/woodpecker-cli.sh rename to scripts/Software/Woodpecker CLI/install.sh diff --git a/scripts/PopOS/software/apt-packages.sh b/scripts/Software/common-apt/install.sh similarity index 100% rename from scripts/PopOS/software/apt-packages.sh rename to scripts/Software/common-apt/install.sh diff --git a/scripts/PopOS/software/logo-ls.sh b/scripts/Software/logo-ls/install.sh similarity index 100% rename from scripts/PopOS/software/logo-ls.sh rename to scripts/Software/logo-ls/install.sh diff --git a/scripts/PopOS/software/rclone/install.sh b/scripts/Software/rclone/install.sh similarity index 100% rename from scripts/PopOS/software/rclone/install.sh rename to scripts/Software/rclone/install.sh diff --git a/scripts/PopOS/software/rclone/rclone@.service b/scripts/Software/rclone/rclone@.service similarity index 100% rename from scripts/PopOS/software/rclone/rclone@.service rename to scripts/Software/rclone/rclone@.service diff --git a/scripts/PopOS/software/tea.sh b/scripts/Software/tea/install.sh similarity index 100% rename from scripts/PopOS/software/tea.sh rename to scripts/Software/tea/install.sh