From ea44f8bbec08dea6b69e1ac3eb7594a600cdab27 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Sat, 23 Mar 2024 17:21:32 +0100
Subject: [PATCH] Refactor formatting

---
 profiles/DerGeret/Arch/setup.sh              |  2 +-
 scripts/Arch/Collections/personal.sh         |  9 +++++----
 scripts/Arch/Collections/school.sh           | 12 ++++++++----
 scripts/Arch/Devices/Surface/install.sh      |  3 ++-
 scripts/Arch/Software/git/install.sh         |  3 ++-
 scripts/Arch/Software/nvidia-dkms/install.sh |  6 ++++--
 6 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/profiles/DerGeret/Arch/setup.sh b/profiles/DerGeret/Arch/setup.sh
index f39d0b0f..1e5e0e7c 100755
--- a/profiles/DerGeret/Arch/setup.sh
+++ b/profiles/DerGeret/Arch/setup.sh
@@ -7,7 +7,7 @@ extraMounts()
     mount --mkdir -o force -t ntfs3 "${disks[-1]}" "$ARCH_MOUNT_ROOT/mnt/win";
 }
 
-PARTITION_SCRIPT="$(realpath ./partition.sh)" \
+PARTITION_SCRIPT="$(pwd)/partition.sh" \
 SKIP_FORMAT_EFI=1 \
 ARCH_MOUNT_ROOT="/mnt" \
 ARCH_DISK=nvme0n1 \
diff --git a/scripts/Arch/Collections/personal.sh b/scripts/Arch/Collections/personal.sh
index 5ffa4f57..88bf3e82 100755
--- a/scripts/Arch/Collections/personal.sh
+++ b/scripts/Arch/Collections/personal.sh
@@ -67,7 +67,8 @@ yay --noconfirm -Syu \
     ttf-cascadia-code-nerd \
     ttf-ms-win11-auto \
     otf-cascadia-code \
-    ttf-droid;
+    ttf-droid \
+    ;
 
 # GRUB Shenanigans
 . "../Software/minegrub-theme/install.sh";
@@ -101,8 +102,7 @@ yay --noconfirm -Syu \
 
 braveExtensions="/opt/brave-bin/extensions";
 
-yay --noconfirm -Syu \
-    jq;
+yay --noconfirm -Syu jq;
 
 BROWSER_BIN="brave" \
 EXTENSION_DIR="/usr/share/chromium-extensions" \
@@ -152,7 +152,8 @@ yay --noconfirm -Syu \
     protonmail-bridge-bin \
     thunderbird \
     discord \
-    openasar-git;
+    openasar-git \
+    ;
 
 . "../Software/waydroid/install.sh";
 . "../../Common/Software/nuke-usb/install.sh";
diff --git a/scripts/Arch/Collections/school.sh b/scripts/Arch/Collections/school.sh
index dce3468c..1b399b7a 100755
--- a/scripts/Arch/Collections/school.sh
+++ b/scripts/Arch/Collections/school.sh
@@ -5,23 +5,27 @@ pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 # Communication
 yay --noconfirm -Syu \
-    teams-for-linux-bin;
+    teams-for-linux-bin \
+    ;
 
 # Java
 yay --noconfirm -Syu \
     jdk17-temurin \
     gradle \
-    jetbrains-toolbox;
+    jetbrains-toolbox \
+    ;
 
 # Note Taking
 yay --noconfirm -Syu \
     xournalpp-git \
-    rnote;
+    rnote \
+    ;
 
 # Latex
 yay --noconfirm -Syu \
     texlive \
-    texlive-langgerman;
+    texlive-langgerman \
+    ;
 
 . "../../Common/Config/udev/ct-board.sh";
 
diff --git a/scripts/Arch/Devices/Surface/install.sh b/scripts/Arch/Devices/Surface/install.sh
index 4a5d7e1f..89bfb040 100755
--- a/scripts/Arch/Devices/Surface/install.sh
+++ b/scripts/Arch/Devices/Surface/install.sh
@@ -44,7 +44,8 @@ retry 5 sudo pacman --noconfirm -Sy \
     linux-surface-secureboot-mok \
     iptsd \
     intel-ucode \
-    linux-firmware-marvell;
+    linux-firmware-marvell \
+    ;
 
 sudo grub-mkconfig -o /boot/grub/grub.cfg;
 yes | yay --answerclean=None --answerdiff=None -Syu libwacom-surface;
diff --git a/scripts/Arch/Software/git/install.sh b/scripts/Arch/Software/git/install.sh
index 203ed108..65f9e6da 100755
--- a/scripts/Arch/Software/git/install.sh
+++ b/scripts/Arch/Software/git/install.sh
@@ -7,7 +7,8 @@ yay --noconfirm -Syu \
     gitflow-avh \
     gitflow-bashcompletion-avh \
     gitflow-fishcompletion-avh \
-    gitflow-zshcompletion-avh;
+    gitflow-zshcompletion-avh \
+    ;
 
 . "../../../Common/Config/git/install.sh";
 
diff --git a/scripts/Arch/Software/nvidia-dkms/install.sh b/scripts/Arch/Software/nvidia-dkms/install.sh
index 749def90..eda708c1 100755
--- a/scripts/Arch/Software/nvidia-dkms/install.sh
+++ b/scripts/Arch/Software/nvidia-dkms/install.sh
@@ -2,11 +2,13 @@
 pushd "${BASH_SOURCE%/*}" > /dev/null;
 
 yay --noconfirm -Syu \
-    linux-headers;
+    linux-headers \
+    ;
 
 yay --noconfirm -Syu \
     nvidia-dkms \
-    lib32-nvidia-utils;
+    lib32-nvidia-utils \
+    ;
 
 . ../../Config/nvidia-dkms/install.sh;
 popd > /dev/null;